diff options
Diffstat (limited to 'examples/qt3d/instanced-arrays-qml/main.cpp')
-rw-r--r-- | examples/qt3d/instanced-arrays-qml/main.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/examples/qt3d/instanced-arrays-qml/main.cpp b/examples/qt3d/instanced-arrays-qml/main.cpp index ca100d238..44d6afcfe 100644 --- a/examples/qt3d/instanced-arrays-qml/main.cpp +++ b/examples/qt3d/instanced-arrays-qml/main.cpp @@ -35,32 +35,20 @@ ****************************************************************************/ #include "instancebuffer.h" -#include <window.h> -#include <Qt3DRender/QRenderAspect> -#include <Qt3DInput/QInputAspect> +#include "qt3dquickwindow.h" #include <Qt3DQuick/QQmlAspectEngine> -#include <QtQml> +#include <QQmlEngine> +#include <QQmlContext> #include <QGuiApplication> 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); + Qt3DQuickWindow view; InstanceBuffer buffer; - engine.qmlEngine()->rootContext()->setContextProperty("_instanceBuffer", &buffer); - - engine.setSource(QUrl("qrc:/main.qml")); - + view.engine()->qmlEngine()->rootContext()->setContextProperty("_instanceBuffer", &buffer); + view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); |