From d683967b1d1e47574ccf7fe821cc7758f96e6b52 Mon Sep 17 00:00:00 2001 From: LJW-Dev <48092720+LJW-Dev@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:14:35 +0800 Subject: [PATCH] Extended GLTF classes to support: material colours, and images buffer view index / image type. --- src/ObjCommon/XModel/Gltf/JsonGltf.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 {