diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /examples/qt3d/dynamicscene-cpp | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/dynamicscene-cpp')
| -rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.cpp | 4 | ||||
| -rw-r--r-- | examples/qt3d/dynamicscene-cpp/boxentity.h | 8 | ||||
| -rw-r--r-- | examples/qt3d/dynamicscene-cpp/main.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp index c0e8c7511..a39c9a9dc 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp @@ -55,8 +55,8 @@ BoxEntity::BoxEntity(QNode *parent) : Qt3DCore::QEntity(parent) , m_transform(new Qt3DCore::QTransform()) - , m_mesh(new Qt3DRender::QCuboidMesh()) - , m_material(new Qt3DRender::QPhongMaterial()) + , m_mesh(new Qt3DExtras::QCuboidMesh()) + , m_material(new Qt3DExtras::QPhongMaterial()) , m_angle(0.0f) , m_radius(1.0f) { diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index 1aa24c436..f9fdb9580 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -53,8 +53,8 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DRender/QCuboidMesh> -#include <Qt3DRender/QPhongMaterial> +#include <Qt3DExtras/QCuboidMesh> +#include <Qt3DExtras/QPhongMaterial> class BoxEntity : public Qt3DCore::QEntity { @@ -85,8 +85,8 @@ private: void updateTransformation(); Qt3DCore::QTransform *m_transform; - Qt3DRender::QCuboidMesh *m_mesh; - Qt3DRender::QPhongMaterial *m_material; + Qt3DExtras::QCuboidMesh *m_mesh; + Qt3DExtras::QPhongMaterial *m_material; float m_angle; float m_radius; }; diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 3839b480a..353f6a42d 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -56,7 +56,7 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> +#include <Qt3DExtras/QForwardRenderer> #include "examplescene.h" #include "qt3dwindow.h" |