From ae03c0af3b07712f6a5a1c75fe729215ea820d54 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 20 Jan 2015 15:16:21 +0100 Subject: 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 --- examples/tessellation-modes/main.cpp | 2 ++ examples/tessellation-modes/tessellation-modes.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/tessellation-modes') diff --git a/examples/tessellation-modes/main.cpp b/examples/tessellation-modes/main.cpp index 93c006e02..7b503356a 100644 --- a/examples/tessellation-modes/main.cpp +++ b/examples/tessellation-modes/main.cpp @@ -43,6 +43,7 @@ #include #include +#include #include @@ -59,6 +60,7 @@ int main(int argc, char* argv[]) Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); + engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast(&view))); diff --git a/examples/tessellation-modes/tessellation-modes.pro b/examples/tessellation-modes/tessellation-modes.pro index b95545243..683dd7f9f 100644 --- a/examples/tessellation-modes/tessellation-modes.pro +++ b/examples/tessellation-modes/tessellation-modes.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += 3dcore 3drenderer 3dquick qml quick +QT += 3dcore 3drenderer 3dinput 3dquick qml quick include("../exampleresources/exampleresources.pri") -- cgit v1.2.3