summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/assimp/assimpparser_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/sceneparsers/assimp/assimpparser_p.h')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser_p.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h
index 250cb9ec3..89fbb5c89 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser_p.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h
@@ -54,11 +54,14 @@ QT_BEGIN_NAMESPACE
class QFile;
namespace Qt3D {
+class QCamera;
+}
+
+namespace Qt3DRender {
class QMaterial;
class QShaderProgram;
class QEffect;
-class QCamera;
class QAbstractTextureProvider;
class QMesh;
class QGeometryRenderer;
@@ -77,14 +80,14 @@ public:
// SceneParserInterface interface
void setSource(const QUrl& source) Q_DECL_OVERRIDE;
bool isExtensionSupported(const QUrl &source) const Q_DECL_OVERRIDE;
- QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
- QEntity *node(const QString &id) Q_DECL_OVERRIDE;
+ Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
+ Qt3D::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
private:
static bool isAssimpPath(const QString &path);
static QStringList assimpSupportedFormats();
- QEntity *node(aiNode *node);
+ Qt3D::QEntity *node(aiNode *node);
void readSceneFile(const QString &file);
@@ -120,7 +123,7 @@ private:
QMap<uint, QEffect *> m_effects;
QMap<uint, QAbstractTextureProvider *> m_embeddedTextures;
QMap<QString, QAbstractTextureProvider *> m_materialTextures;
- QMap<aiNode*, QEntity*> m_cameras;
+ QMap<aiNode*, Qt3D::QEntity*> m_cameras;
QHash<aiTextureType, QString> m_textureToParameterName;
// QMap<aiNode*, Light*> m_lights;
};
@@ -131,7 +134,7 @@ private:
static QStringList assimpSupportedFormatsList;
};
-} // namespace Qt3D
+} // namespace Qt3DRender
QT_END_NAMESPACE