TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1488 from Azaezel/alpha41/imagessetReview

Browse source 
imagesset safeties review
This commit is contained in:
Brian Roberts 2025-05-29 12:48:57 -05:00 committed by GitHub
parent a43458677a 8bd145d54f
commit 849f3e9cb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 48 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fx/groundCover.cpp
View file

@ -974,8 +974,6 @@ void GroundCover::_initialize( U32 cellCount, U32 cellPlacementCount )
GFXTexHandle tex;
if (mat->getDiffuseMap(0))
tex = mat->getDiffuseMap(0);
else if (mat->getDiffuseMapAsset(0).notNull())
tex = mat->getDiffuseMap(0);
if(tex.isValid())
{

2
Engine/source/T3D/levelInfo.cpp
View file

@ -367,7 +367,7 @@ void LevelInfo::_onLMActivate(const char *lm, bool enable)
void LevelInfo::setLevelAccuTexture()
{
if (isClientObject() && mAccuTextureAsset.notNull())
if (isClientObject() && getAccuTexture())
{
gLevelAccuMap = getAccuTexture();
}

10
Engine/source/afx/ce/afxZodiac.cpp
View file

@ -324,10 +324,7 @@ bool afxZodiacData::preload(bool server, String &errorStr)
if (vert_range.x == 0.0f && vert_range.y == 0.0f)
vert_range.x = vert_range.y = radius_xy;
if (mTextureAsset.notNull())
{
getTexture();
}
getTexture();
return true;
}
@ -345,10 +342,7 @@ void afxZodiacData::onStaticModified(const char* slot, const char* newValue)
void afxZodiacData::onPerformSubstitutions()
{
if (mTextureAsset.notNull())
{
getTexture();
}
getTexture();
}
F32 afxZodiacData::calcRotationAngle(F32 elapsed, F32 rate_factor)

2
Engine/source/environment/basicClouds.cpp
View file

@ -332,7 +332,7 @@ void BasicClouds::_initTexture()
{
for ( U32 i = 0; i < TEX_COUNT; i++ )
{
if ( mLayerEnabled[i] && mTextureAsset[i].notNull())
if ( mLayerEnabled[i])
{
// load the resource.
getTexture(i);

2
Engine/source/environment/cloudLayer.cpp
View file

@ -239,7 +239,7 @@ U32 CloudLayer::packUpdate( NetConnection *conn, U32 mask, BitStream *stream )
{
U32 retMask = Parent::packUpdate( conn, mask, stream );
if (stream->writeFlag(mTextureAsset.notNull())) {
if (stream->writeFlag(getTexture())) {
NetStringHandle assetIdStr = mTextureAsset.getAssetId(); conn->packNetStringHandleU(stream, assetIdStr);
}

6
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -296,7 +296,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect )
RectI iconRect( 0, 0, 0, 0 );
// Render the icon
if ( mBitmapAsset.notNull() && mIconLocation != GuiIconButtonCtrl::IconLocNone)
if ( getBitmap() && mIconLocation != GuiIconButtonCtrl::IconLocNone)
{
// Render the normal bitmap
drawer->clearBitmapModulation();
@ -380,7 +380,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect )
if ( mTextLocation == TextLocRight )
{
Point2I start( mTextMargin, ( getHeight() - mProfile->mFont->getHeight() ) / 2 );
if (mBitmapAsset.notNull() && mIconLocation != IconLocNone)
if (getBitmap() && mIconLocation != IconLocNone)
{
start.x = getWidth() - (iconRect.extent.x + mButtonMargin.x + textWidth);
}
@ -400,7 +400,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect )
if ( mTextLocation == TextLocCenter )
{
Point2I start;
if (mBitmapAsset.notNull() && mIconLocation == IconLocLeft )
if (getBitmap() && mIconLocation == IconLocLeft )
{
start.set( ( getWidth() - textWidth - iconRect.extent.x ) / 2 + iconRect.extent.x,
( getHeight() - mProfile->mFont->getHeight() ) / 2 );

4
Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp
View file

@ -88,7 +88,7 @@ void GuiToolboxButtonCtrl::inspectPostApply()
// set it's extent to be exactly the size of the normal bitmap (if present)
Parent::inspectPostApply();
if ((getWidth() == 0) && (getHeight() == 0) && mNormalBitmapAsset.notNull())
if ((getWidth() == 0) && (getHeight() == 0) && getNormalBitmap())
{
setExtent(getNormalBitmap()->getWidth(), getNormalBitmap()->getHeight());
}
@ -142,7 +142,7 @@ void GuiToolboxButtonCtrl::onRender(Point2I offset, const RectI& updateRect)
}
// Now render the image
if( mNormalBitmapAsset.notNull() )
if(getNormalBitmap())
{
renderButton(getNormalBitmap(), offset, updateRect );
return;

6
Engine/source/gui/controls/guiBitmapCtrl.cpp
View file

@ -101,7 +101,7 @@ void GuiBitmapCtrl::inspectPostApply()
// set it's extent to be exactly the size of the bitmap (if present)
Parent::inspectPostApply();
if (!mWrap && (getExtent().x == 0) && (getExtent().y == 0) && mBitmapAsset.notNull())
if (!mWrap && (getExtent().x == 0) && (getExtent().y == 0) && getBitmap())
{
setExtent(mBitmap->getWidth(), mBitmap->getHeight());
}
@ -126,7 +126,7 @@ void GuiBitmapCtrl::setBitmap(const char* name, bool resize)
mBitmap = mBitmapAsset->getTexture(&GFXDefaultGUIProfile);
if (mBitmapAsset.notNull() && resize)
if (getBitmap() && resize)
{
setExtent(mBitmap->getWidth(), mBitmap->getHeight());
@ -212,7 +212,7 @@ void GuiBitmapCtrl::onRender(Point2I offset, const RectI& updateRect)
void GuiBitmapCtrl::setValue(S32 x, S32 y)
{
if (mBitmapAsset.notNull())
if (getBitmap())
{
x += mBitmapAsset->getTextureBitmapWidth() / 2;
y += mBitmapAsset->getTextureBitmapHeight() / 2;

6
Engine/source/gui/controls/guiGameSettingsCtrl.cpp
View file

@ -184,7 +184,7 @@ void GuiGameSettingsCtrl::onRenderListOption(Point2I currentOffset)
bool arrowOnR = (isSelected() || isHighlighted()) && (mWrapOptions || (mSelectedOption < mOptions.size() - 1));
if (arrowOnL)
{
if (mPreviousBitmapAsset.notNull())
if (getPreviousBitmap())
{
arrowOffset.x = currentOffset.x + mColumnSplit;
arrowOffset.y = currentOffset.y + arrowOffsetY;
@ -205,7 +205,7 @@ void GuiGameSettingsCtrl::onRenderListOption(Point2I currentOffset)
}
if (arrowOnR)
{
if (mNextBitmapAsset.notNull())
if (getNextBitmap())
{
arrowOffset.x = currentOffset.x + getWidth() - mRightPad - mArrowSize;
arrowOffset.y = currentOffset.y + arrowOffsetY;
@ -369,7 +369,7 @@ void GuiGameSettingsCtrl::onRenderKeybindOption(Point2I currentOffset)
buttonSize.x = height;
buttonSize.y = height;
if (mKeybindBitmapAsset.notNull())
if (getKeybindBitmap())
{
RectI rect(button, buttonSize);
drawer->clearBitmapModulation();

8
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -891,13 +891,13 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Draw a bitmap over the background?
if ( mBitmapAsset[Depressed].notNull() )
if (getBitmap(Depressed))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();
drawUtil->drawBitmapStretch( getBitmap(Depressed), rect );
}
else if ( mBitmapAsset[Normal].notNull() )
else if (getBitmap(Normal))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();
@ -941,7 +941,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Draw a bitmap over the background?
if ( mBitmapAsset[Normal].notNull() )
if (getBitmap(Normal))
{
RectI rect( offset, mBitmapBounds );
drawUtil->clearBitmapModulation();
@ -977,7 +977,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Draw a bitmap over the background?
if (mBitmapAsset[Normal].notNull())
if (getBitmap(Normal))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();

8
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -1090,13 +1090,13 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Draw a bitmap over the background?
if ( mBitmapAsset[Depressed].notNull() )
if (getBitmap(Depressed))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();
drawUtil->drawBitmapStretch(getBitmap(Depressed), rect );
}
else if (mBitmapAsset[Normal].notNull())
else if (getBitmap(Normal))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();
@ -1134,7 +1134,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Draw a bitmap over the background?
if (mBitmapAsset[Normal].notNull())
if (getBitmap(Normal))
{
RectI rect( offset, mBitmapBounds );
drawUtil->clearBitmapModulation();
@ -1164,7 +1164,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Draw a bitmap over the background?
if (mBitmapAsset[Normal].notNull())
if (getBitmap(Normal))
{
RectI rect(offset, mBitmapBounds);
drawUtil->clearBitmapModulation();

2
Engine/source/gui/core/guiTypes.cpp
View file

@ -112,7 +112,7 @@ void GuiCursor::onRemove()
void GuiCursor::render(const Point2I &pos)
{
if (mBitmapAsset.notNull())
if (getBitmap())
{
mExtent.set(getBitmap()->getWidth(), getBitmap()->getHeight());
}

2
Engine/source/gui/game/guiChunkedBitmapCtrl.cpp
View file

@ -155,7 +155,7 @@ void GuiChunkedBitmapCtrl::renderRegion(const Point2I &offset, const Point2I &ex
void GuiChunkedBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
{
if( mBitmapAsset.notNull() )
if(getBitmap())
{
RectI boundsRect( offset, getExtent());
GFX->getDrawUtil()->drawBitmapStretch(getBitmap(), boundsRect, GFXBitmapFlip_None, GFXTextureFilterLinear);

20
Engine/source/materials/processedMaterial.cpp
View file

@ -393,7 +393,7 @@ void ProcessedMaterial::_setStageData()
for (i = 0; i < Material::MAX_STAGES; i++)
{
// DiffuseMap
if (mMaterial->getDiffuseMapAsset(i).notNull())
if (mMaterial->getDiffuseMap(i))
{
mStages[i].setTex(MFT_DiffuseMap, mMaterial->getDiffuseMap(i));
if (!mStages[i].getTex(MFT_DiffuseMap))
@ -406,7 +406,7 @@ void ProcessedMaterial::_setStageData()
}
}
// OverlayMap
if (mMaterial->getOverlayMapAsset(i).notNull())
if (mMaterial->getOverlayMap(i))
{
mStages[i].setTex(MFT_OverlayMap, mMaterial->getOverlayMap(i));
if (!mStages[i].getTex(MFT_OverlayMap))
@ -414,7 +414,7 @@ void ProcessedMaterial::_setStageData()
}
// LightMap
if (mMaterial->getLightMapAsset(i).notNull())
if (mMaterial->getLightMap(i))
{
mStages[i].setTex(MFT_LightMap, mMaterial->getLightMap(i));
if (!mStages[i].getTex(MFT_LightMap))
@ -422,7 +422,7 @@ void ProcessedMaterial::_setStageData()
}
// ToneMap
if (mMaterial->getToneMapAsset(i).notNull())
if (mMaterial->getToneMap(i))
{
mStages[i].setTex(MFT_ToneMap, mMaterial->getToneMap(i));
if (!mStages[i].getTex(MFT_ToneMap))
@ -430,7 +430,7 @@ void ProcessedMaterial::_setStageData()
}
// DetailMap
if (mMaterial->getDetailMapAsset(i).notNull())
if (mMaterial->getDetailMap(i))
{
mStages[i].setTex(MFT_DetailMap, mMaterial->getDetailMap(i));
if (!mStages[i].getTex(MFT_DetailMap))
@ -438,7 +438,7 @@ void ProcessedMaterial::_setStageData()
}
// NormalMap
if (mMaterial->getNormalMapAsset(i).notNull())
if (mMaterial->getNormalMap(i))
{
mStages[i].setTex(MFT_NormalMap, mMaterial->getNormalMap(i));
if (!mStages[i].getTex(MFT_NormalMap))
@ -450,7 +450,7 @@ void ProcessedMaterial::_setStageData()
}
// Detail Normal Map
if (mMaterial->getDetailNormalMapAsset(i).notNull())
if (mMaterial->getDetailNormalMap(i))
{
mStages[i].setTex(MFT_DetailNormalMap, mMaterial->getDetailNormalMap(i));
if (!mStages[i].getTex(MFT_DetailNormalMap))
@ -463,7 +463,7 @@ void ProcessedMaterial::_setStageData()
profile = &GFXStaticTextureSRGBProfile;
// ORMConfig
if (mMaterial->getORMConfigMapAsset(i).notNull())
if (mMaterial->getORMConfigMap(i))
{
mStages[i].setTex(MFT_OrmMap, mMaterial->getORMConfigMap(profile, i));
if (!mStages[i].getTex(MFT_OrmMap))
@ -471,7 +471,7 @@ void ProcessedMaterial::_setStageData()
}
else
{
if ((mMaterial->getAOMapAsset(i).notNull()) || (mMaterial->getRoughMapAsset(i).notNull()) || (mMaterial->getMetalMapAsset(i).notNull()))
if ((mMaterial->getAOMap(i)) || (mMaterial->getRoughMap(i)) || (mMaterial->getMetalMap(i)))
{
U32 inputKey[4];
inputKey[0] = mMaterial->mAOChan[i];
@ -485,7 +485,7 @@ void ProcessedMaterial::_setStageData()
mMaterial->logError("Failed to dynamically create ORM Config map for stage %i", i);
}
}
if (mMaterial->getGlowMapAsset(i).notNull())
if (mMaterial->getGlowMap(i))
{
mStages[i].setTex(MFT_GlowMap, mMaterial->getGlowMap(i));
if (!mStages[i].getTex(MFT_GlowMap))

2
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -875,7 +875,7 @@ void ProcessedShaderMaterial::setTextureStages( SceneRenderState *state, const S
case Material::TexTarget:
{
texTarget = rpd->mTexSlot[i].texTarget;
if (!mMaterial->getDiffuseMapAsset(0).notNull())
if (!mMaterial->getDiffuseMap(0))
{
GFX->setTexture(i, NULL);
break;

14
Engine/source/terrain/terrRender.cpp
View file

@ -96,7 +96,7 @@ void TerrainBlock::_updateMaterials()
{
TerrainMaterial *mat = mFile->mMaterials[i];
if (mat->getDiffuseMapAsset().notNull())
if (mat->getDiffuseMap())
{
mBaseTextures[i] = mat->getDiffuseMap();
}
@ -104,11 +104,11 @@ void TerrainBlock::_updateMaterials()
mBaseTextures[ i ] = GFXTexHandle();
// Find the maximum detail distance.
if ( mat->getDetailMapAsset().notNull() &&
if ( mat->getDetailMap() &&
mat->getDetailDistance() > mMaxDetailDistance )
mMaxDetailDistance = mat->getDetailDistance();
if ( mat->getMacroMapAsset().notNull() &&
if ( mat->getMacroMap() &&
mat->getMacroDistance() > mMaxDetailDistance )
mMaxDetailDistance = mat->getMacroDistance();
}
@ -126,18 +126,18 @@ void TerrainBlock::_updateMaterials()
{
TerrainMaterial* mat = mFile->mMaterials[i];
if (mat->getDetailMapAsset().notNull())
if (mat->getDetailMap())
detailTexArray[i] = mat->getDetailMap();
if (mat->getMacroMapAsset().notNull())
if (mat->getMacroMap())
macroTexArray[i] = mat->getMacroMap();
if (mat->getNormalMapAsset().notNull())
if (mat->getNormalMap())
normalTexArray[i] = mat->getNormalMap();
//depending on creation method this may or may not have been shoved into srgb space eroneously
GFXTextureProfile* profile = &GFXStaticTextureProfile;
if (mat->getIsSRGB())
profile = &GFXStaticTextureSRGBProfile;
if (mat->getORMConfigMapAsset().notNull())
if (mat->getORMConfigMap())
ormTexArray[i] = mat->getORMConfigMapAsset()->getTexture(profile);
}

8
Engine/source/ts/collada/colladaUtils.cpp
View file

@ -1030,7 +1030,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
{
Torque::Path diffusePath;
if (mat->getDiffuseMapAsset(0).notNull())
if (mat->getDiffuseMap(0))
diffusePath = Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
else
diffusePath = String("warningMat");
@ -1040,7 +1040,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
}
else
{
if (mat->getDiffuseMapAsset(0).notNull())
if (mat->getDiffuseMap(0))
diffuseMap += Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
else
diffuseMap += "warningMat";
@ -1316,7 +1316,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
{
Torque::Path diffusePath;
if (mat->getDiffuseMapAsset(0).notNull())
if (mat->getDiffuseMap(0))
diffusePath = Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
else
diffusePath = String("warningMat");
@ -1326,7 +1326,7 @@ void ColladaUtils::exportColladaMaterials(tinyxml2::XMLElement* rootNode, const
}
else
{
if (mat->getDiffuseMapAsset(0).notNull())
if (mat->getDiffuseMap(0))
diffuseMap += Torque::Path(mat->getDiffuseMapAsset(0)->getImageFile());
else
diffuseMap += "warningMat";