TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #768 from Azaezel/alpha40/singleSlotORMs

Browse source 
drop the prior requirement for a createcomposite to have a minimum of…
This commit is contained in:
Brian Roberts 2022-04-21 06:00:55 -05:00 committed by GitHub
parent 30300e93bd c14c9b78c0
commit 3f796d2a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1238,7 +1238,7 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
if (bmp[2])
bChan = bmp[2]->getChanelValueAt(x, y, inputKey[2]);
else
bChan = 255;
bChan = 0;
if (bmp[3])
aChan = bmp[3]->getChanelValueAt(x, y, inputKey[3]);

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

@ -491,7 +491,7 @@ void ProcessedMaterial::_setStageData()
}
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];
inputKey[0] = mMaterial->mAOChan[i];