AABB backwards pass

Author: kvark

Cargo.toml

@@ -21,7 +21,7 @@ default = ["opengl"]
 [dependencies]
 cgmath = "0.14"
 collision = {path = "../collision"}
-froggy = "0.3"
+froggy = {path = "../froggy"}
 genmesh = "0.5"
 gfx = "0.16"
 image = "0.13"

src/lib.rs

@@ -203,31 +203,33 @@ impl Hub {
     }
 
     fn update_graph(&mut self) {
-        let mut cursor = self.nodes.cursor_alive();
-        while let Some(mut item) = cursor.next() {
+        let mut cursor = self.nodes.cursor();
+        // forward pass: derive visibility, scene id, and world transform
+        // from the parent `Node`
+        while let Some((left, mut item, _)) = cursor.next() {
             if !item.visible {
                 item.world_visible = false;
                 continue
             }
-            let (visibility, affilation, transform, bounds) = match item.parent {
+            let (visibility, affilation, transform) = match item.parent {
                 Some(ref parent_ptr) => {
-                    let parent = item.look_back(parent_ptr).unwrap();
+                    let parent = left.get(parent_ptr).unwrap();
                     let transform = parent.world_transform.concat(&item.transform);
-                    let bounds = if parent.world_visible {
-                        let bounds = item.bounds.transform(&transform);
-                        parent.world_bounds = parent.world_bounds.union(&bounds);
-                        bounds
-                    } else {
-                        item.bounds
-                    };
-                    (parent.world_visible, parent.scene_id, transform, bounds)
+                    (parent.world_visible, parent.scene_id, transform)
                 },
-                None => (true, item.scene_id, item.transform, item.bounds),
+                None => (true, item.scene_id, item.transform),
             };
             item.world_visible = visibility;
             item.scene_id = affilation;
             item.world_transform = transform;
-            item.world_bounds = bounds;
+            item.world_bounds = item.bounds.transform(&transform);
+        }
+        // backwards pass: accumulate bounding boxes of children
+        while let Some((mut left, item, _)) = cursor.prev() {
+            if let (true, Some(parent_ptr)) = (item.world_visible, item.parent.as_ref()) {
+                let bounds = &mut left.get_mut(parent_ptr).unwrap().world_bounds;
+                *bounds = item.world_bounds.union(bounds);
+            }
         }
     }
 }

src/render.rs

@@ -305,7 +305,7 @@ impl Renderer {
         }
         let mut lights = Vec::new();
         let mut shadow_requests = Vec::new();
-        for node in hub.nodes.iter_alive() {
+        for node in &hub.nodes {
             if !node.visible || node.scene_id != Some(scene.unique_id) {
                 continue
             }
@@ -377,7 +377,7 @@ impl Renderer {
                 mx_vp: request.matrix.into(),
                 num_lights: 0,
             });
-            for node in hub.nodes.iter_alive() {
+            for node in &hub.nodes {
                 if !node.visible || node.scene_id != Some(scene.unique_id) {
                     continue;
                 }
@@ -435,7 +435,7 @@ impl Renderer {
             Some(ref request) => request.resource.clone(),
             None => shadow_default.clone(),
         };
-        for node in hub.nodes.iter_alive() {
+        for node in &hub.nodes {
             if !node.visible || node.scene_id != Some(scene.unique_id) {
                 continue;
             }
@@ -480,7 +480,7 @@ impl Renderer {
 
         // draw debug quads
         self.debug_quads.sync_pending();
-        for quad in self.debug_quads.iter_alive() {
+        for quad in &self.debug_quads {
             let pos = [
                 if quad.pos[0] >= 0 {
                     quad.pos[0]