Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development

Templates/Full/game/art/decals/managedDecalData.cs

@@ -28,6 +28,7 @@ datablock DecalData(ScorchBigDecal)
    Material = "DECAL_scorch";
    size = "5.0";
    lifeSpan = "50000";
+   textureCoordCount = "0";
 };
 
 datablock DecalData(ScorchRXDecal)

Templates/Full/game/art/pbr/copper/About these PBR files.txt

@@ -0,0 +1 @@
+These texture files were created by FreePBR.com and may be used freely in your video games and 3d work at no cost. They may not however be redistributed on other websites or anywhere else other than FreePBR.com. We think that is more than fair. :) We also would greatly appreciate it if some sorrt of credit was given if you do indeed use these textures in a published game. Other than that, keep on creating and have fun. :)

Templates/Full/game/art/pbr/greasy/About these PBR files.txt

@@ -0,0 +1 @@
+These texture files were created by FreePBR.com and may be used freely in your video games and 3d work at no cost. They may not however be redistributed on other websites or anywhere else other than FreePBR.com. We think that is more than fair. :) We also would greatly appreciate it if some sorrt of credit was given if you do indeed use these textures in a published game. Other than that, keep on creating and have fun. :)

Templates/Full/game/art/shapes/Cheetah/materials.cs

@@ -28,8 +28,10 @@ singleton Material(Cheetah_Main)
    specularPower[0] = "10";
    translucentBlendOp = "None";
    normalMap[0] = "art/shapes/Cheetah/Cheetah_N";
-   specularMap[0] = "art/shapes/Cheetah/Cheetah_S";
    castDynamicShadows = true;
+   diffuseColor[3] = "1 1 1 1";
+   specular0 = "0.9 0.9 0.9 1";
+   specularPower0 = "10";
 };
 
 singleton Material(Cheetah_TailLights)

Templates/Full/game/art/shapes/actors/Soldier/materials.cs

@@ -24,19 +24,18 @@ singleton Material(Mat_Soldier_Main)
 {
    mapTo = "base_Soldier_Main";
 
-   diffuseMap[0] = "Soldier_Dif.dds";
-   normalMap[0] = "Soldier_N.dds";
-   specularMap[0] = "Soldier_Spec.dds";
-
-   diffuseColor[0] = "1 1 1 1";
-   specular[0] = "0.9 0.9 0.9 1";
-   specularPower[0] = 10;
-
-   doubleSided = false;
-   translucent = false;
-   showFootprints = "0";
+   diffuseMap[0] = "art/shapes/actors/Soldier/Soldier_Dif.dds";
+   normalMap[0] = "art/shapes/actors/Soldier/Soldier_N.dds";
+   specularMap[0] = "art/shapes/actors/Soldier/Soldier_c";
+   FlipRB[0] = "1";
    castDynamicShadows = true;
    materialTag0 = "Player";
+   isSRGb[0] = "1";
+   roughness0 = "1";
+   FlipRB0 = "1";
+   specularPower0 = "10";
+   pixelSpecular0 = "0";
+   specular0 = "0.9 0.9 0.9 1";
 };
 
 singleton Material(Mat_Soldier_Dazzle)
@@ -110,7 +109,8 @@ singleton Material(Mat_Orange_Soldier_Main : Mat_Soldier_Main)
 singleton Material(Mat_Red_Soldier_Main : Mat_Soldier_Main)
 {
    mapTo = "Red_Soldier_Main";
-   diffuseMap[0] = "Soldier_Red_Dif.dds";
+   diffuseMap[0] = "art/shapes/actors/Soldier/Soldier_Red_Dif.dds";
+   normalMap[0] = "art/shapes/actors/Soldier/Soldier_N.dds";
 };
 
 singleton Material(Mat_Teal_Soldier_Main : Mat_Soldier_Main)

Templates/Full/game/art/shapes/cube/materials.cs

@@ -25,9 +25,6 @@ singleton Material(cube_GridMaterial)
 {
 	mapTo = "GridMaterial";
 
-	diffuseMap[0] = "grid";
-	normalMap[0] = "";
-	specularMap[0] = "";
 
 	diffuseColor[0] = "1 1 1 1";
 	specular[0] = "0.9 0.9 0.9 1";
@@ -38,6 +35,12 @@ singleton Material(cube_GridMaterial)
 	doubleSided = false;
 	translucent = false;
 	translucentBlendOp = "None";
+   materialTag0 = "Miscellaneous";
+   smoothness[0] = "1";
+   metalness[0] = "1";
+   specularPower0 = "0.415939";
+   pixelSpecular0 = "0";
+   specular0 = "0.9 0.9 0.9 1";
 };
 
 //--- cube.dae MATERIALS END ---

