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/cylinder-cpp/main.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/cylinder-cpp/main.cpp')
| -rw-r--r-- | examples/qt3d/cylinder-cpp/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 22442d813..725d373fe 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -54,15 +54,15 @@ #include <Qt3DRender/qcamera.h> #include <Qt3DRender/qcameralens.h> -#include <Qt3DRender/qcylindermesh.h> +#include <Qt3DExtras/qcylindermesh.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qtechnique.h> -#include <Qt3DRender/qphongmaterial.h> +#include <Qt3DExtras/qphongmaterial.h> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/qforwardrenderer.h> +#include <Qt3DExtras/qforwardrenderer.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> @@ -91,7 +91,7 @@ int main(int argc, char **argv) cameraController->setCamera(camera); // Cylinder shape data - Qt3DRender::QCylinderMesh *mesh = new Qt3DRender::QCylinderMesh(); + Qt3DExtras::QCylinderMesh *mesh = new Qt3DExtras::QCylinderMesh(); mesh->setRadius(1); mesh->setLength(3); mesh->setRings(100); @@ -103,7 +103,7 @@ int main(int argc, char **argv) transform->setRotation(QQuaternion::fromAxisAndAngle(QVector3D(1, 0, 0), 45.0f)); // Material - Qt3DRender::QPhongMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); + Qt3DExtras::QPhongMaterial *material = new Qt3DExtras::QPhongMaterial(rootEntity); material->setDiffuse(Qt::red); // Cylinder |