From 67b53537a9e11d0608a030d3f63da5309bf34988 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Mon, 25 May 2015 10:52:44 +0200
Subject: Update assimp example to use 2 SceneLoaders

Change-Id: I4592e1366651fd7cc9790267a57b692b80b95320
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 examples/qt3d/assimp/main.qml | 62 +++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'examples/qt3d/assimp/main.qml')

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"
+            }]
+    }
 }
-- 
cgit v1.2.3