diff options
Diffstat (limited to 'examples/qt3d/torus-qml')
| -rw-r--r-- | examples/qt3d/torus-qml/main.cpp | 20 | ||||
| -rw-r--r-- | examples/qt3d/torus-qml/main.qml | 4 |
2 files changed, 4 insertions, 20 deletions
diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index 24dbf55d5..dfee73d8f 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -34,28 +34,14 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DInput/QInputAspect> -#include <Qt3DQuick/QQmlAspectEngine> - +#include <qt3dquickwindow.h> #include <QGuiApplication> -#include <QtQml> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - - 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")); + Qt3DQuickWindow view; + view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml index 6e38318ba..fc86231d8 100644 --- a/examples/qt3d/torus-qml/main.qml +++ b/examples/qt3d/torus-qml/main.qml @@ -52,9 +52,7 @@ Entity { viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) } - Configuration { - controlledCamera: camera - } + FirstPersonCameraController { camera: camera } FrameGraph { id : external_forward_renderer |