From 97b71dd03b6a4caafa1be137fa036d142846d1ce Mon Sep 17 00:00:00 2001
From: Paul Arden <paul@migenius.com>
Date: Thu, 28 Nov 2019 09:01:01 +1000
Subject: [PATCH 1/2] Add reading of extensionsRequired and explicit check to
 throw an error if Draco compression is required. Fixes issue #2791.

---
 code/glTF2/glTF2Asset.h   |  8 ++++++++
 code/glTF2/glTF2Asset.inl | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/code/glTF2/glTF2Asset.h b/code/glTF2/glTF2Asset.h
index 831a763cd..d13ebfd66 100644
--- a/code/glTF2/glTF2Asset.h
+++ b/code/glTF2/glTF2Asset.h
@@ -1034,6 +1034,12 @@ namespace glTF2
 			bool KHR_texture_transform;
         } extensionsUsed;
 
+        //! Keeps info about the required extensions
+        struct RequiredExtensions
+        {
+            bool KHR_draco_mesh_compression;
+        } extensionsRequired;
+
         AssetMetadata asset;
 
 
@@ -1076,6 +1082,7 @@ namespace glTF2
             , textures      (*this, "textures")
         {
             memset(&extensionsUsed, 0, sizeof(extensionsUsed));
+            memset(&extensionsRequired, 0, sizeof(extensionsRequired));
         }
 
         //! Main function
@@ -1094,6 +1101,7 @@ namespace glTF2
         void ReadBinaryHeader(IOStream& stream, std::vector<char>& sceneData);
 
         void ReadExtensionsUsed(Document& doc);
+        void ReadExtensionsRequired(Document& doc);
 
         IOStream* OpenFile(std::string path, const char* mode, bool absolute = false);
     };
diff --git a/code/glTF2/glTF2Asset.inl b/code/glTF2/glTF2Asset.inl
index 4259022e9..32bca88ce 100644
--- a/code/glTF2/glTF2Asset.inl
+++ b/code/glTF2/glTF2Asset.inl
@@ -1432,6 +1432,12 @@ inline void Asset::Load(const std::string& pFile, bool isBinary)
     // Load the metadata
     asset.Read(doc);
     ReadExtensionsUsed(doc);
+    ReadExtensionsRequired(doc);
+
+    // Currently Draco is not supported
+    if (extensionsRequired.KHR_draco_mesh_compression) {
+        throw DeadlyImportError("GLTF: Draco mesh compression not currently supported.");
+    }
 
     // Prepare the dictionaries
     for (size_t i = 0; i < mDicts.size(); ++i) {
@@ -1478,6 +1484,28 @@ inline void Asset::SetAsBinary()
     }
 }
 
+// As required extensions are only a concept in glTF 2.0, this is here
+// instead of glTFCommon.h
+#define CHECK_REQUIRED_EXT(EXT) \
+	if (exts.find(#EXT) != exts.end()) extensionsRequired.EXT = true;
+
+inline void Asset::ReadExtensionsRequired(Document& doc)
+{
+    Value* extsRequired = FindArray(doc, "extensionsRequired");
+    if (!extsRequired) return;
+
+    std::gltf_unordered_map<std::string, bool> exts;
+
+    for (unsigned int i = 0; i < extsRequired->Size(); ++i) {
+        if ((*extsRequired)[i].IsString()) {
+            exts[(*extsRequired)[i].GetString()] = true;
+        }
+    }
+
+    CHECK_REQUIRED_EXT(KHR_draco_mesh_compression);
+
+    #undef CHECK_REQUIRED_EXT
+}
 
 inline void Asset::ReadExtensionsUsed(Document& doc)
 {

From 7967deb06a7c549d16133330e3d383faa84f425f Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Sun, 1 Dec 2019 12:34:45 +0100
Subject: [PATCH 2/2] Update glTF2Asset.inl

some minor review finding: use brackets and add a newline.
---
 code/glTF2/glTF2Asset.inl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/glTF2/glTF2Asset.inl b/code/glTF2/glTF2Asset.inl
index 32bca88ce..99f8c876f 100644
--- a/code/glTF2/glTF2Asset.inl
+++ b/code/glTF2/glTF2Asset.inl
@@ -1492,10 +1492,11 @@ inline void Asset::SetAsBinary()
 inline void Asset::ReadExtensionsRequired(Document& doc)
 {
     Value* extsRequired = FindArray(doc, "extensionsRequired");
-    if (!extsRequired) return;
+    if (nullptr == extsRequired) {
+	return;
+    }
 
     std::gltf_unordered_map<std::string, bool> exts;
-
     for (unsigned int i = 0; i < extsRequired->Size(); ++i) {
         if ((*extsRequired)[i].IsString()) {
             exts[(*extsRequired)[i].GetString()] = true;