diff options
Diffstat (limited to 'examples/qt3d/gltf')
| -rw-r--r-- | examples/qt3d/gltf/main.cpp | 21 | ||||
| -rw-r--r-- | examples/qt3d/gltf/main.qml | 4 |
2 files changed, 4 insertions, 21 deletions
diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index 51bde76a6..cf50473ae 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -34,31 +34,16 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DInput/QInputAspect> -#include <Qt3DQuick/QQmlAspectEngine> - +#include "qt3dquickwindow.h" #include <QGuiApplication> #include <QOpenGLContext> -#include <QtQml> int main(int argc, char* argv[]) { + Qt3DQuickWindow view; 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")); + view.setSource(QUrl("qrc:/main.qml")); view.show(); const bool isES = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml index c244c24f8..f5c280af0 100644 --- a/examples/qt3d/gltf/main.qml +++ b/examples/qt3d/gltf/main.qml @@ -53,9 +53,7 @@ Entity { viewCenter: Qt.vector3d( 0.0, 10.0, 0.0 ) } - Configuration { - controlledCamera: camera - } + FirstPersonCameraController { camera: camera } FrameGraph { id : framegraph |