diff options
author | Mike Krus <mike.krus@kdab.com> | 2018-01-30 22:13:14 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2018-02-05 09:12:47 +0000 |
commit | c8a48a9a28889598cb2a06fc8d5deb9b803509ca (patch) | |
tree | 686fb006c636a0a7ea5fe1ba78457aa02fd6f8b6 /tests | |
parent | ba8e3dc09a772faaeb08aa652e59c49cf175040e (diff) |
Add support for layers to control ray casting
RayCaster and ScreenRayCaster can have a number of layers which are
used to control how entities with the matching layers are handled
for ray casting. Similar rules apply as for LayerFilter in the frame
graph.
Change-Id: I9f666563a686ac99d7f178da33a539ba9edef51b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
3 files changed, 152 insertions, 8 deletions
diff --git a/tests/auto/render/raycastingjob/raycastingjob.qrc b/tests/auto/render/raycastingjob/raycastingjob.qrc index dc5a70c78..e111bfa49 100644 --- a/tests/auto/render/raycastingjob/raycastingjob.qrc +++ b/tests/auto/render/raycastingjob/raycastingjob.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> <file>testscene_worldraycasting.qml</file> + <file>testscene_worldraycastinglayer.qml</file> </qresource> </RCC> diff --git a/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml new file mode 100644 index 000000000..f561dcf49 --- /dev/null +++ b/tests/auto/render/raycastingjob/testscene_worldraycastinglayer.qml @@ -0,0 +1,139 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.11 +import Qt3D.Extras 2.0 +import QtQuick.Window 2.0 + +Entity { + id: sceneRoot + + Window { + id: win + width: 600 + height: 600 + visible: true + } + + Camera { + id: camera + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: 16/9 + nearPlane : 0.1 + farPlane : 1000.0 + position: Qt.vector3d( 0.0, 2.0, 20.0 ) + upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) + viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) + } + + components: [ + RenderSettings { + pickingSettings.pickMethod: PickingSettings.TrianglePicking + + Viewport { + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) + + RenderSurfaceSelector { + + surface: win + + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer + NoDraw {} + } + + CameraSelector { + camera: camera + } + } + } + }, + RayCaster { + id: caster + objectName: "caster" + length: 20 + layers: [ rightEntity.layer ] + filterMode: RayCaster.DiscardAnyMatchingLayers + } + ] + + CylinderMesh { + id: mesh + radius: 1 + length: 3 + rings: 10 + slices: 10 + } + PhongMaterial { id: material } + + Entity { + property Transform transform: Transform { + translation: Qt.vector3d(-5, 0, 0) + } + + components: [mesh, material, transform] + } + + Entity { + id: rightEntity + + property Transform transform: Transform { + translation: Qt.vector3d(5, 0, 0) + } + + property Layer layer: Layer { + + } + + components: [mesh, material, transform, layer] + } +} diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index d0f72b2e8..75c5c2a7c 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -161,19 +161,27 @@ private Q_SLOTS: void checkEarlyReturnWhenNoProperFrameGraph_data() { + QTest::addColumn<QUrl>("source"); QTest::addColumn<QVector3D>("rayOrigin"); QTest::addColumn<QVector3D>("rayDirection"); QTest::addColumn<int>("numIntersections"); - QTest::newRow("left entity") << QVector3D(-5, 0, 4) << QVector3D(0, 0, -1) << 1; - QTest::newRow("no entity") << QVector3D(0, 0, 4) << QVector3D(0, 0, -1) << 0; - QTest::newRow("both entities") << QVector3D(-8, 0, 0) << QVector3D(1, 0, 0) << 2; + QTest::newRow("left entity") << QUrl("qrc:/testscene_worldraycasting.qml") << QVector3D(-5, 0, 4) << QVector3D(0, 0, -1) << 1; + QTest::newRow("no entity") << QUrl("qrc:/testscene_worldraycasting.qml") << QVector3D(0, 0, 4) << QVector3D(0, 0, -1) << 0; + QTest::newRow("both entities") << QUrl("qrc:/testscene_worldraycasting.qml") << QVector3D(-8, 0, 0) << QVector3D(1, 0, 0) << 2; + QTest::newRow("discard filter - right entity") << QUrl("qrc:/testscene_worldraycastinglayer.qml") << QVector3D(5, 0, 4) << QVector3D(0, 0, -1) << 0; + QTest::newRow("discard filter - both entities") << QUrl("qrc:/testscene_worldraycastinglayer.qml") << QVector3D(-8, 0, 0) << QVector3D(1, 0, 0) << 1; } void checkEarlyReturnWhenNoProperFrameGraph() { + QFETCH(QUrl, source); + QFETCH(QVector3D, rayOrigin); + QFETCH(QVector3D, rayDirection); + QFETCH(int, numIntersections); + // GIVEN - QmlSceneReader sceneReader(QUrl("qrc:/testscene_worldraycasting.qml")); + QmlSceneReader sceneReader(source); QScopedPointer<Qt3DCore::QEntity> root(qobject_cast<Qt3DCore::QEntity *>(sceneReader.root())); QVERIFY(root); @@ -186,10 +194,6 @@ private Q_SLOTS: } QVERIFY(rayCaster); - QFETCH(QVector3D, rayOrigin); - QFETCH(QVector3D, rayDirection); - QFETCH(int, numIntersections); - rayCaster->trigger(rayOrigin, rayDirection); QScopedPointer<Qt3DRender::TestAspect> test(new Qt3DRender::TestAspect(root.data())); |