2 files changed, 18 insertions, 22 deletions

diff --git a/Spear/Collision/Collision.hs b/Spear/Collision/Collision.hs
index 50be0d7..d59cbc2 100644
--- a/Spear/Collision/Collision.hs
+++ b/Spear/Collision/Collision.hs
@@ -1,7 +1,6 @@
 module Spear.Collision.Collision
 (
     Collisionable(..)
-,   collidePlane
 ,   aabbFromSphere
 )
 where
diff --git a/Spear/Collision/Collisioner.hs b/Spear/Collision/Collisioner.hs
index c0194bd..94a0d63 100644
--- a/Spear/Collision/Collisioner.hs
+++ b/Spear/Collision/Collisioner.hs
@@ -1,6 +1,6 @@
 module Spear.Collision.Collisioner

 (

-    Collisioner

+    Collisioner(..)

 ,   CollisionType(..)

 ,   aabbCollisioner

 ,   sphereCollisioner

@@ -11,47 +11,44 @@ where
 

 

 import Spear.Math.Vector3 as Vector

-import qualified Spear.Collision.AABB as Box

-import qualified Spear.Collision.Sphere as Sphere

+import Spear.Collision.AABB as Box

+import Spear.Collision.Sphere as Sphere

 import Spear.Collision.Collision as C

 import Spear.Collision.Types

 

 

 -- | A collisioner component.

--- Wraps collision primitives so that one can collide them without being aware of

--- the underlying type.

 data Collisioner

     -- | An axis-aligned bounding box.

-    = AABB {getBox :: !(Box.AABB)}

+    = AABBCol { getBox :: !AABB }

     -- | A bounding sphere.

-    | Sphere {getSphere :: !(Sphere.Sphere)

-    }

+    | SphereCol { getSphere :: !Sphere }

 

 

 -- | Create a 'Collisioner' from the specified 'AABB'.  

-aabbCollisioner :: Box.AABB -> Collisioner

-aabbCollisioner = AABB

+aabbCollisioner :: AABB -> Collisioner

+aabbCollisioner = AABBCol

 

 

 -- | Create a 'Collisioner' from the specified 'BSphere'.

-sphereCollisioner :: Sphere.Sphere -> Collisioner

-sphereCollisioner = Sphere

+sphereCollisioner :: Sphere -> Collisioner

+sphereCollisioner = SphereCol

 

 

 -- | Create the minimal 'AABB' fully containing the specified collisioners.

-buildAABB :: [Collisioner] -> Box.AABB

-buildAABB cols = Box.aabb $ Spear.Collision.Collisioner.generatePoints cols

+buildAABB :: [Collisioner] -> AABB

+buildAABB cols = aabb $ Spear.Collision.Collisioner.generatePoints cols

 

 

 -- | Create the minimal 'AABB' collisioner fully containing the specified 'BSphere'.

 boxFromSphere :: Sphere.Sphere -> Collisioner

-boxFromSphere = AABB . aabbFromSphere

+boxFromSphere = AABBCol . aabbFromSphere

 

 

 generatePoints :: [Collisioner] -> [Vector3]

 generatePoints = foldr generate []

     where

-        generate (AABB (Box.AABB min max)) acc = p1:p2:p3:p4:p5:p6:p7:p8:acc

+        generate (AABBCol (AABB min max)) acc = p1:p2:p3:p4:p5:p6:p7:p8:acc

             where

                 p1 = vec3 (x min) (y min) (z min)

                 p2 = vec3 (x min) (y min) (z max)

@@ -62,7 +59,7 @@ generatePoints = foldr generate []
                 p7 = vec3 (x max) (y max) (z min)

                 p8 = vec3 (x max) (y max) (z max)

     

-        generate (Sphere (Sphere.Sphere c r)) acc = p1:p2:p3:p4:p5:p6:acc

+        generate (SphereCol (Sphere c r)) acc = p1:p2:p3:p4:p5:p6:acc

             where

                 p1 = c + unitX * (vec3 r r r)

                 p2 = c - unitX * (vec3 r r r)

@@ -74,7 +71,7 @@ generatePoints = foldr generate []
 

 -- | Collide the given collisioners.

 collide :: Collisioner -> Collisioner -> CollisionType

-collide (AABB box1) (AABB box2)    = collideBox    box1 box2

-collide (Sphere s1) (Sphere s2)    = collideSphere s1 s2

-collide (AABB box) (Sphere sphere) = collideBox    box sphere

-collide (Sphere sphere) (AABB box) = collideSphere sphere box

+collide (AABBCol box1) (AABBCol box2)    = collideBox    box1 box2

+collide (SphereCol s1) (SphereCol s2)    = collideSphere s1 s2

+collide (AABBCol box) (SphereCol sphere) = collideBox    box sphere

+collide (SphereCol sphere) (AABBCol box) = collideSphere sphere box