TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

all DECLARE_IMAGEASSET refactored

Browse source
This commit is contained in:
marauder2k7 2024-12-21 17:34:16 +00:00
parent 24b374f545
commit fa8110ce8f
44 changed files with 248 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/terrain/terrCellMaterial.cpp
View file

@ -374,7 +374,7 @@ bool TerrainCellMaterial::_initShader(bool deferredMat,
// We only include materials that
// have more than a base texture.
if (!(mat->DetailMapValid() && mat->getDetailSize() > 0 && mat->getDetailDistance()>0))
if (!(mat->getDetailMap() && mat->getDetailSize() > 0 && mat->getDetailDistance()>0))
continue;
if (deferredMat)
@ -382,12 +382,12 @@ bool TerrainCellMaterial::_initShader(bool deferredMat,
features.addFeature(MFT_TerrainDetailMap, featureIndex);
// check for macro detail texture
if (mat->MacroMapValid() && mat->getMacroSize() > 0 && mat->getMacroDistance() > 0)
if (mat->getMacroMap() && mat->getMacroSize() > 0 && mat->getMacroDistance() > 0)
{
features.addFeature(MFT_TerrainMacroMap, featureIndex);
}
if (mat->ORMConfigMapValid())
if (mat->getORMConfigMap())
{
features.addFeature(MFT_TerrainORMMap, featureIndex);
}
@ -401,12 +401,12 @@ bool TerrainCellMaterial::_initShader(bool deferredMat,
// Skip normal maps if we need to.
if (!disableNormalMaps && mat->NormalMapValid())
if (!disableNormalMaps && mat->getNormalMap())
{
normalMaps.increment();
features.addFeature(MFT_TerrainNormalMap, featureIndex);
normalMaps.last() = mat->getNormalMapResource();
normalMaps.last() = mat->getNormalMap();
GFXFormat normalFmt = normalMaps.last().getFormat();
if (normalFmt == GFXFormatBC3)
@ -632,7 +632,7 @@ bool TerrainCellMaterial::_initShader(bool deferredMat,
// We only include materials that
// have more than a base texture.
if (!(mat->DetailMapValid() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
if (!(mat->getDetailMap() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
continue;
mMaterialInfos[i]->mBlendDepthConst = mShader->getShaderConstHandle(avar("$blendDepth%d", i));
@ -676,7 +676,7 @@ void TerrainCellMaterial::_updateMaterialConsts( )
if (mat == NULL)
continue;
if (!(mat->DetailMapValid() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
if (!(mat->getDetailMap() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
continue;
detailMatCount++;
@ -704,7 +704,7 @@ void TerrainCellMaterial::_updateMaterialConsts( )
if (mat == NULL)
continue;
if (!(mat->DetailMapValid() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
if (!(mat->getDetailMap() && mat->getDetailSize() > 0 && mat->getDetailDistance() > 0))
continue;
F32 detailSize = matInfo->mat->getDetailSize();