TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
{
// 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;
}
}

6
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))
{
// 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;
}
}

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)
{
// 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;