QGeometry: move verticesPerPath to QGeometryRenderer

Change-Id: I6f86164eff9f0709f400c4404cf1d104e7632be5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 17 insertions, 33 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));
diff --git a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
index 0ff9bc238..51eaee7e8 100644
--- a/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
+++ b/tests/auto/render/qdefaultmeshes/tst_qdefaultmeshes.cpp
@@ -98,7 +98,6 @@ private Q_SLOTS:
             const Qt3DRender::QGeometry *clonedGeometry = clone->geometry();
 
             QCOMPARE(clonedGeometry->attributes().count(), geometry->attributes().count());
-            QCOMPARE(geometry->verticesPerPatch(), clonedGeometry->verticesPerPatch());
 
             for (int i = 0; i < geometry->attributes().count(); ++i) {
                 const Qt3DRender::QAttribute *originalAttribute = static_cast<Qt3DRender::QAttribute *>(geometry->attributes().at(i));
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index c59a38c7a..c23d14d18 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -59,7 +59,6 @@ private Q_SLOTS:
         QTest::newRow("defaultConstructed") << defaultConstructed << 0;
 
         Qt3DRender::QGeometry *geometry1 = new Qt3DRender::QGeometry();
-        geometry1->setVerticesPerPatch(2);
         Qt3DRender::QAttribute *attribute = new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr1"), Qt3DRender::QAttribute::Float, 4, 454);
         geometry1->addAttribute(attribute);
         geometry1->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr2"), Qt3DRender::QAttribute::Float, 4, 555));
@@ -73,7 +72,6 @@ private Q_SLOTS:
         geometry2->addAttribute(attribute);
         geometry2->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr3"), Qt3DRender::QAttribute::Float, 2, 327));
         geometry2->removeAttribute(attribute);
-        geometry2->setVerticesPerPatch(3);
         QTest::newRow("3 - 1 attributes") << geometry2 << 2;
     }
 
@@ -92,7 +90,6 @@ private Q_SLOTS:
         QCOMPARE(geometry->id(), clone->id());
         QCOMPARE(attributeCount, geometry->attributes().count());
         QCOMPARE(attributeCount, clone->attributes().count());
-        QCOMPARE(geometry->verticesPerPatch(), clone->verticesPerPatch());
         if (geometry->boundingVolumeSpecifier()->positionAttribute())
                 QCOMPARE(geometry->boundingVolumeSpecifier()->positionAttribute()->id(), clone->boundingVolumeSpecifier()->positionAttribute()->id());
 
@@ -152,19 +149,6 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        geometry->setVerticesPerPatch(2);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "verticesPerPatch");
-        QCOMPARE(change->value().toInt(), 2);
-        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
-
-        arbiter.events.clear();
-
-        // WHEN
         geometry->boundingVolumeSpecifier()->setPositionAttribute(&attr);
         QCoreApplication::processEvents();
 
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 3f4b0b416..0912f4b9a 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -93,6 +93,7 @@ private Q_SLOTS:
         geometry1->setPrimitiveRestart(false);
         geometry1->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles);
         geometry1->setPrimitiveCount(15);
+        geometry1->setVerticesPerPatch(2);
         geometry1->setGeometryFunctor(Qt3DRender::QGeometryFunctorPtr(new TestFunctor(383)));
         QTest::newRow("triangle") << geometry1;
 
@@ -102,8 +103,9 @@ private Q_SLOTS:
         geometry2->setBaseVertex(58);
         geometry2->setBaseInstance(10);
         geometry2->setRestartIndex(65535);
-        geometry1->setPrimitiveCount(2056);
+        geometry2->setPrimitiveCount(2056);
         geometry2->setPrimitiveRestart(true);
+        geometry2->setVerticesPerPatch(3);
         geometry2->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines);
         geometry2->setGeometryFunctor(Qt3DRender::QGeometryFunctorPtr(new TestFunctor(305)));
         QTest::newRow("lines with restart") << geometry2;
@@ -128,6 +130,7 @@ private Q_SLOTS:
         QCOMPARE(clone->restartIndex(), geometryRenderer->restartIndex());
         QCOMPARE(clone->primitiveRestart(), geometryRenderer->primitiveRestart());
         QCOMPARE(clone->primitiveType(), geometryRenderer->primitiveType());
+        QCOMPARE(clone->verticesPerPatch(), geometryRenderer->verticesPerPatch());
 
         if (geometryRenderer->geometry() != Q_NULLPTR) {
             QVERIFY(clone->geometry() != Q_NULLPTR);
@@ -213,6 +216,19 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
+        geometryRenderer->setVerticesPerPatch(2);
+        QCoreApplication::processEvents();
+
+        // THEN
+        QCOMPARE(arbiter.events.size(), 1);
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
+        QCOMPARE(change->propertyName(), "verticesPerPatch");
+        QCOMPARE(change->value().toInt(), 2);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
+
+        arbiter.events.clear();
+
+        // WHEN
         geometryRenderer->setPrimitiveRestart(true);
         QCoreApplication::processEvents();