From a8c447a0ada6aef50a54620117cdf926228048af Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Tue, 12 Jan 2021 19:52:52 -0800
Subject: GLTF Loader: moved AlphaMode parameter to Material::ShaderAttribs

---
 AssetLoader/interface/GLTFLoader.hpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'AssetLoader/interface')

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
-- 
cgit v1.2.3