diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-03 12:35:35 +0100 |
|---|---|---|
| committer | Robert Brock <robert.brock@kdab.com> | 2016-05-03 11:44:45 +0000 |
| commit | b9223b05abeb163b447067bfafc1797f3459389d (patch) | |
| tree | a16bb78e6505982f53eafc87bff8add1dbbbcdb4 /examples/qt3d | |
| parent | a7cd21c42d70415fc6aded1f5ff32633ef42cb0c (diff) | |
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>
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/component-changes/main.cpp | 4 | ||||
| -rw-r--r-- | examples/qt3d/cylinder-cpp/main.cpp | 4 | ||||
| -rw-r--r-- | examples/qt3d/cylinder-qml/main.qml | 2 |
3 files changed, 5 insertions, 5 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 |