diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-20 08:44:50 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-22 10:45:16 +0200 |
| commit | 5d31b5f774475f87a00447c4eac6eb96e9651675 (patch) | |
| tree | e0206fbc355033b2d41a2ef423feb5c8fc488e8e /src/plugins | |
| parent | 0c8a6df93997e7aba0c8269ce986bd8fe4168d5b (diff) | |
QAbstractMeshData merged with QMeshData and moved to Renderer
That implied moving QAbstractMesh to Renderer as well.
Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser_p.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 52bc0be0a..68a11337f 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -45,7 +45,7 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DCore/private/qabstractmesh_p.h> +#include <private/qabstractmesh_p.h> #include <Qt3DRenderer/qparameter.h> #include <Qt3DRenderer/qmesh.h> #include <Qt3DRenderer/qmaterial.h> @@ -108,11 +108,11 @@ const QString ASSIMP_MATERIAL_REFLECTIVITY = QStringLiteral("reflectivity"); const QString ASSIMP_MATERIAL_NAME = QStringLiteral("name"); -const QString VERTICES_ATTRIBUTE_NAME = QAbstractMeshData::defaultPositionAttributeName(); -const QString NORMAL_ATTRIBUTE_NAME = QAbstractMeshData::defaultNormalAttributeName(); -const QString TANGENT_ATTRIBUTE_NAME = QAbstractMeshData::defaultTangentAttributeName(); -const QString TEXTCOORD_ATTRIBUTE_NAME = QAbstractMeshData::defaultTextureCoordinateAttributeName(); -const QString COLOR_ATTRIBUTE_NAME = QAbstractMeshData::defaultColorAttributeName(); +const QString VERTICES_ATTRIBUTE_NAME = QMeshData::defaultPositionAttributeName(); +const QString NORMAL_ATTRIBUTE_NAME = QMeshData::defaultNormalAttributeName(); +const QString TANGENT_ATTRIBUTE_NAME = QMeshData::defaultTangentAttributeName(); +const QString TEXTCOORD_ATTRIBUTE_NAME = QMeshData::defaultTextureCoordinateAttributeName(); +const QString COLOR_ATTRIBUTE_NAME = QMeshData::defaultColorAttributeName(); } @@ -197,7 +197,7 @@ private: { public: explicit AssimpMeshFunctor(QMeshDataPtr meshData); - QAbstractMeshDataPtr operator()() Q_DECL_OVERRIDE; + QMeshDataPtr operator()() Q_DECL_OVERRIDE; bool operator ==(const QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE; private: QMeshDataPtr m_meshData; @@ -842,7 +842,7 @@ AssimpMesh::AssimpMeshFunctor::AssimpMeshFunctor(QMeshDataPtr meshData) { } -QAbstractMeshDataPtr AssimpMesh::AssimpMeshFunctor::operator()() +QMeshDataPtr AssimpMesh::AssimpMeshFunctor::operator()() { return m_meshData; } diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h index 65652408e..ce9d61c9f 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser_p.h +++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h @@ -47,7 +47,7 @@ #include <assimp/scene.h> #include <assimp/postprocess.h> #include <assimp/DefaultLogger.hpp> -#include <Qt3DCore/qabstractmesh.h> +#include <Qt3DRenderer/qabstractmesh.h> #include <Qt3DRenderer/qmeshdata.h> #include <Qt3DRenderer/private/abstractsceneparser_p.h> #include "assimphelpers_p.h" |