diff options
Diffstat (limited to 'src/plugins/geometryloaders/gltf')
| -rw-r--r-- | src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/gltf/gltfgeometryloader.h | 21 |
2 files changed, 21 insertions, 16 deletions
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index 2c8bb14c3..9f13ca2c6 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -46,8 +46,8 @@ #include <QOpenGLTexture> -#include <Qt3DRender/QGeometry> #include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DCore/QGeometry> #include <Qt3DCore/private/qloadgltf_p.h> QT_BEGIN_NAMESPACE @@ -57,6 +57,8 @@ QT_BEGIN_NAMESPACE static_cast<const wchar_t*>(static_cast<const void*>(string.utf16())) #endif +using namespace Qt3DCore; + namespace Qt3DRender { Q_LOGGING_CATEGORY(GLTFGeometryLoaderLog, "Qt3D.GLTFGeometryLoader", QtWarningMsg) @@ -326,7 +328,7 @@ void GLTFGeometryLoader::processJSONBufferView(const QString &id, const QJsonObj qUtf16PrintableImpl(bufferData.path), qUtf16PrintableImpl(id)); } - Qt3DRender::QBuffer *b = new Qt3DRender::QBuffer(); + Qt3DCore::QBuffer *b = new Qt3DCore::QBuffer(); b->setData(bytes); m_gltf1.m_buffers[id] = b; } @@ -363,7 +365,7 @@ void GLTFGeometryLoader::processJSONBufferViewV2(const QJsonObject &json) qUtf16PrintableImpl(bufferData.path)); } - auto b = new Qt3DRender::QBuffer; + auto b = new Qt3DCore::QBuffer; b->setData(bytes); m_gltf2.m_buffers.push_back(b); } @@ -409,7 +411,7 @@ void GLTFGeometryLoader::processJSONMesh(const QString &id, const QJsonObject &j attributeName = attrName; //Get buffer handle for accessor - Qt3DRender::QBuffer *buffer = m_gltf1.m_buffers.value(accessorIt->bufferViewName, nullptr); + Qt3DCore::QBuffer *buffer = m_gltf1.m_buffers.value(accessorIt->bufferViewName, nullptr); if (Q_UNLIKELY(!buffer)) { qCWarning(GLTFGeometryLoaderLog, "unknown buffer-view: %ls processing accessor: %ls", qUtf16PrintableImpl(accessorIt->bufferViewName), qUtf16PrintableImpl(id)); @@ -436,7 +438,7 @@ void GLTFGeometryLoader::processJSONMesh(const QString &id, const QJsonObject &j qUtf16PrintableImpl(k), qUtf16PrintableImpl(id)); } else { //Get buffer handle for accessor - Qt3DRender::QBuffer *buffer = m_gltf1.m_buffers.value(accessorIt->bufferViewName, nullptr); + Qt3DCore::QBuffer *buffer = m_gltf1.m_buffers.value(accessorIt->bufferViewName, nullptr); if (Q_UNLIKELY(!buffer)) { qCWarning(GLTFGeometryLoaderLog, "unknown buffer-view: %ls processing accessor: %ls", qUtf16PrintableImpl(accessorIt->bufferViewName), qUtf16PrintableImpl(id)); @@ -489,7 +491,7 @@ void GLTFGeometryLoader::processJSONMeshV2(const QJsonObject &json) accessor.bufferViewIndex, qUtf16PrintableImpl(json.value(KEY_NAME).toString())); continue; } - Qt3DRender::QBuffer *buffer = m_gltf2.m_buffers[accessor.bufferViewIndex]; + Qt3DCore::QBuffer *buffer = m_gltf2.m_buffers[accessor.bufferViewIndex]; QAttribute *attribute = new QAttribute(buffer, attributeName, @@ -517,7 +519,7 @@ void GLTFGeometryLoader::processJSONMeshV2(const QJsonObject &json) accessor.bufferViewIndex, qUtf16PrintableImpl(json.value(KEY_NAME).toString())); continue; } - Qt3DRender::QBuffer *buffer = m_gltf2.m_buffers[accessor.bufferViewIndex]; + Qt3DCore::QBuffer *buffer = m_gltf2.m_buffers[accessor.bufferViewIndex]; QAttribute *attribute = new QAttribute(buffer, accessor.type, diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h index 404668dd0..36ac0f174 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h @@ -54,13 +54,17 @@ #include <QtCore/QJsonDocument> #include <Qt3DRender/private/qgeometryloaderinterface_p.h> -#include <Qt3DRender/qattribute.h> -#include <Qt3DRender/qbuffer.h> +#include <Qt3DCore/qattribute.h> +#include <Qt3DCore/qbuffer.h> #include <private/qlocale_tools_p.h> QT_BEGIN_NAMESPACE +namespace Qt3DCore { +class QGeometry; +} + namespace Qt3DRender { #define GLTFGEOMETRYLOADER_EXT QLatin1String("gltf") @@ -77,7 +81,6 @@ class QRenderState; class QTechnique; class QParameter; class QGeometryRenderer; -class QGeometry; class GLTFGeometryLoader : public QGeometryLoaderInterface { @@ -111,7 +114,7 @@ class GLTFGeometryLoader : public QGeometryLoaderInterface QString bufferViewName; int bufferViewIndex; - QAttribute::VertexBaseType type; + Qt3DCore::QAttribute::VertexBaseType type; uint dataSize; int count; int offset; @@ -122,13 +125,13 @@ class GLTFGeometryLoader : public QGeometryLoaderInterface { QHash<QString, AccessorData> m_accessorDict; QHash<QString, BufferData> m_bufferDatas; - QHash<QString, Qt3DRender::QBuffer*> m_buffers; + QHash<QString, Qt3DCore::QBuffer*> m_buffers; }; struct Gltf2 { QVector<BufferData> m_bufferDatas; - QVector<Qt3DRender::QBuffer*> m_buffers; + QVector<Qt3DCore::QBuffer*> m_buffers; QVector<AccessorData> m_accessors; }; @@ -137,7 +140,7 @@ public: GLTFGeometryLoader(); ~GLTFGeometryLoader(); - QGeometry *geometry() const final; + Qt3DCore::QGeometry *geometry() const final; bool load(QIODevice *ioDev, const QString &subMesh = QString()) final; @@ -170,7 +173,7 @@ protected: QByteArray resolveLocalData(const QString &path) const; - static QAttribute::VertexBaseType accessorTypeFromJSON(int componentType); + static Qt3DCore::QAttribute::VertexBaseType accessorTypeFromJSON(int componentType); static uint accessorDataSizeFromJson(const QString &type); private: @@ -181,7 +184,7 @@ private: Gltf1 m_gltf1; Gltf2 m_gltf2; - QGeometry *m_geometry; + Qt3DCore::QGeometry *m_geometry; }; } // namespace Qt3DRender |