Camera controller naming convention

Renamed the QOrbitControl to QOrbitCameraController
to be more in line with the FirstPerson version.

Change-Id: Ibf5fb0d3cc548b7dc25d56ea385a64c7a76770aa
Task-number: QTBUG-50660
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

10 files changed, 55 insertions, 55 deletions

diff --git a/examples/qt3d/component-changes/main.cpp b/examples/qt3d/component-changes/main.cpp
index e4e46a0d5..32f95d7b5 100644
--- a/examples/qt3d/component-changes/main.cpp
+++ b/examples/qt3d/component-changes/main.cpp
@@ -59,7 +59,7 @@
 #include <Qt3DCore/qtransform.h>
 
 #include <Qt3DExtras/qt3dwindow.h>
-#include <Qt3DExtras/qorbitcontrol.h>
+#include <Qt3DExtras/qorbitcameracontroller.h>
 
 #include <QTimer>
 
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
     camera->setViewCenter(QVector3D(0, 0, 0));
 
     // For camera controls
-    Qt3DExtras::QOrbitControl *cameraController = new Qt3DExtras::QOrbitControl(rootEntity);
+    Qt3DExtras::QOrbitCameraController *cameraController = new Qt3DExtras::QOrbitCameraController(rootEntity);
     cameraController->setCamera(camera);
 
     // Cylinder mesh data
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index 2fbb31c6f..33a85f32b 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -69,7 +69,7 @@
 #include <Qt3DCore/qaspectengine.h>
 
 #include <Qt3DExtras/qt3dwindow.h>
-#include <Qt3DExtras/qorbitcontrol.h>
+#include <Qt3DExtras/qorbitcameracontroller.h>
 
 int main(int argc, char **argv)
 {
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
     camera->setViewCenter(QVector3D(0, 0, 0));
 
     // For camera controls
-    Qt3DExtras::QOrbitControl *cameraController = new Qt3DExtras::QOrbitControl(rootEntity);
+    Qt3DExtras::QOrbitCameraController *cameraController = new Qt3DExtras::QOrbitCameraController(rootEntity);
     cameraController->setCamera(camera);
 
     // Cylinder shape data
diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml
index 9d2fed54b..a5df8af44 100644
--- a/examples/qt3d/cylinder-qml/main.qml
+++ b/examples/qt3d/cylinder-qml/main.qml
@@ -68,7 +68,7 @@ Entity {
         viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 )
     }
 
