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

final cleanup

Browse source
This commit is contained in:
marauder2k7 2024-12-14 14:47:46 +00:00
parent 1edfbcf447
commit f5f50723ed
3 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -406,10 +406,8 @@ public: \
}\ }\
if (get##name(index) != StringTable->EmptyString() && m##name##Name[index] != StringTable->insert("texhandle"))\ if (get##name(index) != StringTable->EmptyString() && m##name##Name[index] != StringTable->insert("texhandle"))\
{\ {\
if (get##name(index)[0] == '$' || get##name(index)[0] == '#') {\
m##name##Asset[index]->getChangedSignal().notify(this, &className::changeFunc);\ m##name##Asset[index]->getChangedSignal().notify(this, &className::changeFunc);\
}\ if (get##name(index)[0] != '$' && get##name(index)[0] != '#')\
else\
m##name[index].set(get##name(index), m##name##Profile[index], avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\ m##name[index].set(get##name(index), m##name##Profile[index], avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\
}\ }\
else\ else\

1
Engine/source/materials/materialDefinition.cpp
View file

@ -245,6 +245,7 @@ Material::Material()
void Material::onImageAssetChanged() void Material::onImageAssetChanged()
{ {
flush();
reload(); reload();
} }

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

@ -401,16 +401,10 @@ void ProcessedMaterial::_setStageData()
if (String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("#") || String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("$")) if (String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("#") || String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("$"))
{ {
mMaterial->logError("Named Target not ready %s for stage %i", mMaterial->mDiffuseMapAsset[i]->getImageFileName(), i); mMaterial->logError("Named Target not ready %s for stage %i", mMaterial->mDiffuseMapAsset[i]->getImageFileName(), i);
mHasSetStageData = false;
} }
else
{
// Load a debug texture to make it clear to the user
// that the texture for this stage was missing.
mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile)); mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile));
} }
} }
}
else if (mMaterial->mDiffuseMapName[i] != StringTable->EmptyString()) else if (mMaterial->mDiffuseMapName[i] != StringTable->EmptyString())
{ {
mStages[i].setTex(MFT_DiffuseMap, _createTexture(mMaterial->mDiffuseMapName[i], &GFXStaticTextureSRGBProfile)); mStages[i].setTex(MFT_DiffuseMap, _createTexture(mMaterial->mDiffuseMapName[i], &GFXStaticTextureSRGBProfile));
@ -421,16 +415,12 @@ void ProcessedMaterial::_setStageData()
if (String(mMaterial->mDiffuseMapName[i]).startsWith("#") || String(mMaterial->mDiffuseMapName[i]).startsWith("$")) if (String(mMaterial->mDiffuseMapName[i]).startsWith("#") || String(mMaterial->mDiffuseMapName[i]).startsWith("$"))
{ {
mMaterial->logError("Named Target not ready %s for stage %i", mMaterial->mDiffuseMapName[i], i); mMaterial->logError("Named Target not ready %s for stage %i", mMaterial->mDiffuseMapName[i], i);
mHasSetStageData = false;
} }
else
{
// Load a debug texture to make it clear to the user // Load a debug texture to make it clear to the user
// that the texture for this stage was missing. // that the texture for this stage was missing.
mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile)); mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile));
} }
} }
}
// OverlayMap // OverlayMap
if (mMaterial->getOverlayMap(i) != StringTable->EmptyString()) if (mMaterial->getOverlayMap(i) != StringTable->EmptyString())
{ {