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/deferred-renderer-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/deferred-renderer-cpp')
| -rw-r--r-- | examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/deferred-renderer-cpp/main.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro index 261d893ce..f9f239f24 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro +++ b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras HEADERS += \ gbuffer.h \ diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index f1221fd3b..868158e49 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -51,8 +51,8 @@ #include <Qt3DCore/QEntity> #include <Qt3DRender/QMaterial> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QPlaneMesh> +#include <Qt3DExtras//QSphereMesh> +#include <Qt3DExtras//QPlaneMesh> #include <Qt3DRender/QLayer> #include <Qt3DRender/QParameter> #include <Qt3DRender/QCamera> @@ -87,7 +87,7 @@ int main(int ac, char **av) FinalEffect *finalEffect = new FinalEffect(); SceneEffect *sceneEffect = new SceneEffect(); - Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh(); + Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh(); sphereMesh->setRings(50); sphereMesh->setSlices(100); @@ -97,7 +97,7 @@ int main(int ac, char **av) Qt3DRender::QLayer *quadLayer = new Qt3DRender::QLayer(); quadLayer->setNames(QStringList("screenQuad")); - Qt3DRender::QPlaneMesh *planeMesh = new Qt3DRender::QPlaneMesh(); + Qt3DExtras::QPlaneMesh *planeMesh = new Qt3DExtras::QPlaneMesh(); planeMesh->setMeshResolution(QSize(2, 2)); planeMesh->setWidth(2.0f); planeMesh->setHeight(2.0f); |