diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-09 13:39:50 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-17 19:41:22 +0000 |
commit | d3952b92157f6b56ed08ced5cd491f1f117c64eb (patch) | |
tree | 3c321859e12529ddb75a586323c29d3953e9f32c /examples | |
parent | 26a118cfbce29014864f6cdddae66cccb65ffb4f (diff) |
Remove QAbstractTransform and friends
New simplified QTransform doesn't need these any longer. We now get a
nice reduction in QObject count when dealing with transformations.
Change-Id: I8ba8febada4ad1f05728aa848fb5e70a62028040
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qt3d/basicshapes-cpp/main.cpp | 3 | ||||
-rw-r--r-- | examples/qt3d/basicshapes-cpp/scenemodifier.h | 3 | ||||
-rw-r--r-- | examples/qt3d/bigscene-cpp/main.cpp | 3 | ||||
-rw-r--r-- | examples/qt3d/cpp_example/main.cpp | 8 | ||||
-rw-r--r-- | examples/qt3d/custom-mesh-cpp/main.cpp | 4 | ||||
-rw-r--r-- | examples/qt3d/cylinder-cpp/main.cpp | 3 | ||||
-rw-r--r-- | examples/qt3d/deferred-renderer-cpp/main.cpp | 3 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/planeentity.cpp | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/renderableentity.h | 3 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/trefoilknot.h | 3 | ||||
-rw-r--r-- | examples/qt3d/simple-cpp/main.cpp | 5 |
11 files changed, 1 insertions, 39 deletions
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index b34a3a18c..f21ff51d3 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -61,9 +61,6 @@ #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qsceneloader.h> -#include <Qt3DCore/qscaletransform.h> -#include <Qt3DCore/qrotatetransform.h> -#include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index fa1fc20b6..7ef8dd198 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -40,10 +40,7 @@ #include <QtCore/QObject> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/qscaletransform.h> -#include <Qt3DCore/qrotatetransform.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DRender/QTorusMesh> #include <Qt3DRender/QCylinderMesh> diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 26eacb0d2..47a2766ff 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -45,9 +45,6 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QCamera> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QTranslateTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QScaleTransform> #include <Qt3DCore/qaspectengine.h> #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QParameter> diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 3e47abc59..7f2fc31ac 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -41,6 +41,7 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qaspectengine.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DInput/QInputAspect> @@ -52,13 +53,6 @@ #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qsceneloader.h> - -#include <Qt3DCore/qtranslatetransform.h> -#include <Qt3DCore/qmatrixtransform.h> -#include <Qt3DCore/qrotatetransform.h> -#include <Qt3DCore/qlookattransform.h> -#include <Qt3DCore/qtransform.h> - #include <Qt3DRender/qcameraselector.h> #include <Qt3DRender/qrenderpassfilter.h> #include <Qt3DRender/qtechniquefilter.h> diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index ed94f96a5..6b8da8490 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -41,10 +41,6 @@ #include <Qt3DCore/QCamera> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QLookAtTransform> -#include <Qt3DCore/QScaleTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DCore/QAspectEngine> #include <Qt3DInput/QInputAspect> diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index b6441314e..a4d190200 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -51,9 +51,6 @@ #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qrenderpass.h> -#include <Qt3DCore/qscaletransform.h> -#include <Qt3DCore/qrotatetransform.h> -#include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index 111643ac4..3ab122b0a 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -49,9 +49,6 @@ #include <Qt3DCore/QCamera> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QLookAtTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DRender/QPointLight> #include <Qt3DRender/QWindow> #include <Qt3DCore/qaspectengine.h> diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp index a3785bbf0..86d2dba79 100644 --- a/examples/qt3d/materials-cpp/planeentity.cpp +++ b/examples/qt3d/materials-cpp/planeentity.cpp @@ -38,8 +38,6 @@ #include <Qt3DRender/QPlaneMesh> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QScaleTransform> -#include <Qt3DCore/QTranslateTransform> PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent) : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent)) diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h index 85499226f..af7233a00 100644 --- a/examples/qt3d/materials-cpp/renderableentity.h +++ b/examples/qt3d/materials-cpp/renderableentity.h @@ -39,9 +39,6 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QScaleTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DRender/QMesh> class RenderableEntity : public Qt3DCore::QEntity diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h index ff4e921da..b96291512 100644 --- a/examples/qt3d/materials-cpp/trefoilknot.h +++ b/examples/qt3d/materials-cpp/trefoilknot.h @@ -39,9 +39,6 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QScaleTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DRender/QMesh> class TrefoilKnot : public Qt3DCore::QEntity diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 3a24867e7..baaece681 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -40,10 +40,6 @@ #include <Qt3DCore/QCamera> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QTransform> -#include <Qt3DCore/QLookAtTransform> -#include <Qt3DCore/QScaleTransform> -#include <Qt3DCore/QRotateTransform> -#include <Qt3DCore/QTranslateTransform> #include <Qt3DCore/QAspectEngine> #include <Qt3DInput/QInputAspect> @@ -52,7 +48,6 @@ #include <Qt3DRender/QFrameGraph> #include <Qt3DRender/QForwardRenderer> #include <Qt3DRender/QPhongMaterial> - #include <Qt3DRender/QCylinderMesh> #include <Qt3DRender/QSphereMesh> #include <Qt3DRender/QTorusMesh> |