Fixes and cleans up various issues and error spam for core and tools folders

Also:
Fixes error spam about CreatorIconArray
Fixes error spam about duplicate uses of various materials
Converts a number of materials to be packed into the mat assets for cleanliness and preventing unwanted duplicate exec's
Removed some extraneous misconvert '.asset.taml' files
Fixes 'cannot compile shader' error when trying to use the viz modes
Fixed a some instances of guiControlProfiles not being actually defined
Fixed some instances of guiControlProfiles being duplicated

Templates/BaseGame/game/core/gameObjects/materials/BasicRibbonMat.asset.taml

@@ -0,0 +1,7 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="BasicRibbonMat"
+    scriptFile="@assetFile=BasicRibbonMat.tscript"
+    materialDefinitionName="BasicRibbonMat"
+    VersionId="1" />

Templates/BaseGame/game/core/gameObjects/materials/BasicRibbonMat.tscript

@@ -0,0 +1,27 @@
+singleton ShaderData( BasicRibbonShader )
+{
+   DXVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl";
+   DXPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl";
+ 
+   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderV.glsl";
+   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderP.glsl";
+ 
+   samplerNames[0] = "$ribTex";
+ 
+   pixVersion = 2.0;
+};
+ 
+singleton CustomMaterial( BasicRibbonMat )
+{
+   shader = BasicRibbonShader;
+   version = 2.0;
+   
+   emissive[0] = true;
+   
+   doubleSided = true;
+   translucent = true;
+   BlendOp = AddAlpha;
+   translucentBlendOp = AddAlpha;
+   
+   preload = true;
+};

Templates/BaseGame/game/core/gameObjects/materials/DefaultDecalRoadMaterial.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="DefaultDecalRoadMaterial"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="DefaultDecalRoadMaterial"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="DefaultDecalRoadMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_GameObjects:defaultRoadTextureTop_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/gameObjects/materials/DefaultRoadMaterialOther.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="DefaultRoadMaterialOther"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="DefaultRoadMaterialOther"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="DefaultRoadMaterialOther">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_GameObjects:defaultRoadTextureOther_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/gameObjects/materials/DefaultRoadMaterialTop.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="DefaultRoadMaterialTop"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="DefaultRoadMaterialTop"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="DefaultRoadMaterialTop">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_GameObjects:defaultRoadTextureTop_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/gameObjects/materials/TexturedRibbonMat.asset.taml

@@ -2,6 +2,6 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="TexturedRibbonMat"
-    scriptFile="@assetFile=materials.tscript"
+    scriptFile="@assetFile=TexturedRibbonMat.tscript"
     materialDefinitionName="TexturedRibbonMat"
     VersionId="1" />

Templates/BaseGame/game/core/gameObjects/materials/TexturedRibbonMat.tscript

@@ -0,0 +1,29 @@
+singleton ShaderData( TexturedRibbonShader )
+{
+   DXVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl";
+   DXPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl";
+   
+   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderV.glsl";
+   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderP.glsl";
+   
+   samplerNames[0] = "$ribTex";
+   
+   pixVersion = 2.0;
+};
+ 
+singleton CustomMaterial( TexturedRibbonMat )
+{
+   shader = TexturedRibbonShader;
+   version = 2.0;
+   
+   emissive[0] = true;
+   
+   doubleSided = true;
+   translucent = true;
+   BlendOp = AddAlpha;
+   translucentBlendOp = AddAlpha;
+
+   sampler["ribTex"] = "core/gameObjects/images/ribTex.png";
+   
+   preload = true;
+};

Templates/BaseGame/game/core/gameObjects/materials/materials.tscript

@@ -1,78 +0,0 @@
-singleton ShaderData( BasicRibbonShader )
-{
-   DXVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderV.hlsl";
-   DXPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/basicRibbonShaderP.hlsl";
- 
-   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderV.glsl";
-   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/gl/basicRibbonShaderP.glsl";
- 
-   samplerNames[0] = "$ribTex";
- 
-   pixVersion = 2.0;
-};
- 
-singleton CustomMaterial( BasicRibbonMat )
-{
-   shader = BasicRibbonShader;
-   version = 2.0;
-   
-   emissive[0] = true;
-   
-   doubleSided = true;
-   translucent = true;
-   BlendOp = AddAlpha;
-   translucentBlendOp = AddAlpha;
-   
-   preload = true;
-};
-
-singleton ShaderData( TexturedRibbonShader )
-{
-   DXVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderV.hlsl";
-   DXPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/texRibbonShaderP.hlsl";
-   
-   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderV.glsl";
-   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/ribbons/gl/texRibbonShaderP.glsl";
-   
-   samplerNames[0] = "$ribTex";
-   
-   pixVersion = 2.0;
-};
- 
-singleton CustomMaterial( TexturedRibbonMat )
-{
-   shader = TexturedRibbonShader;
-   version = 2.0;
-   
-   emissive[0] = true;
-   
-   doubleSided = true;
-   translucent = true;
-   BlendOp = AddAlpha;
-   translucentBlendOp = AddAlpha;
-
-   sampler["ribTex"] = "core/gameObjects/images/ribTex.png";
-   
-   preload = true;
-};
-
-singleton Material(DefaultDecalRoadMaterial)
-{
-   diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
-   mapTo = "unmapped_mat";
-   materialTag0 = "RoadAndPath";
-};
-
-singleton Material(DefaultRoadMaterialTop)
-{
-   mapTo = "unmapped_mat";
-   diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureTop_image";
-   materialTag0 = "RoadAndPath";
-};
-
-singleton Material(DefaultRoadMaterialOther)
-{
-   mapTo = "unmapped_mat";
-   diffuseMapAsset[0] = "Core_GameObjects:defaultRoadTextureOther_image";
-   materialTag0 = "RoadAndPath";
-};

Templates/BaseGame/game/core/gameObjects/shapes/CameraMat.asset.taml

@@ -2,6 +2,19 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="CameraMat"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="CameraMat"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="CameraMat"
+        doubleSided="1"
+        translucent="1"
+        translucentBlendOp="LerpAlpha"
+        castShadows="0">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_GameObjects:camera_image"
+                diffuseColor="0 0.627451 1 1"
+                emissive="1"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/gameObjects/shapes/Green.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="Green"
-    scriptFile="@assetFile=green"
-    materialDefinitionName="Green"
-    originalFilePath="D:/Gamedev/Projects/Catographer/GameBuild/Templates/BaseGame/game/core/gameObjects/shapes/green" />

Templates/BaseGame/game/core/gameObjects/shapes/OctahedronMat.asset.taml

@@ -2,6 +2,18 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="OctahedronMat"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="OctahedronMat"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="OctahedronMat"
+        mapTo="green"
+        translucent="1"
+        translucentBlendOp="PreMul"
+        castShadows="0">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_GameObjects:camera_image"
+                diffuseColor="0 1 0 1"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/gameObjects/shapes/green.tscript

