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/simple-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/simple-cpp')
| -rw-r--r-- | examples/qt3d/simple-cpp/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 38d8842ed..af7f429fe 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -59,11 +59,11 @@ #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/QForwardRenderer> -#include <Qt3DRender/QPhongMaterial> -#include <Qt3DRender/QCylinderMesh> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QTorusMesh> +#include <Qt3DExtras//QForwardRenderer> +#include <Qt3DExtras//QPhongMaterial> +#include <Qt3DExtras/QCylinderMesh> +#include <Qt3DExtras/QSphereMesh> +#include <Qt3DExtras/QTorusMesh> #include <QPropertyAnimation> @@ -77,11 +77,11 @@ Qt3DCore::QEntity *createScene() Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity; // Material - Qt3DRender::QMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); + Qt3DRender::QMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity); // Torus Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity); - Qt3DRender::QTorusMesh *torusMesh = new Qt3DRender::QTorusMesh; + Qt3DExtras::QTorusMesh *torusMesh = new Qt3DExtras::QTorusMesh; torusMesh->setRadius(5); torusMesh->setMinorRadius(1); torusMesh->setRings(100); @@ -97,7 +97,7 @@ Qt3DCore::QEntity *createScene() // Sphere Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity); - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh; + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh; sphereMesh->setRadius(3); Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform; |