TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 21:05:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #930 from Azaezel/alpha402/fixORMChanMap

Browse source 
fix orm vs single channel mapping
This commit is contained in:
Brian Roberts 2022-12-03 08:55:43 -06:00 • committed by GitHub
commit a304198abb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 245 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,10 +129,10 @@ Material::Material()
mMetalness[i] = 0.0f;
mIsSRGb[i] = false;
mInvertRoughness[i] = false;
mRoughnessChan[i] = 0;
mAOChan[i] = 1;
mAOChan[i] = 0;
mInvertRoughness[i] = false;
mRoughnessChan[i] = 1;
mMetalChan[i] = 2;
mAccuEnabled[i] = false;

12
Engine/source/materials/materialDefinition.h
View file

@ -230,15 +230,15 @@ public:
DECLARE_IMAGEASSET_ARRAY_SETGET(Material, ORMConfigMap);
bool mIsSRGb[MAX_STAGES];
DECLARE_IMAGEASSET_ARRAY(Material, RoughMap, MAX_STAGES);
DECLARE_IMAGEASSET_ARRAY_SETGET(Material, RoughMap);
bool mInvertRoughness[MAX_STAGES];
F32 mRoughnessChan[MAX_STAGES];
DECLARE_IMAGEASSET_ARRAY(Material, AOMap, MAX_STAGES);
DECLARE_IMAGEASSET_ARRAY_SETGET(Material, AOMap);
F32 mAOChan[MAX_STAGES];
DECLARE_IMAGEASSET_ARRAY(Material, RoughMap, MAX_STAGES);
DECLARE_IMAGEASSET_ARRAY_SETGET(Material, RoughMap);
bool mInvertRoughness[MAX_STAGES];
F32 mRoughnessChan[MAX_STAGES];
DECLARE_IMAGEASSET_ARRAY(Material, MetalMap, MAX_STAGES);
DECLARE_IMAGEASSET_ARRAY_SETGET(Material, MetalMap);