mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 16:14:38 +00:00
drop the prior requirement for a createcomposite to have a minimum of roughness and metalness. also kick it off if it's got just an ao map.
This commit is contained in:
parent
4b391d8a27
commit
c14c9b78c0
2 changed files with 2 additions and 2 deletions
|
|
@ -1238,7 +1238,7 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
|
||||||
if (bmp[2])
|
if (bmp[2])
|
||||||
bChan = bmp[2]->getChanelValueAt(x, y, inputKey[2]);
|
bChan = bmp[2]->getChanelValueAt(x, y, inputKey[2]);
|
||||||
else
|
else
|
||||||
bChan = 255;
|
bChan = 0;
|
||||||
|
|
||||||
if (bmp[3])
|
if (bmp[3])
|
||||||
aChan = bmp[3]->getChanelValueAt(x, y, inputKey[3]);
|
aChan = bmp[3]->getChanelValueAt(x, y, inputKey[3]);
|
||||||
|
|
|
||||||
|
|
@ -491,7 +491,7 @@ void ProcessedMaterial::_setStageData()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ((mMaterial->getRoughMap(i) != StringTable->EmptyString()) && (mMaterial->getMetalMap(i) != StringTable->EmptyString()))
|
if ((mMaterial->getAOMap(i) != StringTable->EmptyString()) || (mMaterial->getRoughMap(i) != StringTable->EmptyString()) || (mMaterial->getMetalMap(i) != StringTable->EmptyString()))
|
||||||
{
|
{
|
||||||
U32 inputKey[4];
|
U32 inputKey[4];
|
||||||
inputKey[0] = mMaterial->mAOChan[i];
|
inputKey[0] = mMaterial->mAOChan[i];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue