TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-25 06:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for reload and flush

Browse source
This commit is contained in:
marauder2k7 2024-12-14 13:37:23 +00:00
parent f6dc694bd4
commit 1edfbcf447
7 changed files with 88 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -377,12 +377,10 @@ GFXTexHandle ImageAsset::getTexture(GFXTextureProfile* requestedProfile)
NamedTexTargetRef namedTarget = NamedTexTarget::find(mImageFileName + 1);
if (namedTarget.isValid() && namedTarget->getTexture())
{
if (mNamedTarget == NULL) {
mNamedTarget = namedTarget;
mResourceMap.insert(requestedProfile, mNamedTarget->getTexture());
mIsValidImage = true;
mChangeSignal.trigger();
}
mNamedTarget = namedTarget;
mIsValidImage = true;
mResourceMap.insert(requestedProfile, mNamedTarget->getTexture());
mChangeSignal.trigger();
}
if (mNamedTarget == NULL)
return nullptr;

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

@ -212,7 +212,7 @@ public: \
else if(_in[0] == '$' || _in[0] == '#')\
{\
m##name##Name = _in;\
m##name##AssetId = _in;\
m##name##AssetId = StringTable->EmptyString();\
m##name##Asset = NULL;\
m##name.free();\
m##name = NULL;\
@ -256,15 +256,9 @@ public: \
m##name##Asset->getChangedSignal().notify(this, &className::changeFunc);\
}\
\
if (get##name()[0] == '$' || get##name()[0] == '#') {\
NamedTexTargetRef namedTarget = NamedTexTarget::find(get##name() + 1);\
if (namedTarget.isValid())\
{\
m##name = namedTarget->getTexture(0);\
}\
if (get##name()[0] != '$' && get##name()[0] != '#') {\
m##name.set(get##name(), m##name##Profile, avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\
}\
else\
m##name.set(get##name(), m##name##Profile, avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\
}\
else\
{\
@ -373,7 +367,7 @@ public: \
else if(_in[0] == '$' || _in[0] == '#')\
{\
m##name##Name[index] = _in;\
m##name##AssetId[index] = _in;\
m##name##AssetId[index] = StringTable->EmptyString();\
m##name##Asset[index] = NULL;\
m##name[index].free();\
m##name[index] = NULL;\