diff options
Diffstat (limited to 'src/plugins/sceneparsers/gltf/gltfparser_p.h')
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfparser_p.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfparser_p.h b/src/plugins/sceneparsers/gltf/gltfparser_p.h index 73048bebd..4b9c238c0 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser_p.h +++ b/src/plugins/sceneparsers/gltf/gltfparser_p.h @@ -51,17 +51,20 @@ QT_BEGIN_NAMESPACE class QFile; namespace Qt3D { +class QCamera; +class QCameraLens; +class QEntity; +} + +namespace Qt3DRender { class QMaterial; class QShaderProgram; class QEffect; -class QCamera; -class QCameraLens; class QAbstractTextureProvider; class QRenderState; class QTechnique; class QParameter; -class QEntity; class QGeometryRenderer; Q_DECLARE_LOGGING_CATEGORY(GLTFParserLog) @@ -81,8 +84,8 @@ public: // SceneParserInterface interface void setSource(const QUrl &source) Q_DECL_FINAL; bool isExtensionSupported(const QUrl &source) const Q_DECL_FINAL; - QEntity *node(const QString &id) Q_DECL_FINAL; - QEntity *scene(const QString &id = QString()) Q_DECL_FINAL; + Qt3D::QEntity *node(const QString &id) Q_DECL_FINAL; + Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL; private: class BufferData @@ -128,9 +131,9 @@ private: static QString standardAttributeNameFromSemantic(const QString &semantic); static QParameter *parameterFromTechnique(QTechnique *technique, const QString ¶meterName); - QEntity *defaultScene(); + Qt3D::QEntity *defaultScene(); QMaterial *material(const QString &id); - QCameraLens *camera(const QString &id) const; + Qt3D::QCameraLens *camera(const QString &id) const; void parse(); void cleanup(); @@ -151,7 +154,7 @@ private: QFile* resolveLocalData(QString path) const; QVariant parameterValueFromJSON(int type, const QJsonValue &value) const; - static QAbstractAttribute::DataType accessorTypeFromJSON(int componentType); + static Qt3D::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType); static uint accessorDataSizeFromJson(const QString &type); static QRenderState *buildStateEnable(int state); @@ -187,7 +190,7 @@ private: QMap<QString, QString> m_imagePaths; }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |