TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #986 from Azaezel/alpha41/assetCleanups

Browse source 
Alpha41/asset cleanups
This commit is contained in:
Brian Roberts 2023-03-09 21:10:22 -06:00 • committed by GitHub
commit bab419fd65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/simObject.cpp
View file

@ -567,7 +567,7 @@ void SimObject::onTamlCustomRead(TamlCustomNodes const& customNodes)
else else
{ {
// Unknown name so warn. // 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; continue;
} }
} }

4
Engine/source/gfx/bitmap/ddsFile.cpp
View file

@ -123,7 +123,7 @@ U32 DDSFile::getSurfaceSize( U32 height, U32 width, U32 mipLevel ) const
if(mFlags.test(CompressedData)) if(mFlags.test(CompressedData))
{ {
// From the directX docs: // 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; 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!" ); "DDSFile::getSizeInBytes - Must be a Block Compression format!" );
// From the directX docs: // 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; U32 sizeMultiple = 0;
if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4) if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4)

2
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -1321,7 +1321,7 @@ U32 GBitmap::getSurfaceSize(const U32 mipLevel) const
if (mInternalFormat >= GFXFormatBC1 && mInternalFormat <= GFXFormatBC3) if (mInternalFormat >= GFXFormatBC1 && mInternalFormat <= GFXFormatBC3)
{ {
// From the directX docs: // 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; U32 sizeMultiple = 0;

11
Templates/BaseGame/game/core/gameObjects/shapes/camera.tscript
View file

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

3
Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.asset.taml
View file

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

3
Templates/BaseGame/game/core/gameObjects/shapes/camera_shape.tscript
View file

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

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

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

2
Templates/BaseGame/game/tools/resources/ReflectProbePreviewMat.asset.taml
View file

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

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

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