diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-01-13 03:52:52 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-01-13 03:52:52 +0000 |
| commit | a8c447a0ada6aef50a54620117cdf926228048af (patch) | |
| tree | b21646941c7622aeabd72d62761bad926d08661c /AssetLoader/interface | |
| parent | GLTFLoder: added BaseColorAlphaFormat to ResourceCacheUseInfo; added Model::I... (diff) | |
| download | DiligentTools-a8c447a0ada6aef50a54620117cdf926228048af.tar.gz DiligentTools-a8c447a0ada6aef50a54620117cdf926228048af.zip | |
GLTF Loader: moved AlphaMode parameter to Material::ShaderAttribs
Diffstat (limited to 'AssetLoader/interface')
| -rw-r--r-- | AssetLoader/interface/GLTFLoader.hpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/AssetLoader/interface/GLTFLoader.hpp b/AssetLoader/interface/GLTFLoader.hpp index 28a34e7..a4bc29f 100644 --- a/AssetLoader/interface/GLTFLoader.hpp +++ b/AssetLoader/interface/GLTFLoader.hpp @@ -94,6 +94,14 @@ struct Material PBR_WORKFLOW_SPEC_GLOSS }; + enum ALPHA_MODE + { + ALPHA_MODE_OPAQUE = 0, + ALPHA_MODE_MASK, + ALPHA_MODE_BLEND, + ALPHA_MODE_NUM_MODES + }; + // Material attributes packed in a shader-friendly format struct ShaderAttribs { @@ -117,7 +125,7 @@ struct Material float MetallicFactor = 1; float RoughnessFactor = 1; - int UseAlphaMask = 0; + int AlphaMode = ALPHA_MODE_OPAQUE; float AlphaCutoff = 0.5f; float Dummy0; @@ -132,15 +140,6 @@ struct Material static_assert(sizeof(ShaderAttribs) % 16 == 0, "ShaderAttribs struct must be 16-byte aligned"); ShaderAttribs Attribs; - enum ALPHA_MODE - { - ALPHA_MODE_OPAQUE, - ALPHA_MODE_MASK, - ALPHA_MODE_BLEND, - ALPHA_MODE_NUM_MODES - }; - ALPHA_MODE AlphaMode = ALPHA_MODE_OPAQUE; - bool DoubleSided = false; enum TEXTURE_ID |