@@ -1,196 +0,0 @@
-//--- OBJECT WRITE BEGIN ---
-new Material(OctahedronMat) {
-   mapTo = "green";
-   diffuseColor[0] = "0 1 0 1";
-   diffuseColor[1] = "1 1 1 1";
-   diffuseColor[2] = "1 1 1 1";
-   diffuseColor[3] = "1 1 1 1";
-   DiffuseMap[0] = "core/gameObjects/images/camera";
-   diffuseMapSRGB[0] = "1";
-   diffuseMapSRGB[1] = "1";
-   diffuseMapSRGB[2] = "1";
-   diffuseMapSRGB[3] = "1";
-   detailScale[0] = "2 2";
-   detailScale[1] = "2 2";
-   detailScale[2] = "2 2";
-   detailScale[3] = "2 2";
-   detailNormalMapStrength[0] = "1";
-   detailNormalMapStrength[1] = "1";
-   detailNormalMapStrength[2] = "1";
-   detailNormalMapStrength[3] = "1";
-   roughness[0] = "1";
-   roughness[1] = "1";
-   roughness[2] = "1";
-   roughness[3] = "1";
-   metalness[0] = "0";
-   metalness[1] = "0";
-   metalness[2] = "0";
-   metalness[3] = "0";
-   glowMul[0] = "0";
-   glowMul[1] = "0";
-   glowMul[2] = "0";
-   glowMul[3] = "0";
-   accuEnabled[0] = "0";
-   accuEnabled[1] = "0";
-   accuEnabled[2] = "0";
-   accuEnabled[3] = "0";
-   accuScale[0] = "1";
-   accuScale[1] = "1";
-   accuScale[2] = "1";
-   accuScale[3] = "1";
-   accuDirection[0] = "1";
-   accuDirection[1] = "1";
-   accuDirection[2] = "1";
-   accuDirection[3] = "1";
-   accuStrength[0] = "0.6";
-   accuStrength[1] = "0.6";
-   accuStrength[2] = "0.6";
-   accuStrength[3] = "0.6";
-   accuCoverage[0] = "0.9";
-   accuCoverage[1] = "0.9";
-   accuCoverage[2] = "0.9";
-   accuCoverage[3] = "0.9";
-   accuSpecular[0] = "16";
-   accuSpecular[1] = "16";
-   accuSpecular[2] = "16";
-   accuSpecular[3] = "16";
-   isSRGB[0] = "0";
-   isSRGB[1] = "0";
-   isSRGB[2] = "0";
-   isSRGB[3] = "0";
-   invertRoughness[0] = "0";
-   invertRoughness[1] = "0";
-   invertRoughness[2] = "0";
-   invertRoughness[3] = "0";
-   roughnessChan[0] = "0";
-   roughnessChan[1] = "0";
-   roughnessChan[2] = "0";
-   roughnessChan[3] = "0";
-   AOChan[0] = "1";
-   AOChan[1] = "1";
-   AOChan[2] = "1";
-   AOChan[3] = "1";
-   metalChan[0] = "2";
-   metalChan[1] = "2";
-   metalChan[2] = "2";
-   metalChan[3] = "2";
-   glow[0] = "0";
-   glow[1] = "0";
-   glow[2] = "0";
-   glow[3] = "0";
-   parallaxScale[0] = "0";
-   parallaxScale[1] = "0";
-   parallaxScale[2] = "0";
-   parallaxScale[3] = "0";
-   useAnisotropic[0] = "1";
-   useAnisotropic[1] = "1";
-   useAnisotropic[2] = "1";
-   useAnisotropic[3] = "1";
-   vertLit[0] = "0";
-   vertLit[1] = "0";
-   vertLit[2] = "0";
-   vertLit[3] = "0";
-   vertColor[0] = "0";
-   vertColor[1] = "0";
-   vertColor[2] = "0";
-   vertColor[3] = "0";
-   minnaertConstant[0] = "-1";
-   minnaertConstant[1] = "-1";
-   minnaertConstant[2] = "-1";
-   minnaertConstant[3] = "-1";
-   subSurface[0] = "0";
-   subSurface[1] = "0";
-   subSurface[2] = "0";
-   subSurface[3] = "0";
-   subSurfaceColor[0] = "1 0.2 0.2 1";
-   subSurfaceColor[1] = "1 0.2 0.2 1";
-   subSurfaceColor[2] = "1 0.2 0.2 1";
-   subSurfaceColor[3] = "1 0.2 0.2 1";
-   subSurfaceRolloff[0] = "0.2";
-   subSurfaceRolloff[1] = "0.2";
-   subSurfaceRolloff[2] = "0.2";
-   subSurfaceRolloff[3] = "0.2";
-   emissive[0] = "0";
-   emissive[1] = "0";
-   emissive[2] = "0";
-   emissive[3] = "0";
-   foreground[0] = "0";
-   foreground[1] = "0";
-   foreground[2] = "0";
-   foreground[3] = "0";
-   doubleSided = "0";
-   animFlags[0] = "0x00000000";
-   animFlags[1] = "0x00000000";
-   animFlags[2] = "0x00000000";
-   animFlags[3] = "0x00000000";
-   scrollDir[0] = "0 0";
-   scrollDir[1] = "0 0";
-   scrollDir[2] = "0 0";
-   scrollDir[3] = "0 0";
-   scrollSpeed[0] = "0";
-   scrollSpeed[1] = "0";
-   scrollSpeed[2] = "0";
-   scrollSpeed[3] = "0";
-   rotSpeed[0] = "0";
-   rotSpeed[1] = "0";
-   rotSpeed[2] = "0";
-   rotSpeed[3] = "0";
-   rotPivotOffset[0] = "0 0";
-   rotPivotOffset[1] = "0 0";
-   rotPivotOffset[2] = "0 0";
-   rotPivotOffset[3] = "0 0";
-   waveType[0] = "Sin";
-   waveType[1] = "Sin";
-   waveType[2] = "Sin";
-   waveType[3] = "Sin";
-   waveFreq[0] = "0";
-   waveFreq[1] = "0";
-   waveFreq[2] = "0";
-   waveFreq[3] = "0";
-   waveAmp[0] = "0";
-   waveAmp[1] = "0";
-   waveAmp[2] = "0";
-   waveAmp[3] = "0";
-   sequenceFramePerSec[0] = "0";
-   sequenceFramePerSec[1] = "0";
-   sequenceFramePerSec[2] = "0";
-   sequenceFramePerSec[3] = "0";
-   sequenceSegmentSize[0] = "0";
-   sequenceSegmentSize[1] = "0";
-   sequenceSegmentSize[2] = "0";
-   sequenceSegmentSize[3] = "0";
-   cellIndex[0] = "0 0";
-   cellIndex[1] = "0 0";
-   cellIndex[2] = "0 0";
-   cellIndex[3] = "0 0";
-   cellLayout[0] = "0 0";
-   cellLayout[1] = "0 0";
-   cellLayout[2] = "0 0";
-   cellLayout[3] = "0 0";
-   cellSize[0] = "0";
-   cellSize[1] = "0";
-   cellSize[2] = "0";
-   cellSize[3] = "0";
-   bumpAtlas[0] = "0";
-   bumpAtlas[1] = "0";
-   bumpAtlas[2] = "0";
-   bumpAtlas[3] = "0";
-   castShadows = "0";
-   planarReflection = "0";
-   translucent = "1";
-   translucentBlendOp = "PreMul";
-   translucentZWrite = "0";
-   alphaTest = "0";
-   alphaRef = "1";
-   dynamicCubemap = "0";
-   showFootprints = "1";
-   showDust = "0";
-   effectColor[0] = "0 0 0 0";
-   effectColor[1] = "0 0 0 0";
-   footstepSoundId = "-1";
-   impactSoundId = "-1";
-   ImpactFXIndex = "-1";
-   canSave = "1";
-   canSaveDynamicFields = "1";
-};
-//--- OBJECT WRITE END ---

