diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-28 12:59:31 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-29 16:04:39 +0100 |
| commit | 6e84e993f42be3530bff2550b89e5066c4d9cea6 (patch) | |
| tree | 5834181018af5f6897d088e8bd909ef9e529c688 /src/render/geometry | |
| parent | f54cf0762e4a3e8742e15dd7ec970fcb7285cbc1 (diff) | |
Accept CBOR as optional format in gltf data
Change-Id: I8e64f061147af10a0d017238664c483724047059
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/gltfskeletonloader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp index 56144747c..07789cd84 100644 --- a/src/render/geometry/gltfskeletonloader.cpp +++ b/src/render/geometry/gltfskeletonloader.cpp @@ -48,6 +48,7 @@ #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qmath3d_p.h> +#include <Qt3DCore/private/qloadgltf_p.h> QT_BEGIN_NAMESPACE @@ -316,12 +317,7 @@ GLTFSkeletonLoader::GLTFSkeletonLoader() bool GLTFSkeletonLoader::load(QIODevice *ioDev) { - QByteArray jsonData = ioDev->readAll(); - QJsonDocument sceneDocument = QJsonDocument::fromBinaryData(jsonData); - if (sceneDocument.isNull()) - sceneDocument = QJsonDocument::fromJson(jsonData); - - if (Q_UNLIKELY(!setJSON(sceneDocument))) { + if (Q_UNLIKELY(!setJSON(qLoadGLTF(ioDev->readAll())))) { qCWarning(Jobs, "not a JSON document"); return false; } |