Remove OrbitCameraController.qml

It completely duplicates QOrbitCameraController behavior, let's use it
instead.

Change-Id: I5fee3c16360461f2a918b0ec1428b3cc7f20ec04
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 4 insertions, 238 deletions

diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri
index 57ef15f08..464c0ce6a 100644
--- a/src/quick3d/imports/extras/defaults/defaults.pri
+++ b/src/quick3d/imports/extras/defaults/defaults.pri
@@ -6,6 +6,5 @@
 # To have the plugin register them as types, add an entries to the
 # qmldir array in qt3dquick3dextrasplugin.cpp
 QML_FILES = \
-    $$PWD/qml/OrbitCameraController.qml \
     $$PWD/qml/FirstPersonCameraController.qml \
     $$PWD/qml/LevelOfDetailLoader.qml
diff --git a/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml b/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml
deleted file mode 100644
index ae8869473..000000000
--- a/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml
+++ /dev/null
@@ -1,236 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Paul Lemire <paul.lemire350@gmail.com>
-** 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.Input 2.0
-import Qt3D.Logic 2.0
-import QtQml 2.2
-
-Entity {
-    id: root
-    property Camera camera
-    property real linearSpeed: 10.0
-    property real lookSpeed: 180.0
-    property real zoomLimit: 2.0
-
-    QtObject {
-        id: d
-        readonly property vector3d firstPersonUp: Qt.vector3d(0, 1, 0)
-        readonly property bool leftMouseButtonPressed: leftMouseButtonAction.active
-        readonly property bool rightMouseButtonPressed: rightMouseButtonAction.active
-        readonly property bool shiftPressed: shiftAction.active
-        readonly property bool altPressed: altAction.active
-        property real translationX: clampInputs(leftMouseButtonPressed ? mouseXAxis.value : 0, keyboardXAxis.value) * linearSpeed;
-        property real translationY: clampInputs(leftMouseButtonPressed ? mouseYAxis.value : 0, keyboardYAxis.value) * linearSpeed;
-        property real translationZ: keyboardZAxis.value * linearSpeed;
-        property real orbitX: clampInputs(rightMouseButtonPressed ? mouseXAxis.value : 0, keyboardXAxis.value) * lookSpeed;
-        property real orbitY: clampInputs(rightMouseButtonPressed ? mouseYAxis.value : 0, keyboardYAxis.value) * lookSpeed;
-    }
-
-    function clampInputs(input1, input2) {
-        var axisValue = input1 + input2;
-        return (axisValue < -1) ? -1 : (axisValue > 1) ? 1 : axisValue;
-    }
-
-    function zoomDistance(firstPoint, secondPoint) {
-        var u = secondPoint.minus(firstPoint); u = u.times(u);
-        return u.x + u.y + u.z;
-    }
-
-    KeyboardDevice {
-        id: keyboardSourceDevice
-    }
-
-    MouseDevice {
-        id: mouseSourceDevice
-        sensitivity: 0.1
-    }
-
-    components: [
-
-        LogicalDevice {
-            enabled: root.enabled
-            actions: [
-                Action {
-                    id: leftMouseButtonAction
-                    ActionInput {
-                        sourceDevice: mouseSourceDevice
-                        buttons: [MouseEvent.LeftButton]
-                    }
-                },
-                Action {
-                    id: rightMouseButtonAction
-                    ActionInput {
-                        sourceDevice: mouseSourceDevice
-                        buttons: [MouseEvent.RightButton]
-                    }
-                },
-                Action {
-                    id: shiftAction
-                    ActionInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Shift]
-                    }
-                },
-                Action {
-                    id: altAction
-                    ActionInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Alt]
-                    }
-                }
-            ] // actions
-
-            axes: [
-                // Mouse
-                Axis {
-                    id: mouseXAxis
-                    AnalogAxisInput {
-                        sourceDevice: mouseSourceDevice
-                        axis: MouseDevice.X
-                    }
-                },
-                Axis {
-                    id: mouseYAxis
-                    AnalogAxisInput {
-                        sourceDevice: mouseSourceDevice
-                        axis: MouseDevice.Y
-                    }
-                },
-                // Keyboard
-                Axis {
-                    id: keyboardXAxis
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Left]
-                        scale: -1.0
-                    }
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Right]
-                        scale: 1.0
-                    }
-                },
-                Axis {
-                    id: keyboardZAxis
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_PageUp]
-                        scale: 1.0
-                    }
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_PageDown]
-                        scale: -1.0
-                    }
-                },
-                Axis {
-                    id: keyboardYAxis
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Up]
-                        scale: 1.0
-                    }
-                    ButtonAxisInput {
-                        sourceDevice: keyboardSourceDevice
-                        buttons: [Qt.Key_Down]
-                        scale: -1.0
-                    }
-                }
-            ] // axes
-        },
-
-        FrameAction {
-            onTriggered: {
-                // The time difference since the last frame is passed in as the
-                // argument dt. It is a floating point value in units of seconds.
-
-                // Mouse input
-                if (d.leftMouseButtonPressed) {
-                    if (d.rightMouseButtonPressed) {
-                        if (zoomDistance(root.camera.position, root.camera.viewCenter) > root.zoomLimit * root.zoomLimit) {
-                            // Dolly up to limit
-                            root.camera.translate(Qt.vector3d(0, 0, d.translationY).times(dt), Camera.DontTranslateViewCenter);
-                        } else {
-                            // Too close, Dolly backwards
-                            root.camera.translate(Qt.vector3d(0, 0, -1).times(dt), Camera.DontTranslateViewCenter);
-                        }
-                    } else {
-                        // Translate
-                        root.camera.translate(Qt.vector3d(d.translationX, d.translationY, 0).times(dt));
-                    }
-                    return
-                } else if (d.rightMouseButtonPressed) {
-                    // Orbit
-                    root.camera.panAboutViewCenter(d.orbitX * dt, d.firstPersonUp);
-                    root.camera.tiltAboutViewCenter(d.orbitY * dt);
-                }
-                // Keyboard input
-                if (d.altPressed) {
-                    // Orbit
-                    root.camera.panAboutViewCenter(d.orbitX * dt, d.firstPersonUp);
-                    root.camera.tiltAboutViewCenter(d.orbitY * dt);
-                } else if (d.shiftPressed) {
-                    if (zoomDistance(root.camera.position, root.camera.viewCenter) > root.zoomLimit * root.zoomLimit) {
-                        // Dolly up to limit
-                        root.camera.translate(Qt.vector3d(0, 0, d.translationY).times(dt), Camera.DontTranslateViewCenter);
-                    } else {
-                        // Too close, Dolly backwards
-                        root.camera.translate(Qt.vector3d(0, 0, -1).times(dt), Camera.DontTranslateViewCenter);
-                    }
-                } else {
-                    // Translate
-                    root.camera.translate(Qt.vector3d(d.translationX, d.translationY, d.translationZ).times(dt));
-                }
-            }
-        }
-    ] // components
-}
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index 998d94cbf..c6223adf2 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -48,6 +48,7 @@
 #include <Qt3DExtras/qnormaldiffusemapalphamaterial.h>
 #include <Qt3DExtras/qnormaldiffusemapmaterial.h>
 #include <Qt3DExtras/qnormaldiffusespecularmapmaterial.h>
+#include <Qt3DExtras/qorbitcameracontroller.h>
 #include <Qt3DExtras/qpervertexcolormaterial.h>
 #include <Qt3DExtras/qphongalphamaterial.h>
 #include <Qt3DExtras/qphongmaterial.h>
@@ -75,7 +76,6 @@ static const struct {
     // Scene Graph
     { "LevelOfDetailLoader", 2, 2 },
     // Camera Controllers
-    { "OrbitCameraController", 2, 0 },
     { "FirstPersonCameraController", 2, 0 },
 };
 
@@ -87,6 +87,9 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri)
     // Entities
     qmlRegisterType<Qt3DExtras::QSkyboxEntity>(uri, 2, 0, "SkyboxEntity");
 
+    // Camera Controllers
+    qmlRegisterType<Qt3DExtras::QOrbitCameraController>(uri, 2, 0, "OrbitCameraController");
+
     // Materials
     qmlRegisterType<Qt3DExtras::QPhongMaterial>(uri, 2, 0, "PhongMaterial");
     qmlRegisterType<Qt3DExtras::QPhongAlphaMaterial>(uri, 2, 0, "PhongAlphaMaterial");