diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-05-04 03:15:31 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-05-04 03:15:31 +0000 |
| commit | aaaee7fa7f34686b07d36d38e8540a9736793774 (patch) | |
| tree | 1bc887285a4bd7e7ce9c19c9af2aa9d69725c11a /AssetLoader | |
| parent | Image loader: fixed loading paletted png images (diff) | |
| download | DiligentTools-aaaee7fa7f34686b07d36d38e8540a9736793774.tar.gz DiligentTools-aaaee7fa7f34686b07d36d38e8540a9736793774.zip | |
GLTF Loader: improved pbr workflow indication
Diffstat (limited to 'AssetLoader')
| -rw-r--r-- | AssetLoader/interface/GLTFLoader.h | 8 | ||||
| -rw-r--r-- | AssetLoader/src/GLTFLoader.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/AssetLoader/interface/GLTFLoader.h b/AssetLoader/interface/GLTFLoader.h index dc3d500..a02face 100644 --- a/AssetLoader/interface/GLTFLoader.h +++ b/AssetLoader/interface/GLTFLoader.h @@ -86,12 +86,12 @@ struct Material }; Extension extension; - struct PbrWorkflows + enum class PbrWorkflow { - bool MetallicRoughness = true; - bool SpecularGlossiness = false; + MetallicRoughness, + SpecularGlossiness }; - PbrWorkflows pbrWorkflows; + PbrWorkflow workflow = PbrWorkflow::MetallicRoughness; }; diff --git a/AssetLoader/src/GLTFLoader.cpp b/AssetLoader/src/GLTFLoader.cpp index 297247d..e32210b 100644 --- a/AssetLoader/src/GLTFLoader.cpp +++ b/AssetLoader/src/GLTFLoader.cpp @@ -654,7 +654,7 @@ void Model::LoadMaterials(const tinygltf::Model& gltf_model) Mat.extension.pSpecularGlossinessTexture = Textures[index.Get<int>()]; auto texCoordSet = ext_it->second.Get("specularGlossinessTexture").Get("texCoord"); Mat.TexCoordSets.SpecularGlossiness = static_cast<Uint8>(texCoordSet.Get<int>()); - Mat.pbrWorkflows.SpecularGlossiness = true; + Mat.workflow = Material::PbrWorkflow::SpecularGlossiness; } if (ext_it->second.Has("diffuseTexture")) |