summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/tessellation-modes
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qt3d/tessellation-modes')
-rw-r--r--examples/qt3d/tessellation-modes/main.cpp2
-rw-r--r--examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp20
-rw-r--r--examples/qt3d/tessellation-modes/tessellatedquadmesh.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index bc2b79cd9..038a77571 100644
--- a/examples/qt3d/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
Window view;
Qt3D::Quick::QQmlAspectEngine engine;
- engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+ engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
QVariantMap data;
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
index 22762a24c..a3ee77d29 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
@@ -40,14 +40,14 @@
#include <Qt3DRenderer/qbuffer.h>
#include <Qt3DRenderer/qgeometry.h>
-class TessellatedGeometry : public Qt3D::QGeometry
+class TessellatedGeometry : public Qt3DRender::QGeometry
{
Q_OBJECT
public:
TessellatedGeometry(Qt3D::QNode *parent = Q_NULLPTR)
- : Qt3D::QGeometry(parent)
- , m_positionAttribute(new Qt3D::QAttribute(this))
- , m_vertexBuffer(new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer, this))
+ : Qt3DRender::QGeometry(parent)
+ , m_positionAttribute(new Qt3DRender::QAttribute(this))
+ , m_vertexBuffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, this))
{
const float positionData[] = {
-0.8f, -0.8f, 0.0f,
@@ -64,8 +64,8 @@ public:
m_vertexBuffer->setData(positionBytes);
- m_positionAttribute->setName(Qt3D::QAttribute::defaultPositionAttributeName());
- m_positionAttribute->setDataType(Qt3D::QAttribute::Float);
+ m_positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
+ m_positionAttribute->setDataType(Qt3DRender::QAttribute::Float);
m_positionAttribute->setDataSize(3);
m_positionAttribute->setCount(nVerts);
m_positionAttribute->setByteStride(3 * sizeof(float));
@@ -76,14 +76,14 @@ public:
}
private:
- Qt3D::QAttribute *m_positionAttribute;
- Qt3D::QBuffer *m_vertexBuffer;
+ Qt3DRender::QAttribute *m_positionAttribute;
+ Qt3DRender::QBuffer *m_vertexBuffer;
};
TessellatedQuadMesh::TessellatedQuadMesh(Qt3D::QNode *parent)
- : Qt3D::QGeometryRenderer(parent)
+ : Qt3DRender::QGeometryRenderer(parent)
{
- setPrimitiveType(Qt3D::QGeometryRenderer::Patches);
+ setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
setGeometry(new TessellatedGeometry(this));
}
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
index 6c4992183..5f34e2400 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
@@ -39,7 +39,7 @@
#include <Qt3DRenderer/qgeometryrenderer.h>
-class TessellatedQuadMesh : public Qt3D::QGeometryRenderer
+class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer
{
Q_OBJECT
public: