diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-05-25 10:52:44 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-06-07 05:56:16 +0000 |
commit | 67b53537a9e11d0608a030d3f63da5309bf34988 (patch) | |
tree | b629a909e8dff90dbfb38f51b48b2a020433f504 /examples/qt3d/assimp | |
parent | 3a65ec4647b70b5bd33dbd7f82b63b07cdc92c8f (diff) |
Update assimp example to use 2 SceneLoaders
Change-Id: I4592e1366651fd7cc9790267a57b692b80b95320
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/assimp')
-rw-r--r-- | examples/qt3d/assimp/assimp.pro | 3 | ||||
-rw-r--r-- | examples/qt3d/assimp/main.qml | 62 |
2 files changed, 33 insertions, 32 deletions
diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro index 6742e213a..65dd19d11 100644 --- a/examples/qt3d/assimp/assimp.pro +++ b/examples/qt3d/assimp/assimp.pro @@ -13,4 +13,5 @@ SOURCES += \ RESOURCES += \ assimp.qrc \ - ../exampleresources/test_scene.qrc + ../exampleresources/test_scene.qrc \ + ../exampleresources/chest.qrc diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index f9807491c..f93c20171 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -40,39 +40,28 @@ import Qt3D.Render 2.0 Entity { components: FrameGraph { - activeFrameGraph: Viewport { - rect: Qt.rect(0, 0, 1, 1) - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer - CameraSelector { - camera: Entity { - id : camera - components : [ - Transform { - LookAt { - position: Qt.vector3d( 0.0, 0.0, -20.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - viewCenter: Qt.vector3d( 0.0, 0.0, 10.0 ) - } - Rotate { - angle : -30 - axis : Qt.vector3d(0, 1, 0) - } - }, - CameraLens { - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 60 - aspectRatio: 16/9 - nearPlane : 0.01 - farPlane : 1000.0 - } - ] - } - } - } + activeFrameGraph: ForwardRenderer { + clearColor: Qt.rgba(0, 0.5, 1, 1) + camera: camera } } + Camera { + id: camera + projectionType: CameraLens.PerspectiveProjection + fieldOfView: 45 + aspectRatio: 16/9 + nearPlane : 0.1 + farPlane : 1000.0 + position: Qt.vector3d( 0.0, 0.0, -40.0 ) + upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) + viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) + } + + Configuration { + controlledCamera: camera + } + Entity { components : [ Transform { @@ -80,8 +69,19 @@ Entity }, SceneLoader { - id: scene source: "qrc:/assets/test_scene.dae" }] } + + Entity { + components : [ + Transform { + Scale { scale: 0.2 } + Translate { dy: -15 } + }, + SceneLoader + { + source: "qrc:/assets/chest/Chest.obj" + }] + } } |