From 17706144e9dc6c2dfde580b7821f18c5f6924682 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Wed, 22 Jan 2020 21:35:32 +0000 Subject: Geometry refactoring Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire --- examples/qt3d/instanced-arrays-qml/instancebuffer.cpp | 2 +- examples/qt3d/instanced-arrays-qml/instancebuffer.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/qt3d') diff --git a/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp b/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp index 770d1b425..bf76706f0 100644 --- a/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp +++ b/examples/qt3d/instanced-arrays-qml/instancebuffer.cpp @@ -57,7 +57,7 @@ static const int colCount = 20; static const int maxInstanceCount = rowCount * colCount; InstanceBuffer::InstanceBuffer(Qt3DCore::QNode *parent) - : Qt3DRender::QBuffer(parent) + : Qt3DCore::QBuffer(parent) , m_instanceCount(maxInstanceCount) { // Create some per instance data - position of each instance diff --git a/examples/qt3d/instanced-arrays-qml/instancebuffer.h b/examples/qt3d/instanced-arrays-qml/instancebuffer.h index 0c769cbf4..c26a85692 100644 --- a/examples/qt3d/instanced-arrays-qml/instancebuffer.h +++ b/examples/qt3d/instanced-arrays-qml/instancebuffer.h @@ -51,9 +51,9 @@ #ifndef INSTANCEBUFFER_H #define INSTANCEBUFFER_H -#include +#include -class InstanceBuffer : public Qt3DRender::QBuffer +class InstanceBuffer : public Qt3DCore::QBuffer { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) -- cgit v1.2.3