diff --git a/src/ObjCommon/XModel/Gltf/JsonGltf.h b/src/ObjCommon/XModel/Gltf/JsonGltf.h index bf76190b..2e4332eb 100644 --- a/src/ObjCommon/XModel/Gltf/JsonGltf.h +++ b/src/ObjCommon/XModel/Gltf/JsonGltf.h @@ -277,10 +277,11 @@ namespace gltf { public: std::optional baseColorTexture; + std::optional> baseColorFactor; std::optional metallicFactor; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonPbrMetallicRoughness, baseColorTexture, metallicFactor); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonPbrMetallicRoughness, baseColorTexture, baseColorFactor, metallicFactor); class JsonNormalTextureInfo { @@ -388,9 +389,12 @@ namespace gltf { public: std::optional uri; + + std::optional bufferView; + std::optional mimeType; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonImage, uri); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonImage, uri, bufferView, mimeType); class JsonRoot {