diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-30 09:14:59 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-07-05 12:43:34 +0200 |
| commit | fa397f3e469fa9e89bb6e62401a50c8fb1f33cf1 (patch) | |
| tree | 419aa126b53a255a5838fbd4cc1fdd78eaa63cb7 /examples | |
| parent | fc9d1d5f4a0c8ef916d40f3684b66224d5e4e8e4 (diff) | |
Shape subclasses
QTorusMesh and QSphereMesh subclasses. Shape rename to QAbstractShapeMesh.
They all have a d-pointer.
Change-Id: I2c97fd01d7fa5e8bfa7c5e1b07f1a5249e79b36c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cpp_example/main.cpp | 5 | ||||
| -rw-r--r-- | examples/torus-cpp/main.cpp | 5 | ||||
| -rw-r--r-- | examples/torus-qml/main.qml | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index df2083cbf..3f30685fa 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -48,7 +48,7 @@ #include <Qt3DCore/entity.h> #include <Qt3DCore/cameralens.h> -#include <Qt3DRenderer/shape.h> +#include <Qt3DRenderer/qtorusmesh.h> #include <Qt3DRenderer/mesh.h> #include <Qt3DRenderer/technique.h> #include <Qt3DRenderer/material.h> @@ -86,8 +86,7 @@ int main(int ac, char **av) Qt3D::Entity *torusEntity = new Qt3D::Entity(); // Torus shape data - Qt3D::Shape *torus = new Qt3D::Shape(); - torus->setType(Qt3D::Shape::ShapeTorus); + Qt3D::QTorusMesh *torus = new Qt3D::QTorusMesh(); torus->setRadius(40); torus->setMinorRadius(15); diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index de1626a8e..6d1f5dcae 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/entity.h> #include <Qt3DCore/cameralens.h> -#include <Qt3DRenderer/shape.h> +#include <Qt3DRenderer/qtorusmesh.h> #include <Qt3DRenderer/mesh.h> #include <Qt3DRenderer/technique.h> #include <Qt3DRenderer/material.h> @@ -111,8 +111,7 @@ int main(int argc, char **argv) // Torus shape data - Qt3D::Shape *torus = new Qt3D::Shape(); - torus->setType(Qt3D::Shape::ShapeTorus); + Qt3D::QTorusMesh *torus = new Qt3D::QTorusMesh(); torus->setRadius(5); torus->setMinorRadius(1); torus->setRings(100); diff --git a/examples/torus-qml/main.qml b/examples/torus-qml/main.qml index 589197f4a..61004aa79 100644 --- a/examples/torus-qml/main.qml +++ b/examples/torus-qml/main.qml @@ -84,9 +84,8 @@ Entity { components: [external_forward_renderer] - Shape { + TorusMesh { id: mesh - type: Shape.ShapeTorus radius: 5 minorRadius: 1 rings: 100 |