Templates/BaseGame/game/core/gameObjects/shapes/materials.tscript

@@ -1,95 +0,0 @@
-//-----------------------------------------------------------------------------
-// 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 Material(OctahedronMat)
-{
-   mapTo = "green";
-
-   diffuseMapAsset[0] = "Core_GameObjects:camera_image";
-
-   translucent = "1";
-   translucentBlendOp = "PreMul";
-   emissive = "0";
-   castShadows = "0";
-
-   diffuseColor[0] = "0 1 0 1";
-};
-
-//--- camera.dts MATERIALS BEGIN ---
-singleton Material(CameraMat)
-{
-   mapTo = "pasted__phongE1";
-
-	diffuseMapAsset[0] = "Core_GameObjects:camera_image";
-
-	diffuseColor[0] = "0 0.627451 1 1";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 211;
-	pixelSpecular[0] = 1;
-	emissive[0] = 1;
-
-	doubleSided = 1;
-	translucent = true;
-	translucentBlendOp = "LerpAlpha";
-   castShadows = false;
-   materialTag0 = "Miscellaneous";
-};
-
-//--- camera.dts MATERIALS END ---
-
-//--- noshapetext.dae MATERIALS BEGIN ---
-singleton Material(noshapetext_lambert1)
-{
-   mapTo = "lambert1";
-
-	diffuseMapAsset[0] = "";
-
-	diffuseColor[0] = "0.4 0.4 0.4 1";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = false;
-	translucentBlendOp = "None";
-};
-
-singleton Material(noshapetext_noshape_mat)
-{
-   mapTo = "noshape_mat";
-
-	diffuseMapAsset[0] = "";
-
-	diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = true;
-	translucentBlendOp = "None";
-};
-
-//--- noshapetext.dae MATERIALS END ---
-

Templates/BaseGame/game/core/gameObjects/shapes/noshape.asset.taml

@@ -3,4 +3,5 @@
     canSaveDynamicFields="true"
     AssetName="noshape"
     fileName="@assetFile=noshape.dts"
+    materialSlot0="@asset=Core_Rendering:noShapeMat"
     constuctorFileName="@assetFile=noshape.tscript" />

Templates/BaseGame/game/core/gameObjects/shapes/noshape_NoShape.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="noshape_NoShape"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="noshape_NoShape"
-    VersionId="1" />

Templates/BaseGame/game/core/gameObjects/shapes/noshapetext_lambert1.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="noshapetext_lambert1"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="noshapetext_lambert1"
-    VersionId="1" />

Templates/BaseGame/game/core/gameObjects/shapes/noshapetext_noshape_mat.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="noshapetext_noshape_mat"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="noshapetext_noshape_mat"
-    VersionId="1" />

Templates/BaseGame/game/core/gui/scripts/profiles.tscript

@@ -245,3 +245,11 @@ new GuiControlProfile( GuiSliderProfile )
    bitmapAsset = "Core_GUI:slider_image";
    category = "Core";
 };
+
+//
+if(!isObject(GuiScrollProfile))
+new GuiControlProfile(GuiScrollProfile)
+{
+	bitmapAsset = "Core_GUI:scrollBar_image";
+   category = "Core";
+};

Templates/BaseGame/game/core/lighting/scripts/AL_ConvexLightState.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="AL_ConvexLightState"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="AL_ConvexLightState"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/AL_DefaultDeferredMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="AL_DefaultDeferredMaterial"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="AL_DefaultDeferredMaterial"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/AL_DefaultShadowMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="AL_DefaultShadowMaterial"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="AL_DefaultShadowMaterial"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/AL_ParticlePointLightShader.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="AL_ParticlePointLightShader"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="AL_ParticlePointLightShader"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/AL_SpotLightShader.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="AL_SpotLightShader"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="AL_SpotLightShader"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/BL_ProjectedShadowRPM.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="BL_ProjectedShadowRPM"
-    scriptFile="@assetFile=basicLighting_Init.tscript"
-    materialDefinitionName="BL_ProjectedShadowRPM"
-    VersionId="1" />

Templates/BaseGame/game/core/lighting/scripts/IrradianceShader.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="IrradianceShader"
-    scriptFile="@assetFile=advancedLighting_Shaders.tscript"
-    materialDefinitionName="IrradianceShader"
-    VersionId="1" />

Templates/BaseGame/game/core/rendering/images/WarningMaterial.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="WarningMaterial"
+    materialDefinitionName="WarningMaterial"
+    VersionId="1">
+    <Material
+        Name="WarningMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_Rendering:missingTexture_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/images/materials.tscript

@@ -1,32 +0,0 @@
-//-----------------------------------------------------------------------------
-// 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 Material( Empty )
-{
-};
-
-singleton Material(WarningMaterial) {
-   detailMapAsset[0] = "Core_Rendering:missingTexture_image";
-   diffuseColor[0] = "25 16 0";
-   emissive[0] = false;
-   translucent = false;
-};

Templates/BaseGame/game/core/rendering/materials/Blank_sky/BlankSkyMat.asset.taml

@@ -2,6 +2,6 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="BlankSkyMat"
-    scriptFile="@assetFile=materials.tscript"
+    scriptFile="@assetFile=BlankSkyMat.tscript"
     materialDefinitionName="BlankSkyMat"
     VersionId="1" />

Templates/BaseGame/game/core/rendering/materials/NightSkyMat.asset.taml → Templates/BaseGame/game/core/rendering/materials/NightSkybox/NightSkyMat.asset.taml

@@ -2,6 +2,6 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="NightSkyMat"
-    scriptFile="@assetFile=materials.tscript"
+    scriptFile="@assetFile=NightSkyMat.tscript"
     materialDefinitionName="NightSkyMat"
     VersionId="1" />

Templates/BaseGame/game/core/rendering/materials/NightSkybox/NightSkyMat.tscript

@@ -0,0 +1,15 @@
+singleton CubemapData( NightCubemap )
+{
+   cubeMapFaceAsset[0] = "Core_Rendering:NightSkybox_1";
+   cubeMapFaceAsset[1] = "Core_Rendering:NightSkybox_2";
+   cubeMapFaceAsset[2] = "Core_Rendering:NightSkybox_3";
+   cubeMapFaceAsset[3] = "Core_Rendering:NightSkybox_4";
+   cubeMapFaceAsset[4] = "Core_Rendering:NightSkybox_5";
+   cubeMapFaceAsset[5] = "Core_Rendering:NightSkybox_6";
+};
+
+singleton Material( NightSkyMat )
+{
+   cubemap = NightCubemap;
+   materialTag0 = "Skies";
+};

