diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-01-20 15:16:21 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-01-23 07:51:29 +0100 |
| commit | ae03c0af3b07712f6a5a1c75fe729215ea820d54 (patch) | |
| tree | ed9d117f4a384c1f3a113b47347c16d0c4537c01 /examples/wireframe | |
| parent | f901090a4144d64bd8b483b75af3af4fd7142b45 (diff) | |
Move CameraController in the input aspect
With this move it also becomes a private class. As a result I had to
touch all the examples as you won't get camera navigation anymore if the
input aspect is not registered.
Quick3DConfiguration doesn't depend on the QuickWindow singleton hack
anymore, it tries to get back to the aspects and set the camera on the
ones having a corresponding property.
It also mostly empties Window and QuickWindow.
Change-Id: Ife1644bd338e51929bad1e99089bd5e4c68ebc68
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/wireframe')
| -rw-r--r-- | examples/wireframe/main.cpp | 2 | ||||
| -rw-r--r-- | examples/wireframe/wireframe.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/wireframe/main.cpp b/examples/wireframe/main.cpp index 71d792ac9..1dbdec85e 100644 --- a/examples/wireframe/main.cpp +++ b/examples/wireframe/main.cpp @@ -41,6 +41,7 @@ #include <Qt3DQuick/quickwindow.h> #include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DInput/QInputAspect> #include <exampleresources.h> @@ -57,6 +58,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); + engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); // Expose the window as a context property so we can set the aspect ratio engine.qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/wireframe/wireframe.pro b/examples/wireframe/wireframe.pro index 7dc5eb255..2b2fd991a 100644 --- a/examples/wireframe/wireframe.pro +++ b/examples/wireframe/wireframe.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += 3dcore 3drenderer 3dquick qml quick +QT += 3dcore 3drenderer 3dinput 3dquick qml quick include("../exampleresources/exampleresources.pri") |