summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/scene2d/tst_scene2d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/scene2d/tst_scene2d.cpp')
-rw-r--r--tests/auto/render/scene2d/tst_scene2d.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp
index 4b4ba03f0..bf9e70879 100644
--- a/tests/auto/render/scene2d/tst_scene2d.cpp
+++ b/tests/auto/render/scene2d/tst_scene2d.cpp
@@ -31,7 +31,7 @@
#include <private/qscene2d_p.h>
#include <private/scene2d_p.h>
#include <Qt3DRender/qgeometryrenderer.h>
-#include <Qt3DRender/qbuffer.h>
+#include <Qt3DCore/qbuffer.h>
#include <private/trianglesvisitor_p.h>
#include <private/nodemanagers_p.h>
#include <private/managers_p.h>
@@ -211,11 +211,11 @@ private Q_SLOTS:
TestRenderer renderer;
QScopedPointer<Scene2D> scene2d(new Scene2D());
QScopedPointer<NodeManagers> nodeManagers(new NodeManagers());
- Qt3DRender::QGeometry *geometry = new Qt3DRender::QGeometry();
+ Qt3DCore::QGeometry *geometry = new Qt3DCore::QGeometry();
Qt3DRender::QGeometryRenderer *geometryRenderer = new Qt3DRender::QGeometryRenderer();
- Qt3DRender::QAttribute *positionAttribute = new Qt3DRender::QAttribute();
- Qt3DRender::QAttribute *texcoordAttribute = new Qt3DRender::QAttribute();
- Qt3DRender::QBuffer *dataBuffer =new Qt3DRender::QBuffer();
+ Qt3DCore::QAttribute *positionAttribute = new Qt3DCore::QAttribute();
+ Qt3DCore::QAttribute *texcoordAttribute = new Qt3DCore::QAttribute();
+ Qt3DCore::QBuffer *dataBuffer =new Qt3DCore::QBuffer();
QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity());
entity->addComponent(geometryRenderer);
renderer.setNodeManagers(nodeManagers.data());
@@ -272,23 +272,23 @@ private Q_SLOTS:
simulateInitializationSync(dataBuffer, backendBuffer);
positionAttribute->setBuffer(dataBuffer);
- positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
- positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
+ positionAttribute->setName(Qt3DCore::QAttribute::defaultPositionAttributeName());
+ positionAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setCount(6);
positionAttribute->setByteStride(sizeof(float) * 5);
positionAttribute->setByteOffset(0);
- positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+ positionAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
geometry->addAttribute(positionAttribute);
texcoordAttribute->setBuffer(dataBuffer);
- texcoordAttribute->setName(Qt3DRender::QAttribute::defaultTextureCoordinateAttributeName());
- texcoordAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
+ texcoordAttribute->setName(Qt3DCore::QAttribute::defaultTextureCoordinateAttributeName());
+ texcoordAttribute->setVertexBaseType(Qt3DCore::QAttribute::Float);
texcoordAttribute->setVertexSize(2);
texcoordAttribute->setCount(6);
texcoordAttribute->setByteStride(sizeof(float) * 5);
texcoordAttribute->setByteOffset(sizeof(float) * 3);
- texcoordAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+ texcoordAttribute->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
geometry->addAttribute(texcoordAttribute);
geometryRenderer->setGeometry(geometry);