Templates/BaseGame/game/core/rendering/materials/NoMaterial.asset.taml

@@ -2,5 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="NoMaterial"
-    scriptFile="@assetFile=NoMaterial"
-    materialDefinitionName="NoMaterial" />
+    materialDefinitionName="NoMaterial">
+    <Material
+        Name="NoMaterial"
+        mapTo="NoMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_Rendering:warnMat_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/materials/NoMaterial.tscript

@@ -1,6 +0,0 @@
-//--- OBJECT WRITE BEGIN ---
-singleton Material(NoMaterial) {
-   mapTo="NoMaterial";
-   DiffuseMapAsset[0] = "Core_Rendering:warnMat_image";
-};
-//--- OBJECT WRITE END ---

Templates/BaseGame/game/core/rendering/materials/materials.tscript

@@ -1,65 +0,0 @@
-//-----------------------------------------------------------------------------
-// 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.
-//-----------------------------------------------------------------------------
-
-//--- OBJECT WRITE BEGIN ---
-
-singleton CubemapData( NightCubemap )
-{
-   cubeMapFaceAsset[0] = "Core_Rendering:NightSkybox_1";
-   cubeMapFaceAsset[1] = "Core_Rendering:NightSkybox_2";
-   cubeMapFaceAsset[2] = "Core_Rendering:NightSkybox_3";
-   cubeMapFaceAsset[3] = "Core_Rendering:NightSkybox_4";
-   cubeMapFaceAsset[4] = "Core_Rendering:NightSkybox_5";
-   cubeMapFaceAsset[5] = "Core_Rendering:NightSkybox_6";
-};
-
-singleton Material( NightSkyMat )
-{
-   cubemap = NightCubemap;
-   materialTag0 = "Skies";
-};
-
-singleton Material(moon_noglow) {
-   mapTo="moon_noglow";
-   DiffuseMapAsset = "Core_Rendering:moon_noglow_image";
-   emissive = true;
-   translucent = true;
-   vertColor[ 0 ] = true;
-};
-
-singleton Material(moon_wglow) {
-   mapTo="moon_wglow";
-   DiffuseMapAsset = "Core_Rendering:moon_wglow_image";
-   emissive = true;
-   translucent = true;
-   vertColor[ 0 ] = true;
-};
-
-singleton Material(moon_wcorona) {
-   mapTo="moon_wcorona";
-   DiffuseMapAsset = "Core_Rendering:moon_wcorona_image";
-   emissive = true;
-   translucent = true;
-   vertColor[ 0 ] = true;
-};
-
-//--- OBJECT WRITE END ---

Templates/BaseGame/game/core/rendering/materials/moon_noglow.asset.taml

@@ -2,6 +2,17 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="moon_noglow"
-    scriptFile="@assetFile=moon_noglow.tscript"
     materialDefinitionName="moon_noglow"
-    imageMap0="@Asset=Core_Rendering:moon_noglow_image"/>
+    VersionId="1">
+    <Material
+        Name="moon_noglow"
+        mapTo="moon_noglow"
+        emissive="1"
+        translucent="1">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_Rendering:moon_noglow_image"
+                vertColor="1";/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/materials/moon_noglowMat.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="OccluderProxyMaterial"
+    materialDefinitionName="OccluderProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="OccluderProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:occluderProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/materials/moon_wcoronaMat.asset.taml

@@ -0,0 +1,18 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="moon_wcorona"
+    materialDefinitionName="moon_wcorona"
+    VersionId="1">
+    <Material
+        Name="moon_wcorona"
+        mapTo="moon_wcorona"
+        emissive="1"
+        translucent="1">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_Rendering:moon_wcorona_image"
+                vertColor="1";/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/materials/moon_wglow.asset.taml

@@ -2,6 +2,17 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="moon_wglow"
-    scriptFile="@assetFile=moon_wglow.tscript"
     materialDefinitionName="moon_wglow"
-    imageMap0="@Asset=Core_Rendering:moon_wglow_image"/>
+    VersionId="1">
+    <Material
+        Name="moon_wglow"
+        mapTo="moon_wglow"
+        emissive="1"
+        translucent="1">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="Core_Rendering:moon_wglow_image"
+                vertColor="1";/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/materials/moon_wglowMat.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="OccluderProxyMaterial"
+    materialDefinitionName="OccluderProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="OccluderProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:occluderProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/shapes/materials.tscript

@@ -1,16 +0,0 @@
-//--- noshape.dts MATERIALS BEGIN ---
-singleton Material(noshape_NoShape)
-{
-    mapTo = "NoShape";
-
-    diffuseMapAsset[0] = "";
-    diffuseColor[0] = "0.8 0.003067 0 .8";
-    emissive[0] = 0;
-    doubleSided = false;
-    translucent = 1;
-    translucentBlendOp = "LerpAlpha";
-    castShadows = false;
-    materialTag0 = "WorldEditor";
-};
-
-//--- noshape.dts MATERIALS END ---

Templates/BaseGame/game/core/rendering/shapes/noShapeMat.asset.taml

@@ -0,0 +1,18 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="NoShapeMat"
+    materialDefinitionName="NoShapeMat"
+    VersionId="1">
+    <Material
+        Name="NoShapeMat"
+        mapTo="NoShape"
+        translucent="1";
+        translucentBlendOp="LerpAlpha";
+        castShadows="0">
+        <Material.Stages>
+            <Stages_beginarray
+                diffuseColor="0.8 0.003067 0 .8"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/core/rendering/shapes/noshape.asset.taml

@@ -3,4 +3,5 @@
     canSaveDynamicFields="true"
     AssetName="noshape"
     fileName="@assetFile=noshape.dts"
+    materialSlot0="@asset=Core_Rendering:NoShapeMat"
     VersionId="1" />

Templates/BaseGame/game/tools/base/images/Black.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="Black"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="Black"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="Black">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:black_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/base/images/Gray.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="Gray"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="Gray"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="Gray">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:gray_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/base/images/White.asset.taml

@@ -2,6 +2,13 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="White"
-    scriptFile="@assetFile=materials.tscript"
     materialDefinitionName="White"
-    VersionId="1" />
+    VersionId="1">
+    <Material
+        Name="White">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:white_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/base/images/materials.tscript

@@ -1,67 +0,0 @@
-//-----------------------------------------------------------------------------
-// Torque
-// Copyright GarageGames, LLC 2011
-//-----------------------------------------------------------------------------
-
-singleton Material(White)
-{
-   diffuseMapAsset[0] = "ToolsModule:white_image";
-};
-
-singleton Material(Gray)
-{
-   diffuseMapAsset[0] = "ToolsModule:gray_image";
-};
-
-singleton Material(Black)
-{
-   diffuseMapAsset[0] = "ToolsModule:black_image";
-};
-
-singleton Material(Grid_512_Black)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_black_image";
-};
-
-singleton Material(Grid_512_ForestGreen)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_forestgreen_image";
-};
-
-singleton Material(Grid_512_ForestGreen_Lines)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_forestgreen_lines_image";
-};
-
-singleton Material(Grid_512_Green)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_green_image";
-};
-
-singleton Material(Grid_512_Grey)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_grey_image";
-};
-
-singleton Material(Grid_512_Grey_Base)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_grey_base_image";
-};
-
-singleton Material(Grid_512_Orange)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_orange_image";
-   translucent = "0";
-   translucentBlendOp = "PreMul";
-   mapTo = "512_orange.png";
-};
-
-singleton Material(Grid_512_Orange_Lines)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_orange_lines_image";
-};
-
-singleton Material(Grid_512_Red)
-{
-   diffuseMapAsset[0] = "ToolsModule:512_red_image";
-};

