diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-08-02 10:12:18 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-08-10 19:45:21 +0000 |
| commit | 5eb3d7197822be605a67aa8b4a8208703c814ffe (patch) | |
| tree | 25d0e4968c180b5c0f63f0c53c3b47ed5bd91620 /tests | |
| parent | 42829e5c2df7f835fe0b80230a5ed8e56956a35d (diff) | |
Fix regression: remove disabled entities from the rendering
Change-Id: I40bbe3cb61e6ee825401a1ae55a12f3362b1a95f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/layerfiltering/tst_layerfiltering.cpp | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp index cf7a507a1..244906c90 100644 --- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp +++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp @@ -164,9 +164,9 @@ private Q_SLOTS: childEntity3->addComponent(layer); QTest::newRow("LayerWithLayerFilterWithFilter-ShouldSelectAllButRoot") << rootEntity - << (Qt3DCore::QNodeIdVector() << layer->id()) - << true - << (Qt3DCore::QNodeIdVector() << childEntity1->id() << childEntity2->id() << childEntity3->id()); + << (Qt3DCore::QNodeIdVector() << layer->id()) + << true + << (Qt3DCore::QNodeIdVector() << childEntity1->id() << childEntity2->id() << childEntity3->id()); } { @@ -202,9 +202,28 @@ private Q_SLOTS: childEntity3->addComponent(layer); QTest::newRow("LayerWithLayerFilterWithFilter-ShouldSelectNone") << rootEntity - << (Qt3DCore::QNodeIdVector() << layer2->id()) + << (Qt3DCore::QNodeIdVector() << layer2->id()) + << true + << Qt3DCore::QNodeIdVector(); + } + + { + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); + Qt3DCore::QEntity *childEntity1 = new Qt3DCore::QEntity(rootEntity); + Qt3DCore::QEntity *childEntity2 = new Qt3DCore::QEntity(rootEntity); + Qt3DCore::QEntity *childEntity3 = new Qt3DCore::QEntity(rootEntity); + + childEntity1->setEnabled(false); + + Qt3DRender::QLayer *layer = new Qt3DRender::QLayer(rootEntity); + childEntity1->addComponent(layer); + childEntity2->addComponent(layer); + childEntity3->addComponent(layer); + + QTest::newRow("LayerWithEntityDisabled-ShouldSelectOnlyEntityEnabled") << rootEntity + << (Qt3DCore::QNodeIdVector() << layer->id()) << true - << Qt3DCore::QNodeIdVector(); + << (Qt3DCore::QNodeIdVector() << childEntity2->id() << childEntity3->id()); } } |