diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-09 08:54:07 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-11 12:50:13 +0000 |
| commit | 83d81bc82eb7ca8d2ed113aac14f9a2d0a40a362 (patch) | |
| tree | f75d87c176a18feefe7cedd89ddecd8f490893c3 /tests/auto/extras | |
| parent | c86ffa60f07d7ee77f835ad4d8383b599dd9886e (diff) | |
Remove buffer functor API
Change-Id: I78cc60ff634f909111b891d5b9716e19cae35f3b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/extras')
| -rw-r--r-- | tests/auto/extras/common/geometrytesthelper.h | 28 | ||||
| -rw-r--r-- | tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp | 3 |
3 files changed, 0 insertions, 34 deletions
diff --git a/tests/auto/extras/common/geometrytesthelper.h b/tests/auto/extras/common/geometrytesthelper.h index 5b04a078b..b825fa407 100644 --- a/tests/auto/extras/common/geometrytesthelper.h +++ b/tests/auto/extras/common/geometrytesthelper.h @@ -31,36 +31,8 @@ #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qbufferdatagenerator.h> #include <Qt3DRender/qgeometry.h> -inline void generateGeometry(Qt3DRender::QGeometry &geometry) -{ - // Get all attributes - const QVector<Qt3DRender::QAttribute *> attributes = geometry.attributes(); - - // Get all unique data generators from the buffers referenced by the attributes - QHash<Qt3DRender::QBufferDataGeneratorPtr, Qt3DRender::QBuffer *> dataGenerators; - for (const auto attribute : attributes) { - QT_WARNING_PUSH - QT_WARNING_DISABLE_DEPRECATED - const auto dataGenerator = attribute->buffer()->dataGenerator(); - if (!dataGenerators.contains(dataGenerator)) - dataGenerators.insert(dataGenerator, attribute->buffer()); - QT_WARNING_POP - } - - // Generate data for each buffer - const auto end = dataGenerators.end(); - for (auto it = dataGenerators.begin(); it != end; ++it) { - Qt3DRender::QBufferDataGeneratorPtr dataGenerator = it.key(); - const QByteArray data = (*dataGenerator)(); - - Qt3DRender::QBuffer *buffer = it.value(); - buffer->setData(data); - } -} - template<typename IndexType> IndexType extractIndexData(Qt3DRender::QAttribute *attribute, int index) { diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp index 838e5dea9..f20b1e870 100644 --- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp +++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp @@ -31,7 +31,6 @@ #include <Qt3DExtras/qcuboidgeometry.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qbufferdatagenerator.h> #include <qopenglcontext.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> @@ -542,8 +541,6 @@ private Q_SLOTS: geometry.setYZMeshResolution(yzMeshResolution); geometry.setXZMeshResolution(xzMeshResolution); - generateGeometry(geometry); - // THEN // Check buffer of each attribute is valid and actually has some data diff --git a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp index bf5651c9c..7a6965f20 100644 --- a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp +++ b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp @@ -31,7 +31,6 @@ #include <Qt3DExtras/qtorusgeometry.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qbufferdatagenerator.h> #include <qopenglcontext.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> @@ -317,8 +316,6 @@ private Q_SLOTS: geometry.setRadius(radius); geometry.setMinorRadius(minorRadius); - generateGeometry(geometry); - // THEN // Check buffer of each attribute is valid and actually has some data |