From 7b26f6a1746419161a8f875e341b3e31220f4141 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Mon, 29 Sep 2014 17:19:36 +0200
Subject: QNode refactoring

Move almost everything to private classes.
Assimp loading restored.
All examples working.
QNode hierachy is now handled through QObject::setParent, addChild,
removeChild are part of the private api.

Note: commented QChangeArbiter unit tests as they can no longer work with this
patch and will restore them when QChangeArbiter will have been made private.

Task-number: QTBUG-41470
Task-number: QTBUG-41523
Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 examples/multiviewport/main.qml | 65 +++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'examples/multiviewport/main.qml')

diff --git a/examples/multiviewport/main.qml b/examples/multiviewport/main.qml
index 07a58c543..895a40c16 100644
--- a/examples/multiviewport/main.qml
+++ b/examples/multiviewport/main.qml
@@ -92,31 +92,32 @@ Entity {
 
                 ClearBuffer {
                     buffers : ClearBuffer.ColorDepthBuffer
+                }
 
-                    Viewport {
-                        id : topLeftViewport
-                        rect : Qt.rect(0, 0, 0.5, 0.5)
-                        CameraSelector {id : cameraSelectorTopLeftViewport; camera : sceneRoot.cameras[0]}
-                    }
+                Viewport {
+                    id : topLeftViewport
+                    rect : Qt.rect(0, 0, 0.5, 0.5)
+                    CameraSelector {id : cameraSelectorTopLeftViewport; camera : sceneRoot.cameras[0]}
+                }
 
-                    Viewport {
-                        id : topRightViewport
-                        rect : Qt.rect(0.5, 0, 0.5, 0.5)
-                        CameraSelector {id : cameraSelectorTopRightViewport;camera : sceneRoot.cameras[1]}
-                    }
+                Viewport {
+                    id : topRightViewport
+                    rect : Qt.rect(0.5, 0, 0.5, 0.5)
+                    CameraSelector {id : cameraSelectorTopRightViewport; camera : sceneRoot.cameras[1]}
+                }
 
-                    Viewport {
-                        id : bottomLeftViewport
-                        rect : Qt.rect(0, 0.5, 0.5, 0.5)
-                        CameraSelector {id : cameraSelectorBottomLeftViewport; camera : sceneRoot.cameras[2]}
-                    }
+                Viewport {
+                    id : bottomLeftViewport
+                    rect : Qt.rect(0, 0.5, 0.5, 0.5)
+                    CameraSelector {id : cameraSelectorBottomLeftViewport; camera : sceneRoot.cameras[2]}
+                }
 
-                    Viewport {
-                        id : bottomRightViewport
-                        rect : Qt.rect(0.5, 0.5, 0.5, 0.5)
-                        CameraSelector {id : cameraSelectorBottomRightViewport; camera : sceneRoot.cameras[3]}
-                    }
+                Viewport {
+                    id : bottomRightViewport
+                    rect : Qt.rect(0.5, 0.5, 0.5, 0.5)
+                    CameraSelector {id : cameraSelectorBottomRightViewport; camera : sceneRoot.cameras[3]}
                 }
+
             } // mainViewport
         } // frameGraph
 
@@ -160,6 +161,19 @@ Entity {
             components : [cameraLens, transform]
         }
 
+        Entity {
+            components : [
+                Transform {
+                    Rotate {
+                        angle : -sceneRoot.rotationAngle
+                        axis : Qt.vector3d(0, 0, 1)
+                    }
+                },
+                SceneLoader {
+                    source: ":/assets/test_scene.dae"
+                }]
+        }
+
         Entity {
             id : cameraViewport4
             property Transform transform : Transform {
@@ -173,17 +187,6 @@ Entity {
         }
 
 
-        SceneLoader {
-            id: scene
-            source: ":/assets/test_scene.dae"
-            components : [Transform {
-                    Rotate {
-                        angle : -sceneRoot.rotationAngle
-                        axis : Qt.vector3d(0, 0, 1)
-                    }
-                }]
-        }
-
     } // sceneRoot
 
 } // rootNode
-- 
cgit v1.2.3