Skip to content

Commit 8de304d

Browse files
committed
parse the light extension by light and lights
1 parent 3f1d10c commit 8de304d

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

source/libgltf/libgltfparser.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,16 +1263,19 @@ namespace libgltf
12631263
}
12641264
if (_JsonValue.HasMember(GLTFTEXT("KHR_lights_punctual")) && _JsonValue[GLTFTEXT("KHR_lights_punctual")].IsObject())
12651265
{
1266+
const GLTFCharValue& json_extension = _JsonValue[GLTFTEXT("KHR_lights_punctual")];
1267+
if (json_extension.HasMember(GLTFTEXT("lights")))
12661268
{
12671269
std::shared_ptr<SKHR_lights_punctualglTFextension> extension;
1268-
if (extension << _JsonValue[GLTFTEXT("KHR_lights_punctual")])
1270+
if (extension << json_extension)
12691271
{
12701272
_rData.properties.insert(std::make_pair(GLTFTEXT("KHR_lights_punctual"), extension));
12711273
}
12721274
}
1275+
if (json_extension.HasMember(GLTFTEXT("light")))
12731276
{
12741277
std::shared_ptr<SKHR_lights_punctualnodeextension> extension;
1275-
if (extension << _JsonValue[GLTFTEXT("KHR_lights_punctual")])
1278+
if (extension << json_extension)
12761279
{
12771280
_rData.properties.insert(std::make_pair(GLTFTEXT("KHR_lights_punctual"), extension));
12781281
}

tools/batch/codes/extension.schema.json.parser.from.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ if (_JsonValue.HasMember(GLTFTEXT("KHR_draco_mesh_compression")) && _JsonValue[G
66
}
77
if (_JsonValue.HasMember(GLTFTEXT("KHR_lights_punctual")) && _JsonValue[GLTFTEXT("KHR_lights_punctual")].IsObject())
88
{
9+
const GLTFCharValue& json_extension = _JsonValue[GLTFTEXT("KHR_lights_punctual")];
10+
if (json_extension.HasMember(GLTFTEXT("lights")))
911
{
1012
std::shared_ptr<SKHR_lights_punctualglTFextension> extension;
11-
if (extension << _JsonValue[GLTFTEXT("KHR_lights_punctual")])
13+
if (extension << json_extension)
1214
{
1315
_rData.properties.insert(std::make_pair(GLTFTEXT("KHR_lights_punctual"), extension));
1416
}
1517
}
18+
if (json_extension.HasMember(GLTFTEXT("light")))
1619
{
1720
std::shared_ptr<SKHR_lights_punctualnodeextension> extension;
18-
if (extension << _JsonValue[GLTFTEXT("KHR_lights_punctual")])
21+
if (extension << json_extension)
1922
{
2023
_rData.properties.insert(std::make_pair(GLTFTEXT("KHR_lights_punctual"), extension));
2124
}

0 commit comments

Comments
 (0)