diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-01 08:56:53 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 14:05:30 +0200 |
| commit | 6e528fe53b182d0eceb58882b84cc43197256503 (patch) | |
| tree | 1fb188aa3c92ff6ff744da1d412e1af6d6fc7769 /examples | |
| parent | 5cdbaa7f350c04ce586e17e5deb970620de10459 (diff) | |
Refactored and Renamed Scene
Removed multiple inheritance of Entity and QAbstractScene in QScene.
QAbstractScene now inherits Entity directly.
Scene rename in QScene.
Change-Id: I2eb2d31858ddcc159b9ca765a5ad7efdce3d7086
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cpp_example/main.cpp | 4 | ||||
| -rw-r--r-- | examples/torus-cpp/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index afa265515..62aa044e7 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -55,7 +55,7 @@ #include <Qt3DCore/qabstracteffect.h> #include <Qt3DRenderer/texture.h> #include <Qt3DRenderer/renderpass.h> -#include <Qt3DRenderer/scene.h> +#include <Qt3DRenderer/qscene.h> #include <Qt3DCore/translatetransform.h> #include <Qt3DCore/matrixtransform.h> @@ -108,7 +108,7 @@ int main(int ac, char **av) torusEntity->addComponent(torusTransforms); // Scene file - Qt3D::Scene *scene = new Qt3D::Scene(); + Qt3D::QScene *scene = new Qt3D::QScene(); scene->setObjectName(QStringLiteral("scene")); Qt3D::Transform *sceneTransform = new Qt3D::Transform(); Qt3D::TranslateTransform *sceneTranslateTransform = new Qt3D::TranslateTransform(); diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index f2770d698..92443fc04 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -53,7 +53,7 @@ #include <Qt3DCore/qabstracteffect.h> #include <Qt3DRenderer/texture.h> #include <Qt3DRenderer/renderpass.h> -#include <Qt3DRenderer/scene.h> +#include <Qt3DRenderer/qscene.h> #include <Qt3DCore/scaletransform.h> #include <Qt3DCore/rotatetransform.h> |