qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add test for picking object from multiple directions 

This would have caught the breakage caused by changing how the camera
view matrix was computed

Change-Id: I521b7e6c700aeaa1c751cdf0aceb8b8ab66a6af9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Mike Krus 2018-01-29 09:25:56 +00:00
parent 272969ad0a
commit 811ab138aa
3 changed files with 198 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/render/pickboundingvolumejob/pickboundingvolumejob.qrc
View File

@ -9,5 +9,6 @@
<file>testscene_dragenabledoverlapping.qml</file>
<file>testscene_parententity.qml</file>
<file>testscene_viewports.qml</file>
<file>testscene_cameraposition.qml</file>
</qresource>
</RCC>

115
tests/auto/render/pickboundingvolumejob/testscene_cameraposition.qml Normal file
View File

@ -0,0 +1,115 @@
/****************************************************************************
**
** 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.0
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
nearPlane : 0.1
farPlane : 1000.0
position: Qt.vector3d( 0.0, 0.0, -40.0 )
upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
viewCenter: Qt.vector3d( 5.0, 3.0, 1.0 )
}
components: [
RenderSettings {
Viewport {
normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0)
RenderSurfaceSelector {
surface: win
ClearBuffers {
buffers : ClearBuffers.ColorDepthBuffer
NoDraw {}
}
CameraSelector {
camera: camera
}
}
}
}
]
CuboidMesh { id: cubeMesh }
PhongMaterial { id: material }
Entity {
property ObjectPicker picker: ObjectPicker {
objectName: "Picker"
}
property Transform transform: Transform {
translation: camera.viewCenter
scale: 2.0
}
components: [cubeMesh, material, picker, transform]
}
}

82
tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
View File

@ -1296,6 +1296,88 @@ private Q_SLOTS:
QVERIFY(!backendPicker->isPressed());
QCOMPARE(arbiter.events.count(), 0);
}
void checkMultipleRayDirections_data()
{
QTest::addColumn<QVector3D>("cameraOrigin");
QTest::addColumn<QVector3D>("cameraUpVector");
int k = 0;
const int n = 10;
for (int j=0; j<n; j++) {
QMatrix4x4 m;
m.rotate(360.f / (float)n * (float)j, 0.f, 0.f, 1.f);
for (int i=0; i<n; i++) {
const double angle = M_PI * 2. / (double)n * i;
const double x = std::sin(angle) * 10.;
const double z = std::cos(angle) * 10.;
QVector3D pos(x, 0, z);
QVector3D up(0, 1, 0);
QTest::newRow(QString::number(k++).toLatin1().data()) << m * pos << m * up;
}
}
}
void checkMultipleRayDirections()
{
// GIVEN
QmlSceneReader sceneReader(QUrl("qrc:/testscene_cameraposition.qml"));
QScopedPointer<Qt3DCore::QNode> root(qobject_cast<Qt3DCore::QNode *>(sceneReader.root()));
QVERIFY(root);
QList<Qt3DRender::QRenderSettings *> renderSettings = root->findChildren<Qt3DRender::QRenderSettings *>();
QCOMPARE(renderSettings.size(), 1);
Qt3DRender::QPickingSettings *settings = renderSettings.first()->pickingSettings();
settings->setPickMethod(Qt3DRender::QPickingSettings::TrianglePicking);
QScopedPointer<Qt3DRender::TestAspect> test(new Qt3DRender::TestAspect(root.data()));
TestArbiter arbiter;
QList<Qt3DRender::QCamera *> cameras = root->findChildren<Qt3DRender::QCamera *>();
QCOMPARE(cameras.size(), 1);
Qt3DRender::QCamera *camera = cameras.first();
QFETCH(QVector3D, cameraUpVector);
camera->setUpVector(cameraUpVector);
QFETCH(QVector3D, cameraOrigin);
camera->setPosition(cameraOrigin);
// Runs Required jobs
runRequiredJobs(test.data());
// THEN
QList<Qt3DRender::QObjectPicker *> pickers = root->findChildren<Qt3DRender::QObjectPicker *>();
QCOMPARE(pickers.size(), 1);
Qt3DRender::QObjectPicker *picker = pickers.front();
Qt3DRender::Render::ObjectPicker *backendPicker = test->nodeManagers()->objectPickerManager()->lookupResource(picker->id());
QVERIFY(backendPicker);
Qt3DCore::QBackendNodePrivate::get(backendPicker)->setArbiter(&arbiter);
// WHEN -> Pressed on object
Qt3DRender::Render::PickBoundingVolumeJob pickBVJob;
initializePickBoundingVolumeJob(&pickBVJob, test.data());
QList<QPair<QObject *, QMouseEvent>> events;
events.push_back({nullptr, QMouseEvent(QMouseEvent::MouseButtonPress, QPointF(303.0f, 303.0f),
Qt::LeftButton, Qt::LeftButton, Qt::NoModifier)});
pickBVJob.setMouseEvents(events);
bool earlyReturn = !pickBVJob.runHelper();
// THEN -> Pressed
QVERIFY(!earlyReturn);
QVERIFY(backendPicker->isPressed());
Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
QCOMPARE(change->propertyName(), "pressed");
Qt3DRender::QPickEventPtr pickEvent = change->value().value<Qt3DRender::QPickEventPtr>();
QVERIFY(pickEvent);
arbiter.events.clear();
}
};
QTEST_MAIN(tst_PickBoundingVolumeJob)