Merge pull request #986 from Azaezel/alpha41/assetCleanups

Alpha41/asset cleanups

Engine/source/console/simObject.cpp

@@ -567,7 +567,7 @@ void SimObject::onTamlCustomRead(TamlCustomNodes const& customNodes)
                   else
                   {
                      // Unknown name so warn.
-                     Con::warnf("SimObject::onTamlCustomRead() - Encountered an unknown custom field name of '%s'.", fieldName);
+                     //Con::warnf("SimObject::onTamlCustomRead() - Encountered an unknown custom field name of '%s'.", fieldName);
                      continue;
                   }
                }

Engine/source/gfx/bitmap/ddsFile.cpp

@@ -123,7 +123,7 @@ U32 DDSFile::getSurfaceSize( U32 height, U32 width, U32 mipLevel ) const
    if(mFlags.test(CompressedData))
    {
       // From the directX docs:
-      // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+      // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
       U32 sizeMultiple = 0;
 
@@ -178,7 +178,7 @@ U32 DDSFile::getSizeInBytes( GFXFormat format, U32 height, U32 width, U32 mipLev
       "DDSFile::getSizeInBytes - Must be a Block Compression format!" );
 
    // From the directX docs:
-   // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+   // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
    U32 sizeMultiple = 0;
    if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4)
@@ -808,4 +808,4 @@ DefineEngineFunction( getActiveDDSFiles, S32, (),,
    "@ingroup Rendering\n" )
 {
    return DDSFile::smActiveCopies;
-}
+}

Engine/source/gfx/bitmap/gBitmap.cpp

@@ -1321,7 +1321,7 @@ U32 GBitmap::getSurfaceSize(const U32 mipLevel) const
    if (mInternalFormat >= GFXFormatBC1 && mInternalFormat <= GFXFormatBC3)
    {
       // From the directX docs:
-      // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+      // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
       U32 sizeMultiple = 0;
 

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

@@ -1,11 +0,0 @@
-
-singleton TSShapeConstructor(cameradts2)
-{
-   baseShapeAsset = "Core_GameObjects:Camera";
-   singleDetailSize = "0";
-   flipUVCoords = "0";
-   JoinIdenticalVerts = "0";
-   reverseWindingOrder = "0";
-   removeRedundantMats = "0";
-   animFPS = "2";
-};

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

@@ -1,5 +1,4 @@
 <ShapeAsset
     AssetName="camera_shape"
     fileName="@assetFile=camera.fbx"
-    constuctorFileName="@assetFile=camera_shape.tscript"
-    materialSlot0="@asset=Core_GameObjects:CameraMat"/>
+    constuctorFileName="@assetFile=camera_shape.tscript"/>

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

@@ -1,5 +1,4 @@
-
-singleton TSShapeConstructor(cameradts2)
+singleton TSShapeConstructor(camerafbx)
 {
    baseShapeAsset = "Core_GameObjects:Camera_shape";
    singleDetailSize = "0";

Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml → Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml

@@ -1,7 +1,7 @@
 <GUIAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="EditorSettingsWindow,EditorGuiGroup"
+    AssetName="GUIEditorSettingsWindow"
     scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
     GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
     VersionId="1" />

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

@@ -9,7 +9,7 @@
         mapTo="ReflectProbePreviewMat">
         <Material.Stages>
             <Stages_beginarray
-                DiffuseMapAsset="Core_Rendering:NoMaterial"
+                DiffuseMapAsset=""
                 diffuseColor="1 1 1 1"
                 roughness="0"
                 metalness="1"/>

Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml → Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml

@@ -1,7 +1,7 @@
 <GUIAsset
     canSave="true"
     canSaveDynamicFields="true"
-    AssetName="EditorSettingsWindow,EditorGuiGroup"
+    AssetName="WorldEditorSettingsWindow"
     scriptFile="@assetFile=EditorSettingsWindow.ed.gui"
     GUIFile="@assetFile=EditorSettingsWindow.ed.gui"
     VersionId="1" />