diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-05-17 15:54:00 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-06-08 13:33:59 -0600 |
| commit | adaaccd3d74dd05b596693ef7de90aeef20b5f9d (patch) | |
| tree | 2ee6c632f0d7278cd4c1e6e813fb720524890bd4 /indra/llprimitive/llgltfloader.h | |
| parent | 8c0163bcb48df56112a625550d411741c20c5846 (diff) | |
SL-17214 additional glTF validation, remove dead code from DAE loader
Diffstat (limited to 'indra/llprimitive/llgltfloader.h')
| -rw-r--r-- | indra/llprimitive/llgltfloader.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llprimitive/llgltfloader.h b/indra/llprimitive/llgltfloader.h index 9bffeef4ab..08e9836d07 100644 --- a/indra/llprimitive/llgltfloader.h +++ b/indra/llprimitive/llgltfloader.h @@ -27,8 +27,9 @@ #ifndef LL_LLGLTFLoader_H #define LL_LLGLTFLoader_H -#include "tinygltf\tiny_gltf.h" +#include "tinygltf/tiny_gltf.h" +#include "llglheaders.h" #include "llmodelloader.h" typedef struct // gltf sampler @@ -74,6 +75,8 @@ typedef struct // gltf_pbrMR_material U32 metalRoughTexIdx; // always linear, roughness in G channel, metalness in B channel U32 metalRoughTexCoordIdx; + + bool hasBaseTex, hasMRTex; } gltf_pbr; typedef struct // render material @@ -100,6 +103,7 @@ typedef struct // render material // TODO: Add traditional (diffuse, normal, specular) UUIDs here, or add this struct to LL_TextureEntry?? bool hasPBR; + bool hasNormalTex, hasOcclusionTex, hasEmissiveTex; gltf_pbr pbr; } gltf_render_material; |