From 6986d06545670b5bef91382a703758ce24131493 Mon Sep 17 00:00:00 2001 From: Marc Sunet Date: Tue, 28 Aug 2012 22:08:32 +0200 Subject: Fixed comments --- Spear/Collision/Collision.hs | 3 +-- Spear/Collision/Collisioner.hs | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Spear/Collision/Collision.hs b/Spear/Collision/Collision.hs index 3a4c614..60c2f03 100644 --- a/Spear/Collision/Collision.hs +++ b/Spear/Collision/Collision.hs @@ -57,7 +57,6 @@ instance Collisionable Circle where distance_centers = normSq $ c1 - c2 sum_radii = (r1 + r2)^2 sub_radii = (r1 - r2)^2 - aabbPoints :: AABB -> [Vector2] @@ -73,7 +72,7 @@ aabbPoints (AABB min max) = [p1,p2,p3,p4,p5,p6,p7,p8] p8 = vec2 (x max) (y max) --- | Create the minimal AABB fully containing the specified Sphere. +-- | Create the minimal box fully containing the specified circle. aabbFromCircle :: Circle -> AABB aabbFromCircle (Circle c r) = AABB bot top where diff --git a/Spear/Collision/Collisioner.hs b/Spear/Collision/Collisioner.hs index af6fee5..19114e6 100644 --- a/Spear/Collision/Collisioner.hs +++ b/Spear/Collision/Collisioner.hs @@ -25,12 +25,12 @@ data Collisioner | CircleCol { getSphere :: !Circle } --- | Create a 'Collisioner' from the specified 'AABB'. +-- | Create a 'Collisioner' from the specified box. aabbCollisioner :: AABB -> Collisioner aabbCollisioner = AABBCol --- | Create a 'Collisioner' from the specified 'BSphere'. +-- | Create a 'Collisioner' from the specified circle. sphereCollisioner :: Circle -> Collisioner sphereCollisioner = CircleCol @@ -40,7 +40,7 @@ buildAABB :: [Collisioner] -> AABB buildAABB cols = aabb $ generatePoints cols --- | Create the minimal 'AABB' collisioner fully containing the specified 'BSphere'. +-- | Create the minimal 'AABB' collisioner fully containing the specified circle. boxFromSphere :: Circle -> Collisioner boxFromSphere = AABBCol . aabbFromCircle -- cgit v1.2.3