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

add extra checks

Browse source 
add extra checks around an empty stringtableentry for assets and bitmap controls
This commit is contained in:
marauder2k7 2025-06-19 16:58:44 +01:00
parent 1949ff9d7b
commit 08f52cfa16
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/assets/ImageAsset.h
View file

@ -243,7 +243,7 @@ public:
return; \ return; \
if(get##name##File() == _in) \ if(get##name##File() == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset = NULL; \ m##name##Asset = NULL; \
m##name##File = ""; \ m##name##File = ""; \
@ -300,7 +300,7 @@ public:
return; \ return; \
if(get##name##File() == _in) \ if(get##name##File() == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset = NULL; \ m##name##Asset = NULL; \
m##name##File = ""; \ m##name##File = ""; \
@ -364,7 +364,7 @@ public:
return; \ return; \
if(get##name##File(index) == _in) \ if(get##name##File(index) == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset[index] = NULL; \ m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \ m##name##File[index] = ""; \
@ -422,7 +422,7 @@ public:
return; \ return; \
if(get##name##File(index) == _in) \ if(get##name##File(index) == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset[index] = NULL; \ m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \ m##name##File[index] = ""; \

6
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -513,7 +513,7 @@ public:
return; \ return; \
if(get##name##File() == _in) \ if(get##name##File() == _in) \
return; \ return; \
if (_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset = NULL; \ m##name##Asset = NULL; \
m##name##File = ""; \ m##name##File = ""; \
@ -569,7 +569,7 @@ public:
return; \ return; \
if(get##name##File() == _in) \ if(get##name##File() == _in) \
return; \ return; \
if (_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset = NULL; \ m##name##Asset = NULL; \
m##name##File = ""; \ m##name##File = ""; \
@ -632,7 +632,7 @@ public:
return; \ return; \
if(get##name##File(index) == _in) \ if(get##name##File(index) == _in) \
return; \ return; \
if (_in == NULL || _in == StringTable->EmptyString()) \ if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \ { \
m##name##Asset[index] = NULL; \ m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \ m##name##File[index] = ""; \

6
Engine/source/gui/buttons/guiBitmapButtonCtrl.h
View file

@ -123,6 +123,12 @@ private:
String mBitmapFile; String mBitmapFile;
public: public:
void _setBitmap(StringTableEntry _in) { void _setBitmap(StringTableEntry _in) {
if (_in == NULL || _in == StringTable->EmptyString() || _in == "")
{
mBitmapAsset = NULL;
mBitmapFile = "";
return;
}
if (mBitmapAsset.getAssetId() == _in) return; if (!AssetDatabase.isDeclaredAsset(_in)) { if (mBitmapAsset.getAssetId() == _in) return; if (!AssetDatabase.isDeclaredAsset(_in)) {
StringTableEntry imageAssetId = ImageAsset::smNoImageAssetFallback; AssetQuery query; S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); if (foundAssetcount != 0) { StringTableEntry imageAssetId = ImageAsset::smNoImageAssetFallback; AssetQuery query; S32 foundAssetcount = AssetDatabase.findAssetLooseFile(&query, _in); if (foundAssetcount != 0) {
imageAssetId = query.mAssetList[0]; imageAssetId = query.mAssetList[0];

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

@ -121,16 +121,19 @@ void GuiBitmapCtrl::setBitmap(const char* name, bool resize)
if (assetId != StringTable->EmptyString()) if (assetId != StringTable->EmptyString())
_setBitmap(assetId); _setBitmap(assetId);
else else
_setBitmap(name); _setBitmap(StringTable->EmptyString());
} }
mBitmap = mBitmapAsset->getTexture(&GFXDefaultGUIProfile); if (mBitmapAsset.notNull())
if (getBitmap() && resize)
{ {
mBitmap = mBitmapAsset->getTexture(&GFXDefaultGUIProfile);
setExtent(mBitmap->getWidth(), mBitmap->getHeight());
updateSizing(); if (getBitmap() && resize)
{
setExtent(mBitmap->getWidth(), mBitmap->getHeight());
updateSizing();
}
} }
setUpdate(); setUpdate();