diff options
| -rw-r--r-- | examples/qt3d/simple-qml/CameraController.qml | 260 | ||||
| -rw-r--r-- | examples/qt3d/simple-qml/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qt3d/simple-qml/main.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/simple-qml/simple-qml.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/simple-qml/simple-qml.qrc | 1 |
5 files changed, 266 insertions, 3 deletions
diff --git a/examples/qt3d/simple-qml/CameraController.qml b/examples/qt3d/simple-qml/CameraController.qml new file mode 100644 index 000000000..bbdc3037f --- /dev/null +++ b/examples/qt3d/simple-qml/CameraController.qml @@ -0,0 +1,260 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Paul Lemire <paul.lemire350@gmail.com> +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D.Core 2.0 +import Qt3D.Render 2.0 +import Qt3D.Input 2.0 +import Qt3D.Logic 2.0 +import QtQml 2.2 + +Entity { + id: root + property Camera camera + property real linearSpeed: 5.0 + property real orbitSpeed: -2.0 + property real lookSpeed: 2.0 + property bool firstPersonMode: true + + QtObject { + id: d + readonly property vector3d firstPersonUp: Qt.vector3d(0, 1, 0) + property bool leftMouseButtonPressed: false + property bool rightMouseButtonPressed: false + property real vx: 0; + property real vy: 0; + property real vz: 0; + property real dx: 0 + property real dy: 0 + } + + KeyboardController { + id: keyboardSourceDevice + } + + MouseController { + id: mouseSourceDevice + } + + LogicalDevice { + id: cameraControlDevice + + actions: [ + Action { + name: "LMB" + inputs: [ + ActionInput { + sourceDevice: mouseSourceDevice + keys: [MouseController.Left] + } + ] + }, + Action { + name: "RMB" + inputs: [ + ActionInput { + sourceDevice: mouseSourceDevice + keys: [MouseController.Right] + } + ] + } + ] // actions + + axes: [ + // Rotation + Axis { + name: "RX" + inputs: [ + AxisInput { + sourceDevice: mouseSourceDevice + axis: MouseController.X + } + ] + }, + Axis { + name: "RY" + inputs: [ + AxisInput { + sourceDevice: mouseSourceDevice + axis: MouseController.Y + } + ] + }, + // Translation + Axis { + name: "TX" + inputs: [ + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_Left] + scale: -1.0 + }, + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_Right] + scale: 1.0 + } + ] + }, + Axis { + name: "TZ" + inputs: [ + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_Up] + scale: 1.0 + }, + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_Down] + scale: -1.0 + } + ] + }, + Axis { + name: "TY" + inputs: [ + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_PageUp] + scale: 1.0 + }, + AxisInput { + sourceDevice: keyboardSourceDevice + keys: [Qt.Key_PageDown] + scale: -1.0 + } + ] + } + ] // axes + } + + components: [ + AxisActionHandler { + id: handler + logicalDevice: cameraControlDevice + + onAxisValueChanged: { + + switch (name) { + + case "TX": { + d.vx = axisValue * linearSpeed + break; + } + + case "TY": { + d.vy = axisValue * linearSpeed + break; + } + + case "TZ": { + d.vz = axisValue * linearSpeed + break; + } + + case "RX": { + d.dx = axisValue; + break; + } + + case "RY": { + d.dy = axisValue; + break; + } + + } + } + + onActionStarted: { + + switch (name) { + + case "LMB": { + d.leftMouseButtonPressed = true; + } + + case "RMB": { + d.rightMouseButtonPressed = true; + } + + } + + } + + onActionFinished: { + + switch (name) { + + case "LMB": { + d.leftMouseButtonPressed = false; + } + + case "RMB": { + d.rightMouseButtonPressed = false; + } + + } + } + }, + + LogicComponent { + + onFrameUpdate: { + + // TO DO: We would need the time delta since the last call + var dt = 0.1 + root.camera.translate(Qt.vector3d(d.vx, d.vy, d.vz).times(dt)) + + dt = 2 + if (d.leftMouseButtonPressed) { + if (root.firstPersonMode) + root.camera.pan(root.lookSpeed * d.dx * dt, d.firstPersonUp) + else + root.camera.pan(root.lookSpeed * d.dx * dt) + root.camera.tilt(root.lookSpeed * d.dy * dt) + } else if (d.rightMouseButtonPressed) { + if (root.firstPersonMode) + root.camera.panAboutViewCenter(root.lookSpeed * d.dx * dt, d.firstPersonUp) + else + root.camera.panAboutViewCenter(root.lookSpeed * d.dx * dt) + root.camera.tiltAboutViewCenter(root.orbitSpeed * d.dy * dt) + } + + + } + } + ] // components +} diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index a7112627b..973cb173a 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -37,6 +37,7 @@ #include <window.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/QInputAspect> +#include <Qt3DLogic/QLogicAspect> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> @@ -50,6 +51,7 @@ int main(int argc, char* argv[]) engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); + engine.aspectEngine()->registerAspect(new Qt3DLogic::QLogicAspect()); engine.aspectEngine()->initialize(); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index 3f1236c44..f9cd23687 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -53,8 +53,8 @@ Entity { viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) } - Configuration { - controlledCamera: camera + CameraController { + camera: camera } components: [ diff --git a/examples/qt3d/simple-qml/simple-qml.pro b/examples/qt3d/simple-qml/simple-qml.pro index 7eb857a32..8abb2b301 100644 --- a/examples/qt3d/simple-qml/simple-qml.pro +++ b/examples/qt3d/simple-qml/simple-qml.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick 3dlogic qml quick SOURCES += \ main.cpp diff --git a/examples/qt3d/simple-qml/simple-qml.qrc b/examples/qt3d/simple-qml/simple-qml.qrc index 5f6483ac3..9d95d9835 100644 --- a/examples/qt3d/simple-qml/simple-qml.qrc +++ b/examples/qt3d/simple-qml/simple-qml.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> <file>main.qml</file> + <file>CameraController.qml</file> </qresource> </RCC> |