3 files changed, 34 insertions, 30 deletions

diff --git a/Spear/Math/Vector/Vector2.hs b/Spear/Math/Vector/Vector2.hs
index 0b29ec4..dfb4fb9 100644
--- a/Spear/Math/Vector/Vector2.hs
+++ b/Spear/Math/Vector/Vector2.hs
@@ -1,6 +1,9 @@
 module Spear.Math.Vector.Vector2

 (

-    Vector2

+    Vector2(..)

+,   Right2

+,   Up2

+,   Position2

     -- * Construction

 ,   unitx2

 ,   unity2

@@ -11,13 +14,14 @@ module Spear.Math.Vector.Vector2
 )

 where

 

-

 import Spear.Math.Vector.Class

 

-

 import Foreign.C.Types (CFloat)

 import Foreign.Storable

 

+type Right2 = Vector2

+type Up2 = Vector2

+type Position2 = Vector2

 

 -- | Represents a vector in 2D.

 data Vector2 = Vector2 {-# UNPACK #-} !Float {-# UNPACK #-} !Float deriving (Eq, Show)

@@ -30,13 +34,13 @@ instance Num Vector2 where
     abs (Vector2 ax ay) = Vector2 (abs ax) (abs ay)

     signum (Vector2 ax ay) = Vector2 (signum ax) (signum ay)

     fromInteger i = Vector2 i' i' where i' = fromInteger i

-    

-    

+

+

 instance Fractional Vector2 where

     Vector2 ax ay / Vector2 bx by = Vector2 (ax / bx) (ay / by)

     fromRational r = Vector2 r' r' where r' = fromRational r

-    

-    

+

+

 instance Ord Vector2 where

     Vector2 ax ay <= Vector2 bx by =  (ax <= bx) || (ax == bx && ay <= by)

     Vector2 ax ay >= Vector2 bx by =  (ax >= bx) || (ax == bx && ay >= by)

@@ -89,18 +93,18 @@ sizeFloat = sizeOf (undefined :: CFloat)
 instance Storable Vector2 where

     sizeOf _    = 2*sizeFloat

     alignment _ = alignment (undefined :: CFloat)

-    

+

     peek ptr = do

         ax <- peekByteOff ptr 0

         ay <- peekByteOff ptr $ sizeFloat

         return (Vector2 ax ay)

-    

+

     poke ptr (Vector2 ax ay) = do

         pokeByteOff ptr 0 ax

         pokeByteOff ptr sizeFloat ay

 

 

--- | Get the vector's x coordinate.    

+-- | Get the vector's x coordinate.

 

 

 

@@ -122,9 +126,9 @@ vec2 ax ay = Vector2 ax ay
 

 

 -- | Compute a vector perpendicular to the given one, satisfying:

--- 

+--

 -- perp (Vector2 0 1) = Vector2 1 0

--- 

+--

 -- perp (Vector2 1 0) = Vector2 0 (-1)

 perp :: Vector2 -> Vector2

 perp (Vector2 x y) = Vector2 y (-x)

diff --git a/Spear/Math/Vector/Vector3.hs b/Spear/Math/Vector/Vector3.hs
index 70bd299..429df0f 100644
--- a/Spear/Math/Vector/Vector3.hs
+++ b/Spear/Math/Vector/Vector3.hs
@@ -1,6 +1,6 @@
 module Spear.Math.Vector.Vector3

 (

-    Vector3

+    Vector3(..)

 ,   Right3

 ,   Up3

 ,   Forward3

diff --git a/Spear/Math/Vector/Vector4.hs b/Spear/Math/Vector/Vector4.hs
index 3b5ed95..4314b51 100644
--- a/Spear/Math/Vector/Vector4.hs
+++ b/Spear/Math/Vector/Vector4.hs
@@ -1,6 +1,6 @@
 module Spear.Math.Vector.Vector4

 (

-    Vector4

+    Vector4(..)

     -- * Construction

 ,   unitx4

 ,   unity4

@@ -34,32 +34,32 @@ instance Num Vector4 where
     abs (Vector4 ax ay az aw) = Vector4 (abs ax) (abs ay) (abs az) (abs aw)

     signum (Vector4 ax ay az aw) = Vector4 (signum ax) (signum ay) (signum az) (signum aw)

     fromInteger i = Vector4 i' i' i' i' where i' = fromInteger i

-    

-    

+

+

 instance Fractional Vector4 where

     Vector4 ax ay az aw / Vector4 bx by bz bw = Vector4 (ax / bx) (ay / by) (az / bz) (aw / bw)

     fromRational r = Vector4 r' r' r' r' where r' = fromRational r

-    

-    

+

+

 instance Ord Vector4 where

     Vector4 ax ay az aw <= Vector4 bx by bz bw

         =  (ax <= bx)

         || (az == bx && ay <= by)

         || (ax == bx && ay == by && az <= bz)

         || (ax == bx && ay == by && az == bz && aw <= bw)

-    

+

     Vector4 ax ay az aw >= Vector4 bx by bz bw

         =  (ax >= bx)

         || (ax == bx && ay >= by)

         || (ax == bx && ay == by && az >= bz)

         || (ax == bx && ay == by && az == bz && aw >= bw)

-    

+

     Vector4 ax ay az aw < Vector4 bx by bz bw

         =  (ax < bx)

         || (az == bx && ay < by)

         || (ax == bx && ay == by && az < bz)

         || (ax == bx && ay == by && az == bz && aw < bw)

-    

+

     Vector4 ax ay az aw > Vector4 bx by bz bw

         =  (ax > bx)

         || (ax == bx && ay > by)

@@ -88,29 +88,29 @@ instance VectorClass Vector4 where
 

          {-# INLINABLE w #-}

          w (Vector4 _  _  _  aw) = aw

-         

+

          {-# INLINABLE (!) #-}

          (Vector4 ax _ _ _) ! 0 = ax

          (Vector4 _ ay _ _) ! 1 = ay

          (Vector4 _ _ az _) ! 2 = az

          (Vector4 _ _ _ aw) ! 3 = aw

          _                  ! _ = 0

-         

+

          {-# INLINABLE dot #-}

          Vector4 ax ay az aw `dot` Vector4 bx by bz bw = ax*bx + ay*by + az*bz + aw*bw

-         

+

          {-# INLINABLE normSq #-}

          normSq (Vector4 ax ay az aw) = ax*ax + ay*ay + az*az + aw*aw

-         

+

          {-# INLINABLE norm #-}

          norm = sqrt . normSq

-         

+

          {-# INLINABLE scale #-}

          scale s (Vector4 ax ay az aw) = Vector4 (s*ax) (s*ay) (s*az) (s*aw)

-         

+

          {-# INLINABLE neg #-}

          neg (Vector4 ax ay az aw) = Vector4 (-ax) (-ay) (-az) (-aw)

-         

+

          {-# INLINABLE normalise #-}

          normalise v =

                    let n' = norm v

@@ -124,14 +124,14 @@ sizeFloat = sizeOf (undefined :: CFloat)
 instance Storable Vector4 where

     sizeOf _    = 4*sizeFloat

     alignment _ = alignment (undefined :: CFloat)

-    

+

     peek ptr = do

         ax <- peekByteOff ptr 0

         ay <- peekByteOff ptr $ 1 * sizeFloat

         az <- peekByteOff ptr $ 2 * sizeFloat

         aw <- peekByteOff ptr $ 3 * sizeFloat

         return (Vector4 ax ay az aw)

-        

+

     poke ptr (Vector4 ax ay az aw) = do

         pokeByteOff ptr 0 ax

         pokeByteOff ptr (1 * sizeFloat) ay