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

merge dev

Browse source
This commit is contained in:
marauder2k7 2024-12-27 15:25:02 +00:00
parent 0f4d2d1689
commit d87655bb3a
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -336,7 +336,10 @@ public: \
const StringTableEntry get##name() const\ const StringTableEntry get##name() const\
{\ {\
if (m##name##Asset && (m##name##Asset->getImageFile() != StringTable->EmptyString()))\ if (m##name##Asset && (m##name##Asset->getImageFile() != StringTable->EmptyString()))\
return Platform::makeRelativePathName(m##name##Asset->getImageFile(), Platform::getMainDotCsDir());\ if (m##name##Asset->getImageFile()[0] == '#' || m##name##Asset->getImageFile()[0] == '$')\
return m##name##Asset->getImageFile();\
else\
return Platform::makeRelativePathName(m##name##Asset->getImageFile(), Platform::getMainDotCsDir());\
else if (m##name##AssetId != StringTable->EmptyString())\ else if (m##name##AssetId != StringTable->EmptyString())\
return m##name##AssetId;\ return m##name##AssetId;\
else if (m##name##Name != StringTable->EmptyString())\ else if (m##name##Name != StringTable->EmptyString())\
@ -346,7 +349,7 @@ public: \
}\ }\
GFXTexHandle get##name##Resource() \ GFXTexHandle get##name##Resource() \
{\ {\
if (m##name##Asset && (m##name##Asset->getImageFileName() != StringTable->EmptyString()))\ if (m##name##Asset && (m##name##Asset->getImageFile() != StringTable->EmptyString()))\
return m##name##Asset->getTexture(m##name##Profile);\ return m##name##Asset->getTexture(m##name##Profile);\
return m##name;\ return m##name;\
}\ }\
@ -453,7 +456,6 @@ 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"))\
{\ {\
m##name##Asset[index]->getChangedSignal().notify(this, &className::changeFunc);\
if (get##name(index)[0] != '$' && get##name(index)[0] != '#')\ if (get##name(index)[0] != '$' && get##name(index)[0] != '#')\
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__));\
}\ }\
@ -483,7 +485,10 @@ public: \
const StringTableEntry get##name(const U32& index) const\ const StringTableEntry get##name(const U32& index) const\
{\ {\
if (m##name##Asset[index] && (m##name##Asset[index]->getImageFile() != StringTable->EmptyString()))\ if (m##name##Asset[index] && (m##name##Asset[index]->getImageFile() != StringTable->EmptyString()))\
return Platform::makeRelativePathName(m##name##Asset[index]->getImageFile(), Platform::getMainDotCsDir());\ if (m##name##Asset[index]->getImageFile()[0] == '#' || m##name##Asset[index]->getImageFile()[0] == '$')\
return m##name##Asset[index]->getImageFile();\
else\
return Platform::makeRelativePathName(m##name##Asset[index]->getImageFile(), Platform::getMainDotCsDir());\
else if (m##name##AssetId[index] != StringTable->EmptyString())\ else if (m##name##AssetId[index] != StringTable->EmptyString())\
return m##name##AssetId[index];\ return m##name##AssetId[index];\
else if (m##name##Name[index] != StringTable->EmptyString())\ else if (m##name##Name[index] != StringTable->EmptyString())\
@ -500,7 +505,7 @@ public: \
{\ {\
if(index >= sm##name##Count || index < 0)\ if(index >= sm##name##Count || index < 0)\
return nullptr;\ return nullptr;\
if (m##name##Asset[index] && (m##name##Asset[index]->getImageFileName() != StringTable->EmptyString()))\ if (m##name##Asset[index] && (m##name##Asset[index]->getImageFile() != StringTable->EmptyString()))\
return m##name##Asset[index]->getTexture(m##name##Profile[index]);\ return m##name##Asset[index]->getTexture(m##name##Profile[index]);\
return m##name[index];\ return m##name[index];\
}\ }\

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

@ -230,12 +230,6 @@ Material::Material()
mReverbSoundOcclusion = 1.0; mReverbSoundOcclusion = 1.0;
} }
void Material::onImageAssetChanged()
{
flush();
reload();
}
void Material::initPersistFields() void Material::initPersistFields()
{ {
docsURL; docsURL;

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

@ -398,8 +398,8 @@ void ProcessedMaterial::_setStageData()
if (!mStages[i].getTex(MFT_DiffuseMap)) if (!mStages[i].getTex(MFT_DiffuseMap))
{ {
// If we start with a #, we're probably actually attempting to hit a named target and it may not get a hit on the first pass. // If we start with a #, we're probably actually attempting to hit a named target and it may not get a hit on the first pass.
if (!String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("#") && !String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("$")) if (!String(mMaterial->getDiffuseMapAsset(i)->getImageFile()).startsWith("#") && !String(mMaterial->getDiffuseMapAsset(i)->getImageFile()).startsWith("$"))
mMaterial->logError("Failed to load diffuse map %s for stage %i", mMaterial->mDiffuseMapAsset[i]->getImageFileName(), i); mMaterial->logError("Failed to load diffuse map %s for stage %i", mMaterial->getDiffuseMapAsset(i)->getImageFile(), i);
mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile)); mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile));
} }