glTF Parser: Support loading binary json scene data

We support generating gltf files using binary json rather than plain text
with our qgltf tool.  This reduces metadata file sizes and load times.

Change-Id: I99a4c270aa4b0b828cddfbdcce02dce206606708
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index a4a0602c2..ba39e74ba 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -189,7 +189,12 @@ void GLTFParser::setSource(const QUrl &source)
     QFile f(path);
     f.open(QIODevice::ReadOnly);
 
-    if (!setJSON(QJsonDocument::fromJson(f.readAll()))) {
+    QByteArray jsonData = f.readAll();
+    QJsonDocument sceneDocument = QJsonDocument::fromBinaryData(jsonData);
+    if (sceneDocument.isNull())
+        sceneDocument = QJsonDocument::fromJson(jsonData);
+
+    if (!setJSON(sceneDocument)) {
         qCWarning(GLTFParserLog) << "not a JSON document";
         return;
     }