diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp index 52b0e20e5..8245f7cea 100644 --- a/Engine/source/console/simObject.cpp +++ b/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; } } diff --git a/Engine/source/gfx/bitmap/ddsFile.cpp b/Engine/source/gfx/bitmap/ddsFile.cpp index e95e6e957..71e5de533 100644 --- a/Engine/source/gfx/bitmap/ddsFile.cpp +++ b/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; -} \ No newline at end of file +} diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index 355bf7486..2d5d5fe54 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/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; diff --git a/Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript b/Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript deleted file mode 100644 index 6211dea72..000000000 --- a/Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript +++ /dev/null @@ -1,11 +0,0 @@ - -singleton TSShapeConstructor(cameradts2) -{ - baseShapeAsset = "Core_GameObjects:Camera"; - singleDetailSize = "0"; - flipUVCoords = "0"; - JoinIdenticalVerts = "0"; - reverseWindingOrder = "0"; - removeRedundantMats = "0"; - animFPS = "2"; -}; diff --git a/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.asset.taml b/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.asset.taml index 9cef2545d..060bb8f79 100644 --- a/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.asset.taml +++ b/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.asset.taml @@ -1,5 +1,4 @@ + constuctorFileName="@assetFile=camera_shape.tscript"/> diff --git a/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.tscript b/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.tscript index ac4c5ba40..cd2890e9c 100644 --- a/Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.tscript +++ b/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"; diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml b/Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml similarity index 78% rename from Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml rename to Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml index f9f52ce07..f8682d356 100644 --- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml +++ b/Templates/BaseGame/game/tools/gui/GUIEditorSettingsWindow.asset.taml @@ -1,7 +1,7 @@ diff --git a/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml b/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml index 746181b76..dab28b3eb 100644 --- a/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml +++ b/Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml @@ -9,7 +9,7 @@ mapTo="ReflectProbePreviewMat"> diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml similarity index 78% rename from Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml rename to Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml index f9f52ce07..76987f5bd 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow,EditorGuiGroup.asset.taml +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorSettingsWindow.asset.taml @@ -1,7 +1,7 @@