diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-01-14 08:43:34 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-16 01:59:44 +0000 |
| commit | 8dcd8e42458748ca3ae3293b3d2b7e5b56b87252 (patch) | |
| tree | b4a63f6bd0665e9cdeb64ebdb9caaded12be16ff /examples/qt3d/assimp | |
| parent | 78ad6123fb4f8597eb936e2c4b1636d307df4ecc (diff) | |
Link examples against static lib
Contains:
Qt3DWindow
Qt3DQuickWindow
QFirstPersonCameraController
FirstPersonCameraController.qml
This will allow to get rid of the Camera configuration hack
Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/assimp')
| -rw-r--r-- | examples/qt3d/assimp/main.cpp | 16 | ||||
| -rw-r--r-- | examples/qt3d/assimp/main.qml | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 1b59163f2..ba238eafe 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -34,12 +34,9 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/QRenderAspect> +#include <qt3dquickwindow.h> #include <Qt3DRender/QSceneLoader> #include <Qt3DCore/QEntity> -#include <Qt3DInput/QInputAspect> -#include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <qqml.h> @@ -94,17 +91,10 @@ 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); qmlRegisterType<SceneHelper>("Qt3D.Examples", 2, 0, "SceneHelper"); - engine.setSource(QUrl("qrc:/main.qml")); + view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index 5936313f5..9eaf21464 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -60,8 +60,8 @@ Entity viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) } - Configuration { - controlledCamera: camera + FirstPersonCameraController { + camera: camera } // test_scene.dae contains three named nodes. Once the asynchronous loading of the |