Templates/Full/game/art/shapes/floor/floor.dae

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>rexti</author>
+      <authoring_tool>OpenCOLLADA for 3ds Max;  Version: 1.6;  Revision: 65</authoring_tool>
+      <source_data>file:///C:/Users/rexti/Desktop/mesh/floor/floor.max</source_data>
+    </contributor>
+    <created>2018-10-30T22:45:39</created>
+    <modified>2018-10-30T22:45:39</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_effects>
+    <effect id="floor_mat">
+      <profile_COMMON>
+        <technique sid="common">
+          <phong>
+            <emission>
+              <color>0 0 0 1</color>
+            </emission>
+            <ambient>
+              <color>0.933 0.774 0.374 1</color>
+            </ambient>
+            <diffuse>
+              <color>0.933 0.774 0.374 1</color>
+            </diffuse>
+            <specular>
+              <color>0.933 0.774 0.374 1</color>
+            </specular>
+            <shininess>
+              <float>92</float>
+            </shininess>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="floor_mat-material" name="floor_mat">
+      <instance_effect url="#floor_mat"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="geom-floor_geom" name="floor_geom">
+      <mesh>
+        <source id="geom-floor_geom-positions">
+          <float_array id="geom-floor_geom-positions-array" count="243">-0.762 -0.762 0 -0.5715 -0.762 0 -0.381 -0.762 0 -0.1905 -0.762 0 0 -0.762 0 0.1905 -0.762 0 0.381 -0.762 0 0.5715 -0.762 0 0.762 -0.762 0 -0.762 -0.5715 0 -0.5715 -0.5715 0 -0.381 -0.5715 0 -0.1905 -0.5715 0 0 -0.5715 0 0.1905 -0.5715 0 0.381 -0.5715 0 0.5715 -0.5715 0 0.762 -0.5715 0 -0.762 -0.381 0 -0.5715 -0.381 0 -0.381 -0.381 0 -0.1905 -0.381 0 0 -0.381 0 0.1905 -0.381 0 0.381 -0.381 0 0.5715 -0.381 0 0.762 -0.381 0 -0.762 -0.1905 0 -0.5715 -0.1905 0 -0.381 -0.1905 0 -0.1905 -0.1905 0 0 -0.1905 0 0.1905 -0.1905 0 0.381 -0.1905 0 0.5715 -0.1905 0 0.762 -0.1905 0 -0.762 0 0 -0.5715 0 0 -0.381 0 0 -0.1905 0 0 0 0 0 0.1905 0 0 0.381 0 0 0.5715 0 0 0.762 0 0 -0.762 0.1905 0 -0.5715 0.1905 0 -0.381 0.1905 0 -0.1905 0.1905 0 0 0.1905 0 0.1905 0.1905 0 0.381 0.1905 0 0.5715 0.1905 0 0.762 0.1905 0 -0.762 0.381 0 -0.5715 0.381 0 -0.381 0.381 0 -0.1905 0.381 0 0 0.381 0 0.1905 0.381 0 0.381 0.381 0 0.5715 0.381 0 0.762 0.381 0 -0.762 0.5715 0 -0.5715 0.5715 0 -0.381 0.5715 0 -0.1905 0.5715 0 0 0.5715 0 0.1905 0.5715 0 0.381 0.5715 0 0.5715 0.5715 0 0.762 0.5715 0 -0.762 0.762 0 -0.5715 0.762 0 -0.381 0.762 0 -0.1905 0.762 0 0 0.762 0 0.1905 0.762 0 0.381 0.762 0 0.5715 0.762 0 0.762 0.762 0</float_array>
+          <technique_common>
+            <accessor source="#geom-floor_geom-positions-array" count="81" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="geom-floor_geom-normals">
+          <float_array id="geom-floor_geom-normals-array" count="243">0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 0.9999999 0 0 0.9999999 0 0 0.9999999 0 0 0.9999999 0 0 1 0 0 1</float_array>
+          <technique_common>
+            <accessor source="#geom-floor_geom-normals-array" count="81" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="geom-floor_geom-map1">
+          <float_array id="geom-floor_geom-map1-array" count="243">0 0 0 0.625 0 0 1.25 0 0 1.875 0 0 2.5 0 0 3.125 0 0 3.75 0 0 4.375 0 0 5 0 0 0 0.625 0 0.625 0.625 0 1.25 0.625 0 1.875 0.625 0 2.5 0.625 0 3.125 0.625 0 3.75 0.625 0 4.375 0.625 0 5 0.625 0 0 1.25 0 0.625 1.25 0 1.25 1.25 0 1.875 1.25 0 2.5 1.25 0 3.125 1.25 0 3.75 1.25 0 4.375 1.25 0 5 1.25 0 0 1.875 0 0.625 1.875 0 1.25 1.875 0 1.875 1.875 0 2.5 1.875 0 3.125 1.875 0 3.75 1.875 0 4.375 1.875 0 5 1.875 0 0 2.5 0 0.625 2.5 0 1.25 2.5 0 1.875 2.5 0 2.5 2.5 0 3.125 2.5 0 3.75 2.5 0 4.375 2.5 0 5 2.5 0 0 3.125 0 0.625 3.125 0 1.25 3.125 0 1.875 3.125 0 2.5 3.125 0 3.125 3.125 0 3.75 3.125 0 4.375 3.125 0 5 3.125 0 0 3.75 0 0.625 3.75 0 1.25 3.75 0 1.875 3.75 0 2.5 3.75 0 3.125 3.75 0 3.75 3.75 0 4.375 3.75 0 5 3.75 0 0 4.375 0 0.625 4.375 0 1.25 4.375 0 1.875 4.375 0 2.5 4.375 0 3.125 4.375 0 3.75 4.375 0 4.375 4.375 0 5 4.375 0 0 5 0 0.625 5 0 1.25 5 0 1.875 5 0 2.5 5 0 3.125 5 0 3.75 5 0 4.375 5 0 5 5 0</float_array>
+          <technique_common>
+            <accessor source="#geom-floor_geom-map1-array" count="81" stride="3">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+              <param name="P" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="geom-floor_geom-map1-textangents">
+          <float_array id="geom-floor_geom-map1-textangents-array" count="243">1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0</float_array>
+          <technique_common>
+            <accessor source="#geom-floor_geom-map1-textangents-array" count="81" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="geom-floor_geom-map1-texbinormals">
+          <float_array id="geom-floor_geom-map1-texbinormals-array" count="243">0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0 0 -1 0</float_array>
+          <technique_common>
+            <accessor source="#geom-floor_geom-map1-texbinormals-array" count="81" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="geom-floor_geom-vertices">
+          <input semantic="POSITION" source="#geom-floor_geom-positions"/>
+        </vertices>
+        <triangles material="floor_mat" count="128">
+          <input semantic="VERTEX" source="#geom-floor_geom-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#geom-floor_geom-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#geom-floor_geom-map1" offset="2" set="0"/>
+          <input semantic="TEXTANGENT" source="#geom-floor_geom-map1-textangents" offset="3" set="1"/>
+          <input semantic="TEXBINORMAL" source="#geom-floor_geom-map1-texbinormals" offset="3" set="1"/>
+          <p>0 0 0 0 1 1 1 1 10 2 10 2 10 2 10 2 9 3 9 3 0 0 0 0 1 1 1 1 2 4 2 4 11 5 11 5 11 5 11 5 10 2 10 2 1 1 1 1 2 4 2 4 3 6 3 6 12 7 12 7 12 7 12 7 11 5 11 5 2 4 2 4 3 6 3 6 4 8 4 8 13 9 13 9 13 9 13 9 12 7 12 7 3 6 3 6 4 8 4 8 5 10 5 10 14 11 14 11 14 11 14 11 13 9 13 9 4 8 4 8 5 10 5 10 6 12 6 12 15 13 15 13 15 13 15 13 14 11 14 11 5 10 5 10 6 12 6 12 7 14 7 14 16 15 16 15 16 15 16 15 15 13 15 13 6 12 6 12 7 14 7 14 8 16 8 16 17 17 17 17 17 17 17 17 16 15 16 15 7 14 7 14 9 3 9 3 10 2 10 2 19 18 19 18 19 18 19 18 18 19 18 19 9 3 9 3 10 2 10 2 11 5 11 5 20 20 20 20 20 20 20 20 19 18 19 18 10 2 10 2 11 5 11 5 12 7 12 7 21 21 21 21 21 21 21 21 20 20 20 20 11 5 11 5 12 7 12 7 13 9 13 9 22 22 22 22 22 22 22 22 21 21 21 21 12 7 12 7 13 9 13 9 14 11 14 11 23 23 23 23 23 23 23 23 22 22 22 22 13 9 13 9 14 11 14 11 15 13 15 13 24 24 24 24 24 24 24 24 23 23 23 23 14 11 14 11 15 13 15 13 16 15 16 15 25 25 25 25 25 25 25 25 24 24 24 24 15 13 15 13 16 15 16 15 17 17 17 17 26 26 26 26 26 26 26 26 25 25 25 25 16 15 16 15 18 19 18 19 19 18 19 18 28 27 28 27 28 27 28 27 27 28 27 28 18 19 18 19 19 18 19 18 20 20 20 20 29 29 29 29 29 29 29 29 28 27 28 27 19 18 19 18 20 20 20 20 21 21 21 21 30 30 30 30 30 30 30 30 29 29 29 29 20 20 20 20 21 21 21 21 22 22 22 22 31 31 31 31 31 31 31 31 30 30 30 30 21 21 21 21 22 22 22 22 23 23 23 23 32 32 32 32 32 32 32 32 31 31 31 31 22 22 22 22 23 23 23 23 24 24 24 24 33 33 33 33 33 33 33 33 32 32 32 32 23 23 23 23 24 24 24 24 25 25 25 25 34 34 34 34 34 34 34 34 33 33 33 33 24 24 24 24 25 25 25 25 26 26 26 26 35 35 35 35 35 35 35 35 34 34 34 34 25 25 25 25 27 28 27 28 28 27 28 27 37 36 37 36 37 36 37 36 36 37 36 37 27 28 27 28 28 27 28 27 29 29 29 29 38 38 38 38 38 38 38 38 37 36 37 36 28 27 28 27 29 29 29 29 30 30 30 30 39 39 39 39 39 39 39 39 38 38 38 38 29 29 29 29 30 30 30 30 31 31 31 31 40 40 40 40 40 40 40 40 39 39 39 39 30 30 30 30 31 31 31 31 32 32 32 32 41 41 41 41 41 41 41 41 40 40 40 40 31 31 31 31 32 32 32 32 33 33 33 33 42 42 42 42 42 42 42 42 41 41 41 41 32 32 32 32 33 33 33 33 34 34 34 34 43 43 43 43 43 43 43 43 42 42 42 42 33 33 33 33 34 34 34 34 35 35 35 35 44 44 44 44 44 44 44 44 43 43 43 43 34 34 34 34 36 37 36 37 37 36 37 36 46 45 46 45 46 45 46 45 45 46 45 46 36 37 36 37 37 36 37 36 38 38 38 38 47 47 47 47 47 47 47 47 46 45 46 45 37 36 37 36 38 38 38 38 39 39 39 39 48 48 48 48 48 48 48 48 47 47 47 47 38 38 38 38 39 39 39 39 40 40 40 40 49 49 49 49 49 49 49 49 48 48 48 48 39 39 39 39 40 40 40 40 41 41 41 41 50 50 50 50 50 50 50 50 49 49 49 49 40 40 40 40 41 41 41 41 42 42 42 42 51 51 51 51 51 51 51 51 50 50 50 50 41 41 41 41 42 42 42 42 43 43 43 43 52 52 52 52 52 52 52 52 51 51 51 51 42 42 42 42 43 43 43 43 44 44 44 44 53 53 53 53 53 53 53 53 52 52 52 52 43 43 43 43 45 46 45 46 46 45 46 45 55 54 55 54 55 54 55 54 54 55 54 55 45 46 45 46 46 45 46 45 47 47 47 47 56 56 56 56 56 56 56 56 55 54 55 54 46 45 46 45 47 47 47 47 48 48 48 48 57 57 57 57 57 57 57 57 56 56 56 56 47 47 47 47 48 48 48 48 49 49 49 49 58 58 58 58 58 58 58 58 57 57 57 57 48 48 48 48 49 49 49 49 50 50 50 50 59 59 59 59 59 59 59 59 58 58 58 58 49 49 49 49 50 50 50 50 51 51 51 51 60 60 60 60 60 60 60 60 59 59 59 59 50 50 50 50 51 51 51 51 52 52 52 52 61 61 61 61 61 61 61 61 60 60 60 60 51 51 51 51 52 52 52 52 53 53 53 53 62 62 62 62 62 62 62 62 61 61 61 61 52 52 52 52 54 55 54 55 55 54 55 54 64 63 64 63 64 63 64 63 63 64 63 64 54 55 54 55 55 54 55 54 56 56 56 56 65 65 65 65 65 65 65 65 64 63 64 63 55 54 55 54 56 56 56 56 57 57 57 57 66 66 66 66 66 66 66 66 65 65 65 65 56 56 56 56 57 57 57 57 58 58 58 58 67 67 67 67 67 67 67 67 66 66 66 66 57 57 57 57 58 58 58 58 59 59 59 59 68 68 68 68 68 68 68 68 67 67 67 67 58 58 58 58 59 59 59 59 60 60 60 60 69 69 69 69 69 69 69 69 68 68 68 68 59 59 59 59 60 60 60 60 61 61 61 61 70 70 70 70 70 70 70 70 69 69 69 69 60 60 60 60 61 61 61 61 62 62 62 62 71 71 71 71 71 71 71 71 70 70 70 70 61 61 61 61 63 64 63 64 64 63 64 63 73 72 73 72 73 72 73 72 72 73 72 73 63 64 63 64 64 63 64 63 65 65 65 65 74 74 74 74 74 74 74 74 73 72 73 72 64 63 64 63 65 65 65 65 66 66 66 66 75 75 75 75 75 75 75 75 74 74 74 74 65 65 65 65 66 66 66 66 67 67 67 67 76 76 76 76 76 76 76 76 75 75 75 75 66 66 66 66 67 67 67 67 68 68 68 68 77 77 77 77 77 77 77 77 76 76 76 76 67 67 67 67 68 68 68 68 69 69 69 69 78 78 78 78 78 78 78 78 77 77 77 77 68 68 68 68 69 69 69 69 70 70 70 70 79 79 79 79 79 79 79 79 78 78 78 78 69 69 69 69 70 70 70 70 71 71 71 71 80 80 80 80 80 80 80 80 79 79 79 79 70 70 70 70</p>
+        </triangles>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_lights>
+    <light id="EnvironmentAmbientLight" name="EnvironmentAmbientLight">
+      <technique_common>
+        <ambient>
+          <color>0 0 0</color>
+        </ambient>
+      </technique_common>
+    </light>
+  </library_lights>
+  <library_visual_scenes>
+    <visual_scene id="MaxScene">
+      <node name="EnvironmentAmbientLight">
+        <instance_light url="#EnvironmentAmbientLight"/>
+      </node>
+      <node id="node-floor_geom" name="floor_geom">
+        <translate>0.003635618 0.049337 0</translate>
+        <scale>10 10 10</scale>
+        <instance_geometry url="#geom-floor_geom">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="floor_mat" target="#floor_mat-material"/>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+        <extra>
+          <technique profile="OpenCOLLADA">
+            <cast_shadows sid="cast_shadows" type="bool">1</cast_shadows>
+            <receive_shadows sid="receive_shadows" type="bool">1</receive_shadows>
+            <primary_visibility sid="primary_visibility" type="bool">1</primary_visibility>
+            <secondary_visibility sid="secondary_visibility" type="bool">1</secondary_visibility>
+          </technique>
+        </extra>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#MaxScene"/>
+  </scene>
+</COLLADA>

