From 756ee6ba4d7945a084d292013861fea227e1e896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Chatelain?= Date: Mon, 19 Jun 2017 13:52:49 +0000 Subject: [PATCH] Adds extensionsRequired object --- tiny_gltf_loader.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tiny_gltf_loader.h b/tiny_gltf_loader.h index 1424791..19fc492 100644 --- a/tiny_gltf_loader.h +++ b/tiny_gltf_loader.h @@ -548,6 +548,7 @@ class Model { int defaultScene; std::vector extensionsUsed; + std::vector extensionsRequired; Asset asset; @@ -2132,6 +2133,7 @@ if (v.contains("scenes") && v.get("scenes").is()) { model->meshes.clear(); model->nodes.clear(); model->extensionsUsed.clear(); + model->extensionsRequired.clear(); model->defaultScene = -1; // 0. Parse Asset @@ -2141,7 +2143,7 @@ if (v.contains("scenes") && v.get("scenes").is()) { ParseAsset(&model->asset, err, root); } - // 0. Parse extensionUsed + // 0. Parse extensionsUsed ans extensionsRequired if (v.contains("extensionsUsed") && v.get("extensionsUsed").is()) { const picojson::array &root = v.get("extensionsUsed").get(); for(unsigned int i=0; i< root.size(); ++i) @@ -2149,6 +2151,13 @@ if (v.contains("scenes") && v.get("scenes").is()) { model->extensionsUsed.push_back(root[i].get()); } } + if (v.contains("extensionsRequired") && v.get("extensionsRequired").is()) { + const picojson::array &root = v.get("extensionsRequired").get(); + for(unsigned int i=0; i< root.size(); ++i) + { + model->extensionsRequired.push_back(root[i].get()); + } + } // 1. Parse Buffer if (v.contains("buffers") && v.get("buffers").is()) {