zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 08:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: set gltf material default metallicness to 0

Browse Source
This commit is contained in:
Jan 2024-05-04 22:10:58 +02:00
parent 1a35152098
commit a0138c8abc
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ObjCommon/XModel/Gltf/JsonGltf.h
View File

@ -206,9 +206,10 @@ namespace gltf
{ {
public: public:
std::optional<JsonTextureInfo> baseColorTexture; std::optional<JsonTextureInfo> baseColorTexture;
std::optional<float> metallicFactor;
}; };
NLOHMANN_DEFINE_TYPE_EXTENSION(JsonPbrMetallicRoughness, baseColorTexture); NLOHMANN_DEFINE_TYPE_EXTENSION(JsonPbrMetallicRoughness, baseColorTexture, metallicFactor);
class JsonNormalTextureInfo class JsonNormalTextureInfo
{ {

8
src/ObjWriting/XModel/Gltf/GltfWriter.cpp
View File

@ -127,7 +127,13 @@ namespace
material.name = modelMaterial.name; material.name = modelMaterial.name;
if (!modelMaterial.colorMapName.empty()) if (!modelMaterial.colorMapName.empty())
material.pbrMetallicRoughness.emplace().baseColorTexture.emplace().index = CreateTexture(gltf, modelMaterial.colorMapName); {
material.pbrMetallicRoughness.emplace();
material.pbrMetallicRoughness->baseColorTexture.emplace();
material.pbrMetallicRoughness->baseColorTexture->index = CreateTexture(gltf, modelMaterial.colorMapName);
material.pbrMetallicRoughness->metallicFactor = 0.0f;
}
if (!modelMaterial.normalMapName.empty()) if (!modelMaterial.normalMapName.empty())
material.normalTexture.emplace().index = CreateTexture(gltf, modelMaterial.colorMapName); material.normalTexture.emplace().index = CreateTexture(gltf, modelMaterial.colorMapName);