diff options
Diffstat (limited to 'examples/qt3d/bigmodel-qml')
-rw-r--r-- | examples/qt3d/bigmodel-qml/main.cpp | 19 | ||||
-rw-r--r-- | examples/qt3d/bigmodel-qml/main.qml | 3 |
2 files changed, 5 insertions, 17 deletions
diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index 0d944c883..3a94a8826 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -34,29 +34,16 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/QRenderAspect> -#include <Qt3DInput/QInputAspect> -#include <Qt3DQuick/QQmlAspectEngine> - +#include "qt3dquickwindow.h" #include <QGuiApplication> -#include <QtQml> -#include <iostream> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Window view; - Qt3DCore::Quick::QQmlAspectEngine engine; + Qt3DQuickWindow view; - 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/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml index 56081055e..a4c452ee1 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/examples/qt3d/bigmodel-qml/main.qml @@ -36,12 +36,13 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 +import Qt3D.Input 2.0 import QtQuick 2.2 as QQ2 Entity { id: sceneRoot - Configuration { controlledCamera: mainCamera } + FirstPersonCameraController { camera: mainCamera } components: [ FrameGraph { activeFrameGraph: ForwardRenderer { camera: mainCamera } } |