Templates/BaseGame/game/tools/convexEditor/OccluderProxyMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="OccluderProxyMaterial"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="OccluderProxyMaterial"
-    VersionId="1" />

Templates/BaseGame/game/tools/convexEditor/PortalProxyMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="PortalProxyMaterial"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="PortalProxyMaterial"
-    VersionId="1" />

Templates/BaseGame/game/tools/convexEditor/TriggerProxyMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="TriggerProxyMaterial"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="TriggerProxyMaterial"
-    VersionId="1" />

Templates/BaseGame/game/tools/convexEditor/ZoneProxyMaterial.asset.taml

@@ -1,7 +0,0 @@
-<MaterialAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="ZoneProxyMaterial"
-    scriptFile="@assetFile=materials.tscript"
-    materialDefinitionName="ZoneProxyMaterial"
-    VersionId="1" />

Templates/BaseGame/game/tools/convexEditor/convexEditor.tscript

@@ -44,10 +44,3 @@ singleton GuiControlProfile (GuiDisabledTextEditProfile)
    canKeyFocus = false;   
    category = "Editor";
 };
-
-singleton GuiControlProfile (GuiSimpleBorderProfile)
-{
-   opaque = false;   
-   border = 1;   
-   category = "Editor";
-};

Templates/BaseGame/game/tools/convexEditor/images/OccluderProxyMaterial.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="OccluderProxyMaterial"
+    materialDefinitionName="OccluderProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="OccluderProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:occluderProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/convexEditor/images/PortalProxyMaterial.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="PortalProxyMaterial"
+    materialDefinitionName="PortalProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="PortalProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:portalProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/convexEditor/images/TriggerProxyMaterial.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="TriggerProxyMaterial"
+    materialDefinitionName="TriggerProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="TriggerProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:triggerProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/convexEditor/images/ZoneProxyMaterial.asset.taml

@@ -0,0 +1,14 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="ZoneProxyMaterial"
+    materialDefinitionName="ZoneProxyMaterial"
+    VersionId="1">
+    <Material
+        Name="ZoneProxyMaterial">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:zoneProxyImage_image"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/convexEditor/main.tscript

@@ -29,7 +29,6 @@ function initializeConvexEditor()
    exec( "./convexEditorToolbar.ed.gui" );
    exec( "./convexEditorGui." @ $TorqueScriptFileExtension );
    exec( "./convexEditorSidebarGui.gui" );
-   exec( "./materials." @ $TorqueScriptFileExtension );
 
    ConvexEditorGui.setVisible( false );  
    ConvexEditorOptionsWindow.setVisible( false );  

Templates/BaseGame/game/tools/convexEditor/materials.tscript

@@ -1,39 +0,0 @@
-singleton Material( ZoneProxyMaterial )
-{
-   mapTo = "ZoneProxyMaterial";
-   diffuseMapAsset[0] = "ToolsModule:zoneProxyImage_image";
-   materialTag0 = "TestMaterial";
-   translucent = true;
-   translucentBlendOp = "LerpAlpha";
-   castShadows = false;
-};
-
-singleton Material( TriggerProxyMaterial )
-{
-   mapTo = "TriggerProxyMaterial";
-   diffuseMapAsset[0] = "ToolsModule:triggerProxyImage_image";
-   materialTag0 = "TestMaterial";
-   translucent = true;
-   translucentBlendOp = "PreMul";
-   castShadows = false;
-};
-
-singleton Material( PortalProxyMaterial )
-{
-   mapTo = "PortalProxyMaterial";
-   diffuseMapAsset[0] = "ToolsModule:portalProxyImage_image";
-   materialTag0 = "TestMaterial";
-   translucent = true;
-   translucentBlendOp = "PreMul";
-   castShadows = false;
-};
-
-singleton Material( OccluderProxyMaterial )
-{
-   mapTo = "OccluderProxyMaterial";
-   diffuseMapAsset[0] = "ToolsModule:occluderProxyImage_image";
-   materialTag0 = "TestMaterial";
-   translucent = true;
-   translucentBlendOp = "PreMul";
-   castShadows = false;
-};

Templates/BaseGame/game/tools/datablockEditor/.asset.taml

@@ -1,6 +0,0 @@
-<GUIAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    scriptFile="@assetFile=DatablockEditorTreeWindow.ed.gui"
-    GUIFile="@assetFile=DatablockEditorTreeWindow.ed.gui"
-    VersionId="1" />

Templates/BaseGame/game/tools/gui/.asset.taml

@@ -1,6 +0,0 @@
-<GUIAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    scriptFile="@assetFile=guiObjectInspector.ed.gui"
-    GUIFile="@assetFile=guiObjectInspector.ed.gui"
-    VersionId="1" />

Templates/BaseGame/game/tools/gui/profiles.ed.tscript

@@ -698,22 +698,6 @@ new GuiControlProfile( ToolsGuiFormProfile : ToolsGuiTextProfile )
 
 // ----------------------------------------------------------------------------
 
-singleton GuiControlProfile( GuiEditorClassProfile )
-{
-   opaque = true;
-   fillColor = "232 232 232";
-   border = 1;
-   borderColor   = "42 42 42 140";
-   borderColorHL = "127 127 127";
-   fontColor = "215 215 215";
-   fontColorHL = "50 50 50";
-   fixedExtent = true;
-   justify = "center";
-   bitmapAsset = "ToolsModule:scrollBar_image";
-   hasBitmapArray = true;
-   category = "Editor";
-};
-
 singleton GuiControlProfile( GuiBackFillProfile )
 {
    opaque = true;
@@ -1246,3 +1230,11 @@ singleton GuiControlProfile (IconDropdownProfile)
    
    fillColor = EditorSettings.value("Theme/headerColor");
 };
+
+//
+singleton GuiControlProfile (GuiSimpleBorderProfile)
+{
+   opaque = false;   
+   border = 1;   
+   category = "Editor";
+};

Templates/BaseGame/game/tools/main.tscript

@@ -82,7 +82,6 @@ function onStart()
    // Common GUI stuff.
    exec( "./gui/cursors.ed." @ $TorqueScriptFileExtension );
    exec( "./gui/messageBoxes/messageBox.ed." @ $TorqueScriptFileExtension );
-   exec( "./editorClasses/gui/panels/navPanelProfiles.ed." @ $TorqueScriptFileExtension );
    
    // Make sure we get editor profiles before any GUI's
    // BUG: these dialogs are needed earlier in the init sequence, and should be moved to

Templates/BaseGame/game/tools/materialEditor/gui/.asset.taml

