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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/tessellation-modes/tessellatedquadmesh.cpp | 4 | ||||
| -rw-r--r-- | examples/tessellation-modes/tessellatedquadmesh.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/tessellation-modes/tessellatedquadmesh.cpp b/examples/tessellation-modes/tessellatedquadmesh.cpp index f35ed81f3..b6dfe2cf2 100644 --- a/examples/tessellation-modes/tessellatedquadmesh.cpp +++ b/examples/tessellation-modes/tessellatedquadmesh.cpp @@ -55,7 +55,7 @@ class TessellatedQuadMeshFunctor : public Qt3D::QAbstractMeshFunctor public: TessellatedQuadMeshFunctor() {} - Qt3D::QAbstractMeshDataPtr operator ()() Q_DECL_OVERRIDE + Qt3D::QMeshDataPtr operator ()() Q_DECL_OVERRIDE { const float positionData[] = { -0.8f, -0.8f, 0.0f, @@ -75,7 +75,7 @@ public: vertexBuffer->setData(positionBytes); Qt3D::QMeshDataPtr mesh(new Qt3D::QMeshData(GL_PATCHES)); - mesh->addAttribute(Qt3D::QAbstractMeshData::defaultPositionAttributeName(), + mesh->addAttribute(Qt3D::QMeshData::defaultPositionAttributeName(), Qt3D::AttributePtr(new Qt3D::Attribute(vertexBuffer, GL_FLOAT_VEC3, nVerts))); mesh->setVerticesPerPatch(4); return mesh; diff --git a/examples/tessellation-modes/tessellatedquadmesh.h b/examples/tessellation-modes/tessellatedquadmesh.h index 1161bcfb7..4e137c86f 100644 --- a/examples/tessellation-modes/tessellatedquadmesh.h +++ b/examples/tessellation-modes/tessellatedquadmesh.h @@ -42,7 +42,7 @@ #ifndef TESSELLATEDQUAD_H #define TESSELLATEDQUAD_H -#include <Qt3DCore/qabstractmesh.h> +#include <Qt3DRenderer/qabstractmesh.h> class TessellatedQuadMesh : public Qt3D::QAbstractMesh { |