diff options
Diffstat (limited to 'src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp')
| -rw-r--r-- | src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index 19b06a8b0..2c8bb14c3 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -48,6 +48,7 @@ #include <Qt3DRender/QGeometry> #include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DCore/private/qloadgltf_p.h> QT_BEGIN_NAMESPACE @@ -102,10 +103,7 @@ bool GLTFGeometryLoader::load(QIODevice *ioDev, const QString &subMesh) { Q_UNUSED(subMesh); - QByteArray jsonData = ioDev->readAll(); - QJsonDocument sceneDocument = QJsonDocument::fromJson(jsonData); - - if (Q_UNLIKELY(!setJSON(sceneDocument))) { + if (Q_UNLIKELY(!setJSON(qLoadGLTF(ioDev->readAll())))) { qCWarning(GLTFGeometryLoaderLog, "not a JSON document"); return false; } @@ -137,7 +135,8 @@ GLTFGeometryLoader::BufferData::BufferData(const QJsonObject &json) } GLTFGeometryLoader::AccessorData::AccessorData() - : type(QAttribute::Float) + : bufferViewIndex(0) + , type(QAttribute::Float) , dataSize(0) , count(0) , offset(0) |