Templates/Full/game/art/shapes/floor/materials.cs

@@ -0,0 +1,14 @@
+
+singleton Material(Floor_Material)
+{
+   mapTo = "floor_mat";
+   diffuseMap[0] = "art/pbr/floor/FloorEbony_basecolor.png";
+   normalMap[0] = "art/pbr/floor/FloorEbony_normal.png";
+   roughMap[0] = "art/pbr/floor/FloorEbony_rough.png";
+   aoMap[0] = "art/pbr/floor/FloorEbony_ao.png";
+   metalMap[0] = "art/pbr/floor/FloorEbony_metal.png";
+   invertSmoothness[0] = "1";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};

Templates/Full/game/art/shapes/material_ball/materials.cs

@@ -0,0 +1,77 @@
+
+singleton Material(Mat_base_material_ball)
+{
+   mapTo = "base_material_ball";
+   diffuseColor[0] = "1 1 1 1";
+   smoothness[0] = "1";
+   metalness[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};
+
+singleton Material(Mat_gold_material_ball)
+{
+   mapTo = "gold_material_ball";
+   diffuseMap[0] = "art/pbr/gold/albedo.png";
+   normalMap[0] = "art/pbr/gold/normal.png";
+   roughMap[0] = "art/pbr/gold/roughness.png";
+   metalMap[0] = "art/pbr/gold/metallic.png";
+   invertSmoothness[0] = "1";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};
+
+singleton Material(Mat_plastic_material_ball)
+{
+   mapTo = "plastic_material_ball";
+   diffuseMap[0] = "art/pbr/plastic/plastic_A.dds";
+   normalMap[0] = "art/pbr/plastic/plastic_N.dds";
+   roughMap[0] = "art/pbr/plastic/roughness.png";
+   aoMap[0] = "art/pbr/plastic/ao.png";
+   metalMap[0] = "art/pbr/plastic/metallic.png";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   invertSmoothness[0] = "1";
+   materialTag0 = "pbr";
+};
+
+singleton Material(Mat_iron_material_ball)
+{
+   mapTo = "iron_material_ball";
+   diffuseMap[0] = "art/pbr/rusted_iron/albedo.png";
+   normalMap[0] = "art/pbr/rusted_iron/normal.png";
+   roughMap[0] = "art/pbr/rusted_iron/roughness.png";
+   aoMap[0] = "art/pbr/rusted_iron/ao.png";
+   metalMap[0] = "art/pbr/rusted_iron/metallic.png";
+   invertSmoothness[0] = "1";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};
+
+singleton Material(Mat_greasy_material_ball)
+{
+   mapTo = "greasy_material_ball";
+   diffuseMap[0] = "art/pbr/greasy/greasy-pan-2-albedo.png";
+   normalMap[0] = "art/pbr/greasy/greasy-pan-2-normal.png";
+   roughMap[0] = "art/pbr/greasy/greasy-pan-2-roughness.png";
+   metalMap[0] = "art/pbr/greasy/greasy-pan-2-metal.png";
+   invertSmoothness[0] = "1";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};
+
+singleton Material(Mat_copper_material_ball)
+{
+   mapTo = "copper_material_ball";
+   diffuseMap[0] = "art/pbr/copper/oxidized-copper-albedo.png";
+   normalMap[0] = "art/pbr/copper/oxidized-copper-normal-ue.png";
+   roughMap[0] = "art/pbr/copper/oxidized-coppper-roughness.png";
+   metalMap[0] = "art/pbr/copper/oxidized-copper-metal.png";
+   invertSmoothness[0] = "1";
+   useAnisotropic[0] = "1";
+   translucentBlendOp = "None";
+   materialTag0 = "pbr";
+};

Templates/Full/game/art/shapes/sphere/materials.cs

@@ -0,0 +1,10 @@
+singleton Material(Sphere_material)
+{
+   mapTo = "Sphere_mat";
+   diffuseColor[0] = "1 0 0 1";
+   smoothness[0] = "1";
+   metalness[0] = "1";
+   useAnisotropic[0] = "1";
+   materialTag0 = "Miscellaneous";
+};
+

Templates/Full/game/art/shapes/station/materials.cs

@@ -24,14 +24,11 @@ new Material(Structure_wall)
 {
    mapTo = "building01walls";
    diffuseMap[0] = "art/shapes/station/building01walls";
-   //emissive[0] = true;
-};
-
-
-new Material(Structure_grid)
-{
-   mapTo = "grid";
-   diffuseMap[0] = "art/shapes/station/grid";
+   normalMap[0] = "art/shapes/station/building01walls_n.dds";
+   specularMap[0] = "art/shapes/station/building01walls_c.dds";
+   effectColor[0] = "InvisibleBlack";
+   materialTag0 = "Miscellaneous";
+   pixelSpecular0 = "0";
    //emissive[0] = true;
 };
 
@@ -40,6 +37,20 @@ new Material(Structure_plate)
 {
    mapTo = "plate";
    diffuseMap[0] = "art/shapes/station/plate";
+   normalMap[0] = "art/shapes/station/plate_n.dds";
+   specularMap[0] = "art/shapes/station/plate_c.dds";
+   pixelSpecular0 = "0";
+   materialTag0 = "Miscellaneous";
+   //emissive[0] = true;
+};
+
+
+new Material(Structure_grid)
+{
+   mapTo = "grid";
+   diffuseMap[0] = "art/shapes/station/grid";
+   normalMap[0] = "art/shapes/station/grid_n.dds";
+   specularMap[0] = "art/shapes/station/grid_c.dds";
    //emissive[0] = true;
 };
 

Templates/Full/game/art/shapes/textures/PBRTEST.cs

@@ -0,0 +1,6 @@
+
+singleton TSShapeConstructor(PBRTESTDae)
+{
+   baseShape = "./PBRTEST.dae";
+   loadLights = "0";
+};

Templates/Full/game/art/shapes/textures/PBRTEST2.cs

@@ -0,0 +1,11 @@
+
+singleton TSShapeConstructor(PBRTEST2Dae)
+{
+   baseShape = "./PBRTEST2.dae";
+};
+
+function PBRTEST2Dae::onLoad(%this)
+{
+   %this.addNode("Col-1", "", "0 0 0 0 0 1 0", "0");
+   %this.addCollisionDetail("-1", "Sphere", "Bounds", "4", "30", "30", "32", "30", "30", "30");
+}

Templates/Full/game/art/shapes/textures/materials.cs

@@ -0,0 +1,113 @@
+
+singleton Material(PBRTEST_PBRMetal)
+{
+   mapTo = "PBRMetal";
+   diffuseColor[0] = "1 1 1 1";
+   roughness[0] = "1";
+   metalness[0] = "50";
+   translucentBlendOp = "None";
+   diffuseMap[0] = "art/shapes/textures/Metal_A.png";
+   normalMap[0] = "art/shapes/textures/Metal_N.png";
+   materialTag0 = "Miscellaneous";
+   metalChan[0] = "3";
+   specularMap[0] = "art/shapes/textures/Metal_S.png";
+   roughness0 = "1";
+   pixelSpecular0 = "0";
+   invertSmoothness[0] = "1";
+   isSRGb[0] = "1";
+   specularPower0 = "0.415939";
+   specular0 = "0.9 0.9 0.9 1";
+};
+
+singleton Material(PBRTEST_PBRWood)
+{
+   mapTo = "PBRWood";
+   diffuseColor[0] = "1 1 1 1";
+   roughness[0] = "1";
+   metalness[0] = "50";
+   translucentBlendOp = "None";
+   diffuseMap[0] = "art/shapes/textures/Wood1_A.dds";
+   normalMap[0] = "art/shapes/textures/Wood1_N.png";
+   materialTag0 = "Miscellaneous";
+   roughMap[0] = "art/shapes/textures/Wood1_S.dds";
+   metalMap[0] = "art/shapes/textures/Wood1_S.dds";
+   metalChan[0] = "3";
+   roughness0 = "1";
+   pixelSpecular0 = "0";
+   isSRGb[0] = "1";
+   specularPower0 = "0.415939";
+   specular0 = "0.9 0.9 0.9 1";
+};
+
+singleton Material(PBRTest2Mat)
+{
+   mapTo = "PBRTest2Mat";
+   diffuseColor[0] = "1 1 1 1";
+   roughness[0] = "1";
+   metalness[0] = "1";
+   translucentBlendOp = "None";
+   normalMap[0] = "art/shapes/textures/T3D_Metal_6_normal.png";
+   materialTag0 = "Miscellaneous";
+   metalChan[0] = "2";
+   roughness0 = "1";
+   pixelSpecular0 = "0";
+   smoothness[0] = "1";
+   specularMap[0] = "art/shapes/textures/T3D_Metal_6_any.png";
+   specularPower0 = "0.415939";
+   specular0 = "0.9 0.9 0.9 1";
+   translucent = "0";
+   diffuseMap[0] = "art/shapes/textures/T3D_Metal_6_basecolor.png";
+   isSRGb[0] = "1";
+};
+
+singleton Material(PBRTest2Mat)
+{
+   mapTo = "PBRTest2Mat";
+   diffuseColor[0] = "1 1 1 1";
+   smoothness[0] = "1";
+   metalness[0] = "1";
+   translucentBlendOp = "None";
+   diffuseMap[0] = "art/shapes/textures/T3D_Metal_6_basecolor.png";
+   normalMap[0] = "art/shapes/textures/T3D_Metal_6_normal.png";
+   pixelSpecular0 = "0";
+   materialTag0 = "Miscellaneous";
+   specularMap[0] = "art/shapes/textures/T3D_Metal_6_any.png";
+};
+
+singleton Material(PBRTEST_PBRstone)
+{
+   mapTo = "PBRstone";
+   diffuseColor[0] = "0.64 0.64 0.64 1";
+   smoothness[0] = "1";
+   metalness[0] = "1";
+   translucentBlendOp = "None";
+   diffuseMap[0] = "art/shapes/textures/Stone_A.dds";
+   normalMap[0] = "art/shapes/textures/Stone_N.png";
+   roughMap[0] = "art/shapes/textures/Stone_S.dds";
+   metalMap[0] = "art/shapes/textures/Stone_S.dds";
+   roughness0 = "1";
+   materialTag0 = "Miscellaneous";
+   pixelSpecular0 = "0";
+   metalChan[0] = "3";
+   isSRGb[0] = "1";
+   specularPower0 = "0.415939";
+   specular0 = "0.9 0.9 0.9 1";
+};
+
+singleton Material(pbrGrid)
+{
+   mapTo = "PBRGrid";
+   diffuseColor[0] = "1 1 1 1";
+   smoothness[0] = "0";
+   metalness[0] = "0";
+   translucentBlendOp = "LerpAlpha";
+   diffuseMap[0] = "art/shapes/textures/PBRGrid_a.dds";
+   alphaTest = "1";
+   materialTag0 = "Miscellaneous";
+   pixelSpecular0 = "0";
+   doubleSided = "0";
+   alphaRef = "1";
+   diffuseColor[2] = "1 1 1 1";
+   normalMap[0] = "art/shapes/textures/PBRGrid_n.png";
+   specularMap[0] = "art/shapes/textures/PBRGrid_c.dds";
+};

Templates/Full/game/art/skies/Sky128Mat/materials.cs

@@ -0,0 +1,38 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton CubemapData( Sky128Cubemap )
+{
+   cubeFace[0] = "./cubemap/skybox_1";
+   cubeFace[1] = "./cubemap/skybox_2";
+   cubeFace[2] = "./cubemap/skybox_3";
+   cubeFace[3] = "./cubemap/skybox_4";
+   cubeFace[4] = "./cubemap/skybox_5";
+   cubeFace[5] = "./cubemap/skybox_6";
+};
+
+singleton Material( Sky128Mat )
+{
+   cubemap = Sky128Cubemap;
+   materialTag0 = "Skies";
+   isSky = true;
+};

Templates/Full/game/art/skies/hdrSky/materials.cs

@@ -20,24 +20,13 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "../../shaderModel.hlsl"
-
-struct Appdata
+singleton CubemapData( HdrSkyCubemap )
 {
-	float3 pos     : POSITION;
-	float4 color   : COLOR;
+   cubeMap = "./hdrSky.dds";
 };
 
-struct Conn
+singleton Material( HdrSky )
 {
-   float4 hpos : TORQUE_POSITION;
+   cubemap = HdrSkyCubemap;
+   materialTag0 = "Skies";
 };
-
-uniform float4x4 modelview;
-
-Conn main( Appdata In )
-{
-   Conn Out;
-   Out.hpos = float4(In.pos,1.0);
-   return Out;
-}

Templates/Full/game/art/skies/skyNightHDR/materials.cs

@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton CubemapData( SkyNightHDRCubemap )
+{
+   cubeMap = "./sky_night_hdr.dds";
+};
+
+singleton Material( SkyNightHDR )
+{
+   cubemap = SkyNightHDRCubemap;
+   materialTag0 = "Skies";
+};

Templates/Full/game/art/skies/sky_day_hdr/materials.cs

@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2012 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+singleton CubemapData( sky_day_hdr_cubemap )
+{
+   cubeMap = "./sky_day_hdr.dds";
+};
+
+singleton Material( sky_day_hdr )
+{
+   cubemap = sky_day_hdr_cubemap;
+   materialTag0 = "Skies";
+};

Templates/Full/game/art/terrains/materials.cs

@@ -151,6 +151,7 @@ new TerrainMaterial()
    detailBrightness = "1";
    Enabled = "1";
    diffuseSize = "400";
+   compositeMap = "art/terrains/Example/snowtop";
 };
 
 // ----------------------------------------------------------------------------

Templates/Full/game/art/yorks/chapel/Module_Common/LMA_chapel_int.cs

@@ -0,0 +1,7 @@
+
+singleton TSShapeConstructor(LMA_chapel_intDae)
+{
+   baseShape = "./LMA_chapel_int.dae";
+   unit = "1";
+   loadLights = "0";
+};