diff options
Diffstat (limited to 'tests/auto/cpptest/q3dscene-camera/tst_camera.cpp')
-rw-r--r-- | tests/auto/cpptest/q3dscene-camera/tst_camera.cpp | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp index 0c92581d..8c8f4b45 100644 --- a/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp +++ b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp @@ -1,38 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtDataVisualization/Q3DCamera> -using namespace QtDataVisualization; - class tst_camera: public QObject { Q_OBJECT @@ -87,7 +59,7 @@ void tst_camera::initialProperties() QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); QCOMPARE(m_camera->maxZoomLevel(), 500.0f); QCOMPARE(m_camera->minZoomLevel(), 10.0f); - QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f)); QCOMPARE(m_camera->wrapXRotation(), true); QCOMPARE(m_camera->wrapYRotation(), false); QCOMPARE(m_camera->xRotation(), 0.0f); @@ -105,7 +77,7 @@ void tst_camera::initializeProperties() m_camera->setMaxZoomLevel(1000.0f); m_camera->setMinZoomLevel(100.0f); - m_camera->setTarget(QVector3D(1.0, -1.0, 1.0)); + m_camera->setTarget(QVector3D(1.0f, -1.0f, 1.0f)); m_camera->setWrapXRotation(false); m_camera->setWrapYRotation(true); m_camera->setXRotation(30.0f); @@ -114,26 +86,26 @@ void tst_camera::initializeProperties() QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); QCOMPARE(m_camera->minZoomLevel(), 100.0f); - QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0)); + QCOMPARE(m_camera->target(), QVector3D(1.0f, -1.0f, 1.0f)); QCOMPARE(m_camera->wrapXRotation(), false); QCOMPARE(m_camera->wrapYRotation(), true); QCOMPARE(m_camera->xRotation(), 30.0f); QCOMPARE(m_camera->yRotation(), 30.0f); QCOMPARE(m_camera->zoomLevel(), 500.0f); - m_camera->setPosition(QVector3D(1.0, 1.0, 1.0)); + m_camera->setPosition(QVector3D(1.0f, 1.0f, 1.0f)); // Common (from Q3DObject) - QCOMPARE(m_camera->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_camera->position(), QVector3D(1.0f, 1.0f, 1.0f)); } void tst_camera::invalidProperties() { - m_camera->setTarget(QVector3D(-1.5, -1.5, -1.5)); - QCOMPARE(m_camera->target(), QVector3D(-1.0, -1.0, -1.0)); + m_camera->setTarget(QVector3D(-1.5f, -1.5f, -1.5f)); + QCOMPARE(m_camera->target(), QVector3D(-1.0f, -1.0f, -1.0f)); - m_camera->setTarget(QVector3D(1.5, 1.5, 1.5)); - QCOMPARE(m_camera->target(), QVector3D(1.0, 1.0, 1.0)); + m_camera->setTarget(QVector3D(1.5f, 1.5f, 1.5f)); + QCOMPARE(m_camera->target(), QVector3D(1.0f, 1.0f, 1.0f)); m_camera->setMinZoomLevel(0.1f); QCOMPARE(m_camera->minZoomLevel(), 1.0f); @@ -144,7 +116,7 @@ void tst_camera::changePresets() m_camera->setCameraPreset(Q3DCamera::CameraPresetBehind); // Will be overridden by the the following sets m_camera->setMaxZoomLevel(1000.0f); m_camera->setMinZoomLevel(100.0f); - m_camera->setTarget(QVector3D(1.0, -1.0, 1.0)); + m_camera->setTarget(QVector3D(1.0f, -1.0f, 1.0f)); m_camera->setWrapXRotation(false); m_camera->setWrapYRotation(true); m_camera->setXRotation(30.0f); @@ -154,7 +126,7 @@ void tst_camera::changePresets() QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); QCOMPARE(m_camera->minZoomLevel(), 100.0f); - QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0)); + QCOMPARE(m_camera->target(), QVector3D(1.0f, -1.0f, 1.0f)); QCOMPARE(m_camera->wrapXRotation(), false); QCOMPARE(m_camera->wrapYRotation(), true); QCOMPARE(m_camera->xRotation(), 30.0f); @@ -166,7 +138,7 @@ void tst_camera::changePresets() QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetBehind); QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); QCOMPARE(m_camera->minZoomLevel(), 100.0f); - QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f)); QCOMPARE(m_camera->wrapXRotation(), false); QCOMPARE(m_camera->wrapYRotation(), true); QCOMPARE(m_camera->xRotation(), 180.0f); @@ -178,7 +150,7 @@ void tst_camera::changePresets() QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone); QCOMPARE(m_camera->maxZoomLevel(), 1000.0f); QCOMPARE(m_camera->minZoomLevel(), 100.0f); - QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0)); + QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f)); QCOMPARE(m_camera->wrapXRotation(), false); QCOMPARE(m_camera->wrapYRotation(), true); QCOMPARE(m_camera->xRotation(), 10.0f); |