diff options
Diffstat (limited to 'examples/qt3d/keyboardinput-qml')
-rw-r--r-- | examples/qt3d/keyboardinput-qml/main.cpp | 19 | ||||
-rw-r--r-- | examples/qt3d/keyboardinput-qml/main.qml | 2 |
2 files changed, 4 insertions, 17 deletions
diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index 072fef361..424aae52f 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -34,28 +34,15 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DInput/qinputaspect.h> -#include <Qt3DQuick/QQmlAspectEngine> - +#include <qt3dquickwindow.h> #include <QGuiApplication> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); + Qt3DQuickWindow view; - Window view; - Qt3DCore::Quick::QQmlAspectEngine engine; - - engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); - engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); - QVariantMap data; - data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); - data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); - engine.aspectEngine()->setData(data); - engine.setSource(QUrl("qrc:/main.qml")); - + view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index e943f190c..96cf9148e 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -53,7 +53,7 @@ Entity { viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) } - Configuration { controlledCamera: camera } + FirstPersonCameraController { camera: camera } components: FrameGraph { activeFrameGraph: ForwardRenderer { |