summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/geometry
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-02-26 14:16:21 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-03-05 12:00:29 +0000
commitaf20237e24ca355c9369eff116c4b16df62737cd (patch)
tree77f829355d34f982eb5f18b885f6a837a6633f6d /tests/auto/render/geometry
parent34b3c898f4d7cbac46550a59bf5ac487df578188 (diff)
QGeometry: move verticesPerPath to QGeometryRenderer
Change-Id: I6f86164eff9f0709f400c4404cf1d104e7632be5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/geometry')
-rw-r--r--tests/auto/render/geometry/tst_geometry.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index 91a2b5fcf..9a0851165 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -54,7 +54,6 @@ private Q_SLOTS:
geometry.addAttribute(&attr2);
geometry.addAttribute(&attr3);
geometry.addAttribute(&attr4);
- geometry.setVerticesPerPatch(4);
geometry.boundingVolumeSpecifier()->setPositionAttribute(&attr1);
// WHEN
@@ -64,7 +63,6 @@ private Q_SLOTS:
QCOMPARE(renderGeometry.peerId(), geometry.id());
QCOMPARE(renderGeometry.isDirty(), true);
QCOMPARE(renderGeometry.attributes().count(), 4);
- QCOMPARE(renderGeometry.verticesPerPatch(), 4);
QCOMPARE(renderGeometry.boundingPositionAttribute(), attr1.id());
for (int i = 0; i < 4; ++i)
@@ -80,7 +78,6 @@ private Q_SLOTS:
QCOMPARE(renderGeometry.isDirty(), false);
QVERIFY(renderGeometry.attributes().isEmpty());
QVERIFY(renderGeometry.peerId().isNull());
- QCOMPARE(renderGeometry.verticesPerPatch(), 0);
QCOMPARE(renderGeometry.boundingPositionAttribute(), Qt3DCore::QNodeId());
// GIVEN
@@ -95,7 +92,6 @@ private Q_SLOTS:
geometry.addAttribute(&attr2);
geometry.addAttribute(&attr3);
geometry.addAttribute(&attr4);
- geometry.setVerticesPerPatch(4);
// WHEN
renderGeometry.updateFromPeer(&geometry);
@@ -104,7 +100,6 @@ private Q_SLOTS:
// THEN
QCOMPARE(renderGeometry.isDirty(), false);
QVERIFY(renderGeometry.attributes().isEmpty());
- QCOMPARE(renderGeometry.verticesPerPatch(), 0);
QCOMPARE(renderGeometry.boundingPositionAttribute(), Qt3DCore::QNodeId());
}
@@ -143,16 +138,6 @@ private Q_SLOTS:
QVERIFY(!renderGeometry.isDirty());
// WHEN
- updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
- updateChange->setValue(QVariant::fromValue(3));
- updateChange->setPropertyName("verticesPerPatch");
- renderGeometry.sceneChangeEvent(updateChange);
-
- // THEN
- QCOMPARE(renderGeometry.verticesPerPatch(), 3);
- QVERIFY(!renderGeometry.isDirty());
-
- // WHEN
const Qt3DCore::QNodeId boundingAttrId = Qt3DCore::QNodeId::createId();
updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
updateChange->setValue(QVariant::fromValue(boundingAttrId));