diff --git a/src/ObjCommon/XModel/Gltf/JsonGltf.h b/src/ObjCommon/XModel/Gltf/JsonGltf.h index 2e4332eb..0fa9749a 100644 --- a/src/ObjCommon/XModel/Gltf/JsonGltf.h +++ b/src/ObjCommon/XModel/Gltf/JsonGltf.h @@ -78,13 +78,22 @@ namespace gltf NLOHMANN_DEFINE_TYPE_EXTENSION(JsonPunctualLightIndex, light); - class JsonNodeExt + class JsonNodeExtension { public: std::optional KHR_lights_punctual; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNodeExt, KHR_lights_punctual); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNodeExtension, KHR_lights_punctual); + + class JsonNodeExtras + { + public: + std::optional xmodel; + std::optional spawnpoint; + }; + + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNodeExtras, xmodel, spawnpoint); class JsonNode { @@ -98,10 +107,11 @@ namespace gltf std::optional skin; std::optional mesh; - std::optional extensions; + std::optional extensions; + std::optional extras; }; - NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNode, name, translation, rotation, scale, matrix, children, skin, mesh, extensions); + NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNode, name, translation, rotation, scale, matrix, children, skin, mesh, extensions, extras); class JsonBuffer {