WIP collision-rs integration

Author: kvark

Cargo.toml

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

src/factory.rs

@@ -4,7 +4,8 @@ use std::io::BufReader;
 use std::fs::File;
 use std::path::Path;
 
-use cgmath::Transform as Transform_;
+use cgmath::{Point3, Transform as Transform_};
+use collision::Aabb3;
 use genmesh::{Polygon, EmitTriangles, Triangulate, Vertex as GenVertex};
 use genmesh::generators::{self, IndexedPolygon, SharedVertex};
 use gfx;
@@ -15,7 +16,6 @@ use image;
 use mint;
 use obj;
 
-use bound::BoundingBox;
 use camera::{Orthographic, Perspective};
 use render::{BackendFactory, BackendResources, GpuData, Vertex, ShadowFormat};
 use scene::{Color, Background, Group, Mesh, Sprite, Material,
@@ -49,6 +49,11 @@ const QUAD: [Vertex; 4] = [
     },
 ];
 
+const EMPTY_AABB3: Aabb3<f32> = Aabb3 {
+    min: Point3 { x:0.0, y: 0.0, z: 0.0 },
+    max: Point3 { x:0.0, y: 0.0, z: 0.0 },
+};
+
 
 impl From<SubNode> for Node {
     fn from(sub: SubNode) -> Self {
@@ -57,8 +62,8 @@ impl From<SubNode> for Node {
             world_visible: false,
             transform: Transform_::one(),
             world_transform: Transform_::one(),
-            bounds: BoundingBox::empty(),
-            world_bounds: BoundingBox::empty(),
+            bounds: EMPTY_AABB3,
+            world_bounds: EMPTY_AABB3,
             parent: None,
             scene_id: None,
             sub_node: sub,

src/lib.rs

@@ -47,7 +47,7 @@ pub use glutin::VirtualKeyCode as Key;
 use std::sync::{mpsc, Arc, Mutex};
 
 use cgmath::Transform as Transform_;
-use bound::BoundingBox;
+use collision::Aabb;
 use factory::SceneId;
 use render::GpuData;
 
@@ -213,11 +213,12 @@ impl Hub {
                 Some(ref parent_ptr) => {
                     let parent = item.look_back(parent_ptr).unwrap();
                     let transform = parent.world_transform.concat(&item.transform);
-                    let bounds = if parent_world_visible {
+                    let bounds = if parent.world_visible {
                         let bounds = item.bounds.transform(&transform);
                         parent.world_bounds = parent.world_bounds.union(&bounds);
+                        bounds
                     } else {
-                        Aabb3::empty()
+                        item.bounds
                     };
                     (parent.world_visible, parent.scene_id, transform, bounds)
                 },