@@ -1,6 +0,0 @@
-<GUIAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    scriptFile="@assetFile=guiMaterialPreviewWindow.ed.gui"
-    GUIFile="@assetFile=guiMaterialPreviewWindow.ed.gui"
-    VersionId="1" />

Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditor.tscript

@@ -43,11 +43,4 @@ singleton GuiControlProfile (GuiDisabledTextEditProfile)
    tab = false;
    canKeyFocus = false;   
    category = "Editor";
-};
-
-singleton GuiControlProfile (GuiSimpleBorderProfile)
-{
-   opaque = false;   
-   border = 1;   
-   category = "Editor";
 };

Templates/BaseGame/game/tools/navEditor/navEditor.tscript

@@ -351,10 +351,3 @@ singleton GuiControlProfile(NavEditorProfile)
    fillColor = "192 192 192 192";
    category = "Editor";
 };
-
-singleton GuiControlProfile(GuiSimpleBorderProfile)
-{
-   opaque = false;   
-   border = 1;   
-   category = "Editor";
-};

Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml

@@ -0,0 +1,18 @@
+<MaterialAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="ReflectProbePreviewMat"
+    materialDefinitionName="ReflectProbePreviewMat"
+    VersionId="1">
+    <Material
+        Name="ReflectProbePreviewMat"
+        mapTo="ReflectProbePreviewMat">
+        <Material.Stages>
+            <Stages_beginarray
+                DiffuseMapAsset="ToolsModule:occluderProxyImage_image"
+                diffuseColor="1 1 1 1"
+                roughness="0"
+                metalness="1"/>
+        </Material.Stages>
+    </Material>
+</MaterialAsset>

Templates/BaseGame/game/tools/resources/materials.tscript

@@ -1,8 +0,0 @@
-singleton Material(ReflectProbePreviewMat)
-{
-   mapTo = "ReflectProbePreviewMat";
-   diffuseColor[0] = "1 1 1 1";
-   roughness[0] = "0";
-   metalness[0] = "1";
-   translucentBlendOp = "None";
-};

Templates/BaseGame/game/tools/riverEditor/riverEditor.tscript

@@ -26,12 +26,4 @@ singleton GuiControlProfile( RiverEditorProfile )
    opaque = true;
    fillColor = "192 192 192 192";
    category = "Editor";
-};
-
-singleton GuiControlProfile (GuiSimpleBorderProfile)
-{
-   opaque = false;   
-   border = 1;   
-   category = "Editor";
-};
- 
+};

Templates/BaseGame/game/tools/roadEditor/roadEditor.tscript

@@ -28,13 +28,6 @@ singleton GuiControlProfile( RoadEditorProfile )
    category = "Editor";
 };
 
-singleton GuiControlProfile (GuiSimpleBorderProfile)
-{
-   opaque = false;   
-   border = 1;   
-   category = "Editor";
-};
-
 singleton GuiCursor(RoadEditorMoveCursor)
 {
    hotSpot = "4 4";

Templates/BaseGame/game/tools/shapeEditor/gui/.asset.taml

@@ -1,6 +0,0 @@
-<GUIAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    scriptFile="@assetFile=shapeEdSelectWindow.ed.gui"
-    GUIFile="@assetFile=shapeEdSelectWindow.ed.gui"
-    VersionId="1" />

Templates/BaseGame/game/tools/worldEditor/gui/.asset.taml

@@ -1,6 +0,0 @@
-<GUIAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    scriptFile="@assetFile=WorldEditorTreeWindow.ed.gui"
-    GUIFile="@assetFile=WorldEditorTreeWindow.ed.gui"
-    VersionId="1" />

Templates/BaseGame/game/tools/worldEditor/gui/AL_ShadowVizOverlayCtrl.asset.taml

@@ -2,6 +2,6 @@
     canSave="true"
     canSaveDynamicFields="true"
     AssetName="AL_ShadowVizOverlayCtrl"
-    scriptFile="@assetFile=shadowViz.gui"
+    scriptFile="@assetFile=shadowViz.tscript"
     GUIFile="@assetFile=shadowViz.gui"
     VersionId="1" />

Templates/BaseGame/game/tools/worldEditor/main.tscript

@@ -68,10 +68,7 @@ function initializeWorldEditor()
    exec("./scripts/cameraCommands.ed." @ $TorqueScriptFileExtension);
    exec("./scripts/probeBake.ed." @ $TorqueScriptFileExtension);
    exec("./scripts/visibility/visibilityLayer.ed." @ $TorqueScriptFileExtension);
-   exec("./scripts/visibility/lightViz." @ $TorqueScriptFileExtension);
-   exec("./scripts/visibility/shadowViz." @ $TorqueScriptFileExtension);
    exec("./scripts/visibility/probeViz." @ $TorqueScriptFileExtension);
-   exec("./scripts/visibility/miscViz." @ $TorqueScriptFileExtension);
    
    exec("tools/gui/postFxEditor." @ $TorqueScriptFileExtension );
    exec("tools/gui/renderTargetVisualizer.ed." @ $TorqueScriptFileExtension);

Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript

@@ -216,7 +216,7 @@ function EditorGui::init(%this)
    ETerrainEditor.init();
 
    //Creator.init();
-   ObjectCreator.init();
+   //ObjectCreator.init();
    ObjectBuilderGui.init();
 
    %this.setMenuDefaultState();

Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript

@@ -20,104 +20,8 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-
-function ObjectCreator::init( %this )
-{
-   // Just so we can recall this method for testing changes
-   // without restarting.
-   if ( isObject( %this.array ) )
-      %this.array.delete();
-      
-   %this.array = new ArrayObject();
-   %this.array.caseSensitive = true; 
-   %this.setListView( true );
-   
-   %this.beginGroup( "Environment" );
-   
-      // Removed Prefab as there doesn't really seem to be a point in creating a blank one
-      //%this.registerMissionObject( "Prefab",              "Prefab" );
-      %this.registerMissionObject( "SkyBox",              "Sky Box" );
-      %this.registerMissionObject( "SkySphere",           "Sky Sphere" );
-      %this.registerMissionObject( "CloudLayer",          "Cloud Layer" );
-      %this.registerMissionObject( "BasicClouds",         "Basic Clouds" );
-      %this.registerMissionObject( "ScatterSky",          "Scatter Sky" );
-      %this.registerMissionObject( "Sun",                 "Basic Sun" );
-      %this.registerMissionObject( "Lightning" );
-      %this.registerMissionObject( "WaterBlock",          "Water Block" );
-      %this.registerMissionObject( "SFXEmitter",          "Sound Emitter" );
-      %this.registerMissionObject( "Precipitation" );
-      %this.registerMissionObject( "ParticleEmitterNode", "Particle Emitter" );
-      %this.registerMissionObject( "VolumetricFog", "Volumetric Fog" );
-      %this.registerMissionObject( "RibbonNode", "Ribbon" );
-      
-      // Legacy features. Users should use Ground Cover and the Forest Editor.   
-      //%this.registerMissionObject( "fxShapeReplicator",   "Shape Replicator" );
-      //%this.registerMissionObject( "fxFoliageReplicator", "Foliage Replicator" );
-      
-      %this.registerMissionObject( "PointLight",          "Point Light" );
-      %this.registerMissionObject( "SpotLight",           "Spot Light" );
-      
-      %this.registerMissionObject( "BoxEnvironmentProbe",       "Box Environment Probe" );
-      %this.registerMissionObject( "SphereEnvironmentProbe",    "Sphere Environment Probe" );
-      %this.registerMissionObject( "Skylight",       "Skylight" );
-      
-      %this.registerMissionObject( "GroundCover",         "Ground Cover" );
-      %this.registerMissionObject( "TerrainBlock",        "Terrain Block" );
-      %this.registerMissionObject( "GroundPlane",         "Ground Plane" );
-      %this.registerMissionObject( "WaterPlane",          "Water Plane" );
-      %this.registerMissionObject( "PxCloth",             "Cloth" );
-      %this.registerMissionObject( "ForestWindEmitter",   "Wind Emitter" );
-               
-      %this.registerMissionObject( "DustEmitter", "Dust Emitter" );
-      %this.registerMissionObject( "DustSimulation", "Dust Simulation" );
-      %this.registerMissionObject( "DustEffecter", "Dust Effecter" );
-      
-   %this.endGroup();
-
-   %this.beginGroup( "Level" );
-   
-      %this.registerMissionObject( "MissionArea",  "Mission Area" );
-      %this.registerMissionObject( "Path" );
-      %this.registerMissionObject( "Marker",       "Path Node" );
-      %this.registerMissionObject( "Trigger" );
-      %this.registerMissionObject( "PhysicalZone", "Physical Zone" );
-      %this.registerMissionObject( "Camera" );
-      %this.registerMissionObject( "LevelInfo",    "Level Info" );
-      %this.registerMissionObject( "TimeOfDay",    "Time of Day" );
-      %this.registerMissionObject( "Zone",         "Zone" );
-      %this.registerMissionObject( "Portal",       "Zone Portal" );
-      %this.registerMissionObject( "SpawnSphere",  "Player Spawn Sphere", "PlayerDropPoint" );
-      %this.registerMissionObject( "SpawnSphere",  "Observer Spawn Sphere", "ObserverDropPoint" );
-      %this.registerMissionObject( "SpawnSphere",  "General Spawn Sphere", "GeneralDropPoint" );
-      %this.registerMissionObject( "SFXSpace",      "Sound Space" );
-      %this.registerMissionObject( "OcclusionVolume", "Occlusion Volume" );
-      %this.registerMissionObject( "AccumulationVolume", "Accumulation Volume" );
-      %this.registerMissionObject("NavMesh", "Navigation mesh");
-      %this.registerMissionObject("NavPath", "Path");
-      %this.registerMissionObject( "Entity",       "Entity" );
-      %this.registerMissionObject( "NotesObject",       "Note" );
-      
-   %this.endGroup();
-   
-   %this.beginGroup( "System" );
-   
-      %this.registerMissionObject( "SimGroup" );
-      
-   %this.endGroup();  
-
-   %this.beginGroup( "ExampleObjects" );
-   
-      %this.registerMissionObject( "RenderObjectExample" );
-      %this.registerMissionObject( "RenderMeshExample" );
-      %this.registerMissionObject( "RenderShapeExample" );
-      
-   %this.endGroup(); 
-}
-
 function ObjectCreator::onWake( %this )
 {
-   CreatorTabBook.selectPage( 0 );
-   CreatorTabBook.onTabSelected( "Scripted" );
 }
 
 function ObjectCreator::beginGroup( %this, %group )
@@ -159,8 +63,6 @@ function ObjectCreator::registerMissionObject( %this, %class, %name, %buildfunc,
    %args.val[0] = %class;
    %args.val[1] = %name;
    %args.val[2] = %buildfunc;
-   
-   %this.array.push_back( %group, %args );
 }
 
 function ObjectCreator::getNewObjectGroup( %this )
@@ -271,330 +173,6 @@ function ObjectCreator::onObjectCreated( %this, %objId )
    EWorldEditor.dropSelection( true );
 }
 
