Added changes missed via merge failures.

Removed some unused files/references that were causing errors, related to issues #502 & #512

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

@@ -30,7 +30,6 @@ function Core_Rendering::onCreate(%this)
    $Terrain::OrmTextureFormat = ProjectSettings.value("Terrain/OrmTextureFormat", 12);
    
    exec("./scripts/graphicsOptions." @ $TorqueScriptFileExtension);
-   exec("./scripts/terrainSettings." @ $TorqueScriptFileExtension);
    exec("./scripts/renderManager." @ $TorqueScriptFileExtension);
 }
 

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

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="BlankSkybox_image"
+    imageFile="@assetFile=BlankSkybox.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

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

@@ -0,0 +1,19 @@
+//-----------------------------------------------------------------------------
+// Torque
+// Copyright GarageGames, LLC 2011
+//-----------------------------------------------------------------------------
+
+singleton CubemapData( BlankSkyCubemap )
+{
+   cubeFaceAsset[0] = "Core_Rendering:BlankSkybox_image";
+   cubeFaceAsset[1] = "Core_Rendering:BlankSkybox_image";
+   cubeFaceAsset[2] = "Core_Rendering:BlankSkybox_image";
+   cubeFaceAsset[3] = "Core_Rendering:BlankSkybox_image";
+   cubeFaceAsset[4] = "Core_Rendering:BlankSkybox_image";
+   cubeFaceAsset[5] = "Core_Rendering:BlankSkybox_image";
+};
+
+singleton Material( BlankSkyMat )
+{
+   cubemap = BlankSkyCubemap;
+};

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

@@ -1,8 +1,8 @@
 <ImageAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="skybox_1"
-    imageFile="@assetFile=skybox_1.png"
+    AssetName="NightSkybox_1"
+    imageFile="@assetFile=NightSkybox_1.png"
     UseMips="true"
     isHDRImage="false"
     imageType="Albedo" />

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

@@ -1,8 +1,8 @@
 <ImageAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="skybox_2"
-    imageFile="@assetFile=skybox_2.png"
+    AssetName="NightSkybox_2"
+    imageFile="@assetFile=NightSkybox_2.png"
     UseMips="true"
     isHDRImage="false"
     imageType="Albedo" />

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

@@ -1,8 +1,8 @@
 <ImageAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="skybox_3"
-    imageFile="@assetFile=skybox_3.png"
+    AssetName="NightSkybox_3"
+    imageFile="@assetFile=NightSkybox_3.png"
     UseMips="true"
     isHDRImage="false"
     imageType="Albedo" />

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

@@ -1,8 +1,8 @@
 <ImageAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="skybox_4"
-    imageFile="@assetFile=skybox_4.png"
+    AssetName="NightSkybox_4"
+    imageFile="@assetFile=NightSkybox_4.png"
     UseMips="true"
     isHDRImage="false"
     imageType="Albedo" />

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

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="NightSkybox_5"
+    imageFile="@assetFile=NightSkybox_5.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

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

@@ -0,0 +1,8 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="NightSkybox_6"
+    imageFile="@assetFile=NightSkybox_6.png"
+    UseMips="true"
+    isHDRImage="false"
+    imageType="Albedo" />

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

@@ -22,12 +22,12 @@
 
 singleton CubemapData( NightCubemap )
 {
-   cubeFace[0] = "./skybox_1";
-   cubeFace[1] = "./skybox_2";
-   cubeFace[2] = "./skybox_3";
-   cubeFace[3] = "./skybox_4";
-   cubeFace[4] = "./skybox_5";
-   cubeFace[5] = "./skybox_6";
+   cubeFaceAsset[0] = "Core_Rendering:NightSkybox_1";
+   cubeFaceAsset[1] = "Core_Rendering:NightSkybox_2";
+   cubeFaceAsset[2] = "Core_Rendering:NightSkybox_3";
+   cubeFaceAsset[3] = "Core_Rendering:NightSkybox_4";
+   cubeFaceAsset[4] = "Core_Rendering:NightSkybox_5";
+   cubeFaceAsset[5] = "Core_Rendering:NightSkybox_6";
 };
 
 singleton Material( NightSkyMat )

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

@@ -1,8 +0,0 @@
-<ImageAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="skybox_5"
-    imageFile="@assetFile=skybox_5.png"
-    UseMips="true"
-    isHDRImage="false"
-    imageType="Albedo" />

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

@@ -1,8 +0,0 @@
-<ImageAsset
-    canSave="true"
-    canSaveDynamicFields="true"
-    AssetName="skybox_6"
-    imageFile="@assetFile=skybox_6.png"
-    UseMips="true"
-    isHDRImage="false"
-    imageType="Albedo" />