-    OrbitController { camera: camera }
+    OrbitCameraController { camera: camera }
 
     RenderSettings {
         id : external_forward_renderer
diff --git a/src/extras/defaults/defaults.pri b/src/extras/defaults/defaults.pri
index 6ff23403b..04cd87246 100644
--- a/src/extras/defaults/defaults.pri
+++ b/src/extras/defaults/defaults.pri
@@ -24,10 +24,10 @@ HEADERS += \
     $$PWD/qphongalphamaterial.h \
     $$PWD/qphongalphamaterial_p.h \
     $$PWD/qt3dwindow.h \
-    $$PWD/qorbitcontrol.h \
-    $$PWD/qorbitcontrol_p.h \
     $$PWD/qfirstpersoncameracontroller.h \
-    $$PWD/qfirstpersoncameracontroller_p.h
+    $$PWD/qfirstpersoncameracontroller_p.h \
+    $$PWD/qorbitcameracontroller.h \
+    $$PWD/qorbitcameracontroller_p.h
 
 SOURCES += \
     $$PWD/qphongmaterial.cpp \
@@ -42,6 +42,6 @@ SOURCES += \
     $$PWD/qgoochmaterial.cpp \
     $$PWD/qphongalphamaterial.cpp \
     $$PWD/qt3dwindow.cpp \
-    $$PWD/qorbitcontrol.cpp \
-    $$PWD/qfirstpersoncameracontroller.cpp
+    $$PWD/qfirstpersoncameracontroller.cpp \
+    $$PWD/qorbitcameracontroller.cpp
 
diff --git a/src/extras/defaults/qorbitcontrol.cpp b/src/extras/defaults/qorbitcameracontroller.cpp
index 8d41a241e..57f1c2e5b 100644
--- a/src/extras/defaults/qorbitcontrol.cpp
+++ b/src/extras/defaults/qorbitcameracontroller.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qorbitcontrol_p.h"
-#include "qorbitcontrol.h"
+#include "qorbitcameracontroller_p.h"
+#include "qorbitcameracontroller.h"
 #include <QtGlobal>
 #include <Qt3DRender/QCamera>
 #include <Qt3DInput/QAxis>
@@ -54,11 +54,11 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DExtras {
 
 /*!
- * \class QOrbitControl::QOrbitControl
+ * \class QOrbitCameraController::QOrbitCameraController
  * \internal
  */
 
-QOrbitControlPrivate::QOrbitControlPrivate()
+QOrbitCameraControllerPrivate::QOrbitCameraControllerPrivate()
     : Qt3DCore::QEntityPrivate()
     , m_camera(nullptr)
     , m_leftMouseButtonAction(new Qt3DInput::QAction())
@@ -92,7 +92,7 @@ QOrbitControlPrivate::QOrbitControlPrivate()
     , m_cameraUp(QVector3D(0.0f, 1.0f, 0.0f))
 {}
 
-void QOrbitControlPrivate::init()
+void QOrbitCameraControllerPrivate::init()
 {
     //// Actions
 
@@ -176,7 +176,7 @@ void QOrbitControlPrivate::init()
     m_logicalDevice->addAxis(m_tyAxis);
     m_logicalDevice->addAxis(m_tzAxis);
 
-    Q_Q(QOrbitControl);
+    Q_Q(QOrbitCameraController);
     //// FrameAction
 
     QObject::connect(m_frameAction, SIGNAL(triggered(float)),
@@ -197,7 +197,7 @@ float zoomDistance(QVector3D firstPoint, QVector3D secondPoint)
     return (secondPoint - firstPoint).lengthSquared();
 }
 
-void QOrbitControlPrivate::_q_onTriggered(float dt)
+void QOrbitCameraControllerPrivate::_q_onTriggered(float dt)
 {
     if (m_camera != nullptr) {
         // Mouse input
@@ -243,71 +243,71 @@ void QOrbitControlPrivate::_q_onTriggered(float dt)
     }
 }
 
-QOrbitControl::QOrbitControl(Qt3DCore::QNode *parent)
-    : Qt3DCore::QEntity(*new QOrbitControlPrivate, parent)
+QOrbitCameraController::QOrbitCameraController(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(*new QOrbitCameraControllerPrivate, parent)
 {
-    Q_D(QOrbitControl);
+    Q_D(QOrbitCameraController);
     d->init();
 }
 
-QOrbitControl::~QOrbitControl()
+QOrbitCameraController::~QOrbitCameraController()
 {
 }
 
-Qt3DRender::QCamera *QOrbitControl::camera() const
+Qt3DRender::QCamera *QOrbitCameraController::camera() const
 {
-    Q_D(const QOrbitControl);
+    Q_D(const QOrbitCameraController);
     return d->m_camera;
 }
 
-float QOrbitControl::linearSpeed() const
+float QOrbitCameraController::linearSpeed() const
 {
-    Q_D(const QOrbitControl);
+    Q_D(const QOrbitCameraController);
     return d->m_linearSpeed;
 }
 
-float QOrbitControl::lookSpeed() const
+float QOrbitCameraController::lookSpeed() const
 {
-    Q_D(const QOrbitControl);
+    Q_D(const QOrbitCameraController);
     return d->m_lookSpeed;
 }
 
-float QOrbitControl::zoomInLimit() const
+float QOrbitCameraController::zoomInLimit() const
 {
-    Q_D(const QOrbitControl);
+    Q_D(const QOrbitCameraController);
     return d->m_zoomInLimit;
 }
 
-void QOrbitControl::setCamera(Qt3DRender::QCamera *camera)
+void QOrbitCameraController::setCamera(Qt3DRender::QCamera *camera)
 {
-    Q_D(QOrbitControl);
+    Q_D(QOrbitCameraController);
     if (d->m_camera != camera) {
         d->m_camera = camera;
         emit cameraChanged();
     }
 }
 
-void QOrbitControl::setLinearSpeed(float linearSpeed)
+void QOrbitCameraController::setLinearSpeed(float linearSpeed)
 {
-    Q_D(QOrbitControl);
+    Q_D(QOrbitCameraController);
     if (d->m_linearSpeed != linearSpeed) {
         d->m_linearSpeed = linearSpeed;
         emit linearSpeedChanged();
     }
 }
 
-void QOrbitControl::setLookSpeed(float lookSpeed)
+void QOrbitCameraController::setLookSpeed(float lookSpeed)
 {
-    Q_D(QOrbitControl);
+    Q_D(QOrbitCameraController);
     if (d->m_lookSpeed != lookSpeed) {
         d->m_lookSpeed = lookSpeed;
         emit lookSpeedChanged();
     }
 }
 
-void QOrbitControl::setZoomInLimit(float zoomInLimit)
+void QOrbitCameraController::setZoomInLimit(float zoomInLimit)
 {
-    Q_D(QOrbitControl);
+    Q_D(QOrbitCameraController);
     if (d->m_zoomInLimit != zoomInLimit) {
         d->m_zoomInLimit = zoomInLimit;
         emit zoomInLimitChanged();
@@ -318,4 +318,4 @@ void QOrbitControl::setZoomInLimit(float zoomInLimit)
 
 QT_END_NAMESPACE
 
-#include "moc_qorbitcontrol.cpp"
+#include "moc_qorbitcameracontroller.cpp"
diff --git a/src/extras/defaults/qorbitcontrol.h b/src/extras/defaults/qorbitcameracontroller.h
index 2fb0c0bb9..fb4d0aa7a 100644
--- a/src/extras/defaults/qorbitcontrol.h
+++ b/src/extras/defaults/qorbitcameracontroller.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DEXTRAS_QORBITCONTROL_H
-#define QT3DEXTRAS_QORBITCONTROL_H
+#ifndef QT3DEXTRAS_QORBITCAMERACONTROLLER_H
+#define QT3DEXTRAS_QORBITCAMERACONTROLLER_H
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DCore/QEntity>
@@ -48,9 +48,9 @@ class QCamera;
 
 namespace Qt3DExtras {
 
-class QOrbitControlPrivate;
+class QOrbitCameraControllerPrivate;
 
-class QT3DEXTRASSHARED_EXPORT QOrbitControl : public Qt3DCore::QEntity
+class QT3DEXTRASSHARED_EXPORT QOrbitCameraController : public Qt3DCore::QEntity
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
@@ -59,8 +59,8 @@ class QT3DEXTRASSHARED_EXPORT QOrbitControl : public Qt3DCore::QEntity
     Q_PROPERTY(float zoomInLimit READ zoomInLimit WRITE setZoomInLimit NOTIFY zoomInLimitChanged)
 
 public:
-    explicit QOrbitControl(Qt3DCore::QNode *parent = nullptr);
-    ~QOrbitControl();
+    explicit QOrbitCameraController(Qt3DCore::QNode *parent = nullptr);
+    ~QOrbitCameraController();
 
     float clampInputs(float input1, float input2);
     Qt3DRender::QCamera *camera() const;
@@ -80,7 +80,7 @@ Q_SIGNALS:
     void zoomInLimitChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QOrbitControl)
+    Q_DECLARE_PRIVATE(QOrbitCameraController)
     Q_PRIVATE_SLOT(d_func(),  void _q_onTriggered(float))
 };
 
@@ -88,4 +88,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DEXTRAS_QORBITCONTROL_H
+#endif // QT3DEXTRAS_QORBITCAMERACONTROLLER_H
diff --git a/src/extras/defaults/qorbitcontrol_p.h b/src/extras/defaults/qorbitcameracontroller_p.h
index f3f384493..d207df712 100644
--- a/src/extras/defaults/qorbitcontrol_p.h
+++ b/src/extras/defaults/qorbitcameracontroller_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTINPUT_QORBITCONTROL_P_H
-#define QTINPUT_QORBITCONTROL_P_H
+#ifndef QT3DEXTRAS_QORBITCAMERACONTROLLER_P_H
+#define QT3DEXTRAS_QORBITCAMERACONTROLLER_P_H
 
 //
 //  W A R N I N G
@@ -50,7 +50,7 @@
 
 #include <Qt3DCore/private/qentity_p.h>
 #include <QVector3D>
-#include "qorbitcontrol.h"
+#include "qorbitcameracontroller.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -78,10 +78,10 @@ class QAxisActionHandler;
 
 namespace Qt3DExtras {
 
-class QOrbitControlPrivate : public Qt3DCore::QEntityPrivate
+class QOrbitCameraControllerPrivate : public Qt3DCore::QEntityPrivate
 {
 public:
-    QOrbitControlPrivate();
+    QOrbitCameraControllerPrivate();
 
     void init();
 
@@ -126,11 +126,11 @@ public:
 
     void _q_onTriggered(float);
 
-    Q_DECLARE_PUBLIC(QOrbitControl)
+    Q_DECLARE_PUBLIC(QOrbitCameraController)
 };
 
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
 
-#endif // QT3DEXTRAS_QORBITCONTROL_P_H
+#endif // QT3DEXTRAS_QORBITCAMERACONTROLLER_P_H
diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri
index 249c9139b..28a1d1051 100644
--- a/src/quick3d/imports/extras/defaults/defaults.pri
+++ b/src/quick3d/imports/extras/defaults/defaults.pri
@@ -18,5 +18,5 @@ QML_FILES = \
     $$PWD/qml/GoochMaterial.qml \
     $$PWD/qml/PhongAlphaMaterial.qml \
     $$PWD/qml/TextureMaterial.qml \
-    $$PWD/qml/OrbitController.qml \
+    $$PWD/qml/OrbitCameraController.qml \
     $$PWD/qml/FirstPersonCameraController.qml
diff --git a/src/quick3d/imports/extras/defaults/qml/OrbitController.qml b/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml
index 328b7b98e..328b7b98e 100644
--- a/src/quick3d/imports/extras/defaults/qml/OrbitController.qml
+++ b/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index 95be07095..aa65c8b65 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -74,7 +74,7 @@ static const struct {
     // Entities
     { "SkyboxEntity", 2, 0 },
     // Camera Controllers
-    { "OrbitController", 2, 0 },
+    { "OrbitCameraController", 2, 0 },
     { "FirstPersonCameraController", 2, 0 },
 };