-function CreatorTabBook::onTabSelected( %this, %text, %idx )
-{
-   if ( %this.isAwake() )
-   {
-      ObjectCreator.tab = %text;      
-      ObjectCreator.navigate( "" );
-   }
-}
-
-function ObjectCreator::navigate( %this, %address )
-{
-   CreatorIconArray.frozen = true;
-   CreatorIconArray.clear();  
-   CreatorPopupMenu.clear();       
-        
-   if ( %this.tab $= "Scripted" )
-   {
-      %category = getWord( %address, 1 );                  
-      %dataGroup = "DataBlockGroup";
-      
-      for ( %i = 0; %i < %dataGroup.getCount(); %i++ )
-      {
-         %obj = %dataGroup.getObject(%i);
-         // echo ("Obj: " @ %obj.getName() @ " - " @ %obj.category );
-         
-         if ( %obj.category $= "" && %obj.category == 0 )
-            continue;
-            
-         // Add category to popup menu if not there already
-         if ( CreatorPopupMenu.findText( %obj.category ) == -1 )
-            CreatorPopupMenu.add( %obj.category );
-         
-         if ( %address $= "" )
-         {         
-            %ctrl = %this.findIconCtrl( %obj.category );
-            if ( %ctrl == -1 )
-            {
-               %this.addFolderIcon( %obj.category );
-            }    
-         }
-         else if ( %address $= %obj.category )
-         {            
-            %ctrl = %this.findIconCtrl( %obj.getName() );
-            if ( %ctrl == -1 )
-               %this.addShapeIcon( %obj );
-         }
-      }
-   }
-   
-   if ( %this.tab $= "Meshes" )
-   {      
-      %fullPath = findFirstFileMultiExpr( getFormatExtensions() );
-      
-      while ( %fullPath !$= "" )
-      {
-         if (strstr(%fullPath, "cached.dts") != -1)
-         {
-            %fullPath = findNextFileMultiExpr( getFormatExtensions() );
-            continue;
-         }
-
-         %fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );                                  
-         %splitPath = strreplace( %fullPath, " ", "_" );
-         %splitPath = strreplace( %splitPath, "/", " " );
-         if( getWord(%splitPath, 0) $= "tools" )
-         {
-            %fullPath = findNextFileMultiExpr( getFormatExtensions() );
-            continue;
-         }
-                      
-         %dirCount = getWordCount( %splitPath ) - 1;
-         
-         %pathFolders = getWords( %splitPath, 0, %dirCount - 1 );         
-         
-         // Add this file's path (parent folders) to the
-         // popup menu if it isn't there yet.
-         %temp = strreplace( %pathFolders, " ", "/" );         
-         %temp = strreplace( %temp, "_", " " );
-         %r = CreatorPopupMenu.findText( %temp );
-         if ( %r == -1 )
-         {
-            CreatorPopupMenu.add( %temp );
-         }
-         
-         // Is this file in the current folder?        
-         if ( stricmp( %pathFolders, %address ) == 0 )
-         {
-            %this.addStaticIcon( %fullPath );
-         }
-         // Then is this file in a subfolder we need to add
-         // a folder icon for?
-         else
-         {
-            %wordIdx = 0;
-            %add = false;
-            
-            if ( %address $= "" )
-            {
-               %add = true;
-               %wordIdx = 0;
-            }
-            else
-            {
-               for ( ; %wordIdx < %dirCount; %wordIdx++ )
-               {
-                  %temp = getWords( %splitPath, 0, %wordIdx );
-                  if ( stricmp( %temp, %address ) == 0 )
-                  {                  
-                     %add = true;
-                     %wordIdx++;
-                     break;  
-                  }
-               }
-            }
-            
-            if ( %add == true )
-            {               
-               %folder = getWord( %splitPath, %wordIdx );
-               
-               %ctrl = %this.findIconCtrl( %folder );
-               if ( %ctrl == -1 )
-                  %this.addFolderIcon( %folder );
-            }
-         }         
-
-         %fullPath = findNextFileMultiExpr( getFormatExtensions() );
-      }
-   }
-   
-   if ( %this.tab $= "Level" )
-   {         
-      // Add groups to popup menu
-      %array = %this.array;
-      %array.sortk();
-      
-      %count = %array.count();
-      
-      if ( %count > 0 )
-      {
-         %lastGroup = "";
-         
-         for ( %i = 0; %i < %count; %i++ )
-         {
-            %group = %array.getKey( %i );
-
-            if ( %group !$= %lastGroup )
-            {
-               CreatorPopupMenu.add( %group );
-               
-               if ( %address $= "" )
-                  %this.addFolderIcon( %group );                                             
-            }               
-            
-            if ( %address $= %group )
-            {
-               %args = %array.getValue( %i );
-               %class = %args.val[0];
-               %name = %args.val[1];
-               %func = %args.val[2];
-
-               %this.addMissionObjectIcon( %class, %name, %func );
-            }
-            
-            %lastGroup = %group;
-         }
-      }
-   }   
-   
-   if ( %this.tab $= "Prefabs" )
-   {      
-      %expr = "*.prefab";
-      %fullPath = findFirstFile( %expr );
-      
-      while ( %fullPath !$= "" )
-      {         
-         %fullPath = makeRelativePath( %fullPath, getMainDotCSDir() );                                  
-         %splitPath = strreplace( %fullPath, " ", "_" );
-         %splitPath = strreplace( %splitPath, "/", " " );
-         if( getWord(%splitPath, 0) $= "tools" )
-         {
-            %fullPath = findNextFile( %expr );
-            continue;
-         }
-                      
-         %dirCount = getWordCount( %splitPath ) - 1;
-         
-         %pathFolders = getWords( %splitPath, 0, %dirCount - 1 );         
-         
-         // Add this file's path (parent folders) to the
-         // popup menu if it isn't there yet.
-         %temp = strreplace( %pathFolders, " ", "/" );         
-         %temp = strreplace( %temp, "_", " " );
-         %r = CreatorPopupMenu.findText( %temp );
-         if ( %r == -1 )
-         {
-            CreatorPopupMenu.add( %temp );
-         }
-         
-         // Is this file in the current folder?        
-         if ( (%dirCount == 0 && %address $= "") || stricmp( %pathFolders, %address ) == 0 )
-         {
-            %this.addPrefabIcon( %fullPath );            
-         }
-         // Then is this file in a subfolder we need to add
-         // a folder icon for?
-         else
-         {
-            %wordIdx = 0;
-            %add = false;
-            
-            if ( %address $= "" )
-            {
-               %add = true;
-               %wordIdx = 0;
-            }
-            else
-            {
-               for ( ; %wordIdx < %dirCount; %wordIdx++ )
-               {
-                  %temp = getWords( %splitPath, 0, %wordIdx );
-                  if ( stricmp( %temp, %address ) == 0 )
-                  {                  
-                     %add = true;
-                     %wordIdx++;
-                     break;  
-                  }
-               }
-            }
-            
-            if ( %add == true )
-            {               
-               %folder = getWord( %splitPath, %wordIdx );
-               
-               %ctrl = %this.findIconCtrl( %folder );
-               if ( %ctrl == -1 )
-                  %this.addFolderIcon( %folder );
-            }
-         }         
-
-         %fullPath = findNextFile( %expr );
-      }
-   } 
-   
-   CreatorIconArray.sort( "alphaIconCompare" );
-   
-   for ( %i = 0; %i < CreatorIconArray.getCount(); %i++ )
-   {
-      CreatorIconArray.getObject(%i).autoSize = false;         
-   }
-   
-   CreatorIconArray.frozen = false;
-   CreatorIconArray.refresh();
-   
-   // Recalculate the array for the parent guiScrollCtrl
-   CreatorIconArray.getParent().computeSizes();  
-   
-   %this.address = %address;
-
-   CreatorPopupMenu.sort();
-
-   %str = strreplace( %address, " ", "/" );
-   %r = CreatorPopupMenu.findText( %str );
-   if ( %r != -1 )
-      CreatorPopupMenu.setSelected( %r, false );
-   else
-      CreatorPopupMenu.setText( %str );
-   CreatorPopupMenu.tooltip = %str;
-}
-
-function ObjectCreator::navigateDown( %this, %folder )
-{
-   if ( %this.address $= "" )
-      %address = %folder;
-   else   
-      %address = %this.address SPC %folder;
-
-   // Because this is called from an IconButton::onClick command
-   // we have to wait a tick before actually calling navigate, else
-   // we would delete the button out from under itself.
-   %this.schedule( 1, "navigate", %address );
-}
-
-function ObjectCreator::navigateUp( %this )
-{
-   %count = getWordCount( %this.address );
-   
-   if ( %count == 0 )
-      return;
-      
-   if ( %count == 1 )
-      %address = "";
-   else      
-      %address = getWords( %this.address, 0, %count - 2 );
-      
-   %this.navigate( %address );
-}
-
-function ObjectCreator::setListView( %this, %noupdate )
-{
-   //CreatorIconArray.clear();
-   //CreatorIconArray.setVisible( false );
-   
-   CreatorIconArray.setVisible( true );
-   %this.contentCtrl = CreatorIconArray;   
-   %this.isList = true;
-   
-   if ( %noupdate == true )
-      %this.navigate( %this.address );
-}
-
-//function ObjectCreator::setIconView( %this )
-//{
-   //echo( "setIconView" );
-   //
-   //CreatorIconStack.clear();
-   //CreatorIconStack.setVisible( false );
-   //
-   //CreatorIconArray.setVisible( true );
-   //%this.contentCtrl = CreatorIconArray;
-   //%this.isList = false;
-   //
-   //%this.navigate( %this.address );
-//}
-
 function ObjectCreator::findIconCtrl( %this, %name )
 {
    for ( %i = 0; %i < %this.contentCtrl.getCount(); %i++ )

Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl

@@ -33,7 +33,6 @@ TORQUE_UNIFORM_SAMPLER2D(backbufferTex, 4);
 TORQUE_UNIFORM_SAMPLER2D(glowBuffer, 5);
 
 uniform float mode;
-uniform float3 eyePosWorld;
 uniform float4x4 cameraToWorld;
 
 float4 main( PFXVertToPix IN ) : TORQUE_TARGET0