diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-09-20 07:45:25 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-09-27 06:48:51 +0200 |
| commit | 17e17494720843772ec8132baea661d224f79adc (patch) | |
| tree | 4d383c9a37478d787ed8bde4efbf4f0cf2828a70 /tests/auto/render/objectpicker | |
| parent | 637a9d688a85c452ac0a20378961081a08980cf6 (diff) | |
Update QObjectPicker to use direct sync
Change-Id: Ia11bdb1ebf26f5d2cc25bc66172302bbf3c4f149
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/auto/render/objectpicker')
| -rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index 99b2af538..a8d9bd010 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -44,13 +44,15 @@ private Q_SLOTS: void checkPeerPropertyMirroring() { // GIVEN + TestRenderer renderer; Qt3DRender::Render::ObjectPicker objectPicker; Qt3DRender::QObjectPicker picker; picker.setHoverEnabled(true); picker.setPriority(883); // WHEN - simulateInitialization(&picker, &objectPicker); + objectPicker.setRenderer(&renderer); + simulateInitializationSync(&picker, &objectPicker); // THEN QVERIFY(!objectPicker.peerId().isNull()); @@ -61,6 +63,7 @@ private Q_SLOTS: void checkInitialAndCleanedUpState() { // GIVEN + TestRenderer renderer; Qt3DRender::Render::ObjectPicker objectPicker; // THEN @@ -76,7 +79,8 @@ private Q_SLOTS: picker.setPriority(1584); // WHEN - simulateInitialization(&picker, &objectPicker); + objectPicker.setRenderer(&renderer); + simulateInitializationSync(&picker, &objectPicker); objectPicker.cleanup(); // THEN @@ -90,42 +94,43 @@ private Q_SLOTS: // GIVEN TestRenderer renderer; { + Qt3DRender::QObjectPicker picker; Qt3DRender::Render::ObjectPicker objectPicker; objectPicker.setRenderer(&renderer); + simulateInitializationSync(&picker, &objectPicker); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(true); - updateChange->setPropertyName("hoverEnabled"); - objectPicker.sceneChangeEvent(updateChange); + picker.setHoverEnabled(true); + objectPicker.syncFromFrontEnd(&picker, false); // THEN QCOMPARE(objectPicker.isHoverEnabled(), true); QVERIFY(renderer.dirtyBits() != 0); } { + Qt3DRender::QObjectPicker picker; Qt3DRender::Render::ObjectPicker objectPicker; objectPicker.setRenderer(&renderer); + simulateInitializationSync(&picker, &objectPicker); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(true); - updateChange->setPropertyName("dragEnabled"); - objectPicker.sceneChangeEvent(updateChange); + picker.setDragEnabled(true); + objectPicker.syncFromFrontEnd(&picker, false); + // THEN QCOMPARE(objectPicker.isDragEnabled(), true); QVERIFY(renderer.dirtyBits() != 0); } { + Qt3DRender::QObjectPicker picker; Qt3DRender::Render::ObjectPicker objectPicker; objectPicker.setRenderer(&renderer); + simulateInitializationSync(&picker, &objectPicker); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - updateChange->setValue(15); - updateChange->setPropertyName("priority"); - objectPicker.sceneChangeEvent(updateChange); + picker.setPriority(15); + objectPicker.syncFromFrontEnd(&picker, false); // THEN QCOMPARE(objectPicker.priority(), 15); |