diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-01-18 17:32:57 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-19 18:42:15 +0000 |
| commit | aa6371900b038199b04a7977b199098c2d2b83da (patch) | |
| tree | fecfcfd41ceecba09911f6f5eb22b0bdd8893b9e /examples/qt3d/basicshapes-cpp/scenemodifier.h | |
| parent | 06a4f3e651d5afd28e2e5552abbef9d850538dba (diff) | |
Cone and Plane added to Basic shapes
Existing shapes have been moved outward to 5 and -5 x.
Cone and plane were then added at x: 0
Task-number: QTBUG-41548
Change-Id: I65a3a1998b010179e4171686f71d52ce42e112ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/basicshapes-cpp/scenemodifier.h')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/scenemodifier.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index 7ef8dd198..4e65222d4 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -43,8 +43,10 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DRender/QTorusMesh> +#include <Qt3DRender/QConeMesh> #include <Qt3DRender/QCylinderMesh> #include <Qt3DRender/QCuboidMesh> +#include <Qt3DRender/QPlaneMesh> #include <Qt3DRender/QSphereMesh> #include <Qt3DRender/QPhongMaterial> @@ -58,16 +60,20 @@ public: public slots: void enableTorus(bool enabled); + void enableCone(bool enabled); void enableCylinder(bool enabled); void enableCuboid(bool enabled); + void enablePlane(bool enabled); void enableSphere(bool enabled); private: Qt3DCore::QEntity *m_rootEntity; Qt3DRender::QTorusMesh *m_torus; + Qt3DCore::QEntity *m_coneEntity; Qt3DCore::QEntity *m_cylinderEntity; Qt3DCore::QEntity *m_torusEntity; Qt3DCore::QEntity *m_cuboidEntity; + Qt3DCore::QEntity *m_planeEntity; Qt3DCore::QEntity *m_sphereEntity; }; |