summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-07-04 10:48:23 +0200
committerPaul Lemire <paul.lemire@kdab.com>2014-07-05 23:21:49 +0200
commit97717d5ae0bbf3c9e959ca4a00b38df4a59f977a (patch)
tree6650ab527324c1dd7685c310338ca66016c40e03 /examples
parent520c17f8ee68eb525f0cd780353e8c6dc7ea6f7f (diff)
Renamed Transform to QTransform
Change-Id: Ic7ee353afbc8872f5f5a85662acc190ccae4d178 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/cpp_example/main.cpp8
-rw-r--r--examples/torus-cpp/main.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp
index 28e8b5741..6ab0745bf 100644
--- a/examples/cpp_example/main.cpp
+++ b/examples/cpp_example/main.cpp
@@ -61,7 +61,7 @@
#include <Qt3DCore/matrixtransform.h>
#include <Qt3DCore/rotatetransform.h>
#include <Qt3DCore/lookattransform.h>
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
#include <Qt3DRenderer/qcameraselector.h>
#include <Qt3DRenderer/qrenderpassfilter.h>
@@ -95,7 +95,7 @@ int main(int ac, char **av)
// TorusMesh Transform
Qt3D::TranslateTransform *torusTranslation = new Qt3D::TranslateTransform();
Qt3D::RotateTransform *torusRotation = new Qt3D::RotateTransform();
- Qt3D::Transform *torusTransforms = new Qt3D::Transform();
+ Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
torusTranslation->setTranslation(QVector3D(-5.0f, 3.5f, 2.0f));
torusRotation->setAxis(QVector3D(1, 0, 0));
@@ -107,7 +107,7 @@ int main(int ac, char **av)
// Scene file
Qt3D::QScene *scene = new Qt3D::QScene();
scene->setObjectName(QStringLiteral("scene"));
- Qt3D::Transform *sceneTransform = new Qt3D::Transform();
+ Qt3D::QTransform *sceneTransform = new Qt3D::QTransform();
Qt3D::TranslateTransform *sceneTranslateTransform = new Qt3D::TranslateTransform();
sceneTranslateTransform->setDx(2.5);
sceneTranslateTransform->setDy(0.5);
@@ -121,7 +121,7 @@ int main(int ac, char **av)
Qt3D::Camera *cameraEntity = new Qt3D::Camera();
cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens();
- Qt3D::Transform *cameraTransform = new Qt3D::Transform();
+ Qt3D::QTransform *cameraTransform = new Qt3D::QTransform();
Qt3D::LookAtTransform *cameraLookAtTransform = new Qt3D::LookAtTransform();
cameraLens->setPerspectiveProjection(60.0f, 16.0f/9.0f, 0.1f, 1000.0f);
diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp
index c3e9ddd10..c657cb6f3 100644
--- a/examples/torus-cpp/main.cpp
+++ b/examples/torus-cpp/main.cpp
@@ -58,7 +58,7 @@
#include <Qt3DCore/scaletransform.h>
#include <Qt3DCore/rotatetransform.h>
#include <Qt3DCore/lookattransform.h>
-#include <Qt3DCore/transform.h>
+#include <Qt3DCore/qtransform.h>
#include <Qt3DRenderer/qcameraselector.h>
#include <Qt3DRenderer/qrenderpassfilter.h>
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
Qt3D::Camera *cameraEntity = new Qt3D::Camera();
cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens();
- Qt3D::Transform *cameraTransform = new Qt3D::Transform();
+ Qt3D::QTransform *cameraTransform = new Qt3D::QTransform();
Qt3D::LookAtTransform *cameraLookAtTransform = new Qt3D::LookAtTransform();
cameraLens->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
// TorusMesh Transform
Qt3D::ScaleTransform *torusScale = new Qt3D::ScaleTransform();
Qt3D::RotateTransform *torusRotation = new Qt3D::RotateTransform();
- Qt3D::Transform *torusTransforms = new Qt3D::Transform();
+ Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
torusScale->setScale3D(QVector3D(1.5f, 1.0f, 0.5f));
torusRotation->setAngleDeg(45.0f);