4 files changed, 22 insertions, 30 deletions

diff --git a/Spear/Math/Vector/Class.hs b/Spear/Math/Vector/Vector.hs
index 19ddfac..35b04e2 100644
--- a/Spear/Math/Vector/Class.hs
+++ b/Spear/Math/Vector/Vector.hs
@@ -1,10 +1,10 @@
-module Spear.Math.Vector.Class

+module Spear.Math.Vector.Vector

 where

 

-class (Fractional a, Ord a) => VectorClass a where

+class (Fractional a, Ord a) => Vector a where

       -- | Create a vector from the given list.

       fromList :: [Float] -> a

-      

+

       -- | Return the vector's x coordinate.

       x :: a -> Float

       x _ = 0

@@ -23,21 +23,21 @@ class (Fractional a, Ord a) => VectorClass a where
 

       -- | Return the vector's ith coordinate.

       (!) :: a -> Int -> Float

-      

+

       -- | Compute the given vectors' dot product.

       dot :: a -> a -> Float

-      

+

       -- | Compute the given vector's squared norm.

       normSq :: a -> Float

-      

+

       -- | Compute the given vector's norm.

       norm :: a -> Float

-      

+

       -- | Multiply the given vector with the given scalar.

       scale :: Float -> a -> a

-      

+

       -- | Negate the given vector.

       neg :: a -> a

-      

+

       -- | Normalise the given vector.

-      normalise :: a -> a
\ No newline at end of file
+      normalise :: a -> a

diff --git a/Spear/Math/Vector/Vector2.hs b/Spear/Math/Vector/Vector2.hs
index dfb4fb9..5bbb632 100644
--- a/Spear/Math/Vector/Vector2.hs
+++ b/Spear/Math/Vector/Vector2.hs
@@ -14,10 +14,10 @@ module Spear.Math.Vector.Vector2
 )

 where

 

-import Spear.Math.Vector.Class

+import           Spear.Math.Vector.Vector

 

-import Foreign.C.Types (CFloat)

-import Foreign.Storable

+import           Foreign.C.Types          (CFloat)

+import           Foreign.Storable

 

 type Right2 = Vector2

 type Up2 = Vector2

@@ -50,7 +50,7 @@ instance Ord Vector2 where
     min (Vector2 ax ay) (Vector2 bx by) = Vector2 (Prelude.min ax bx) (Prelude.min ay by)

 

 

-instance VectorClass Vector2 where

+instance Vector Vector2 where

          {-# INLINABLE fromList #-}

          fromList (ax:ay:_) = Vector2 ax ay

 

@@ -104,27 +104,19 @@ instance Storable Vector2 where
         pokeByteOff ptr sizeFloat ay

 

 

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

-

-

-

 -- | Unit vector along the X axis.

 unitx2 = Vector2 1 0

 

-

 -- | Unit vector along the Y axis.

 unity2 = Vector2 0 1

 

-

 -- | Zero vector.

 zero2 = Vector2 0 0

 

-

 -- | Create a vector from the given values.

 vec2 :: Float -> Float -> Vector2

 vec2 ax ay = Vector2 ax ay

 

-

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

 --

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

diff --git a/Spear/Math/Vector/Vector3.hs b/Spear/Math/Vector/Vector3.hs
index 429df0f..82deba2 100644
--- a/Spear/Math/Vector/Vector3.hs
+++ b/Spear/Math/Vector/Vector3.hs
@@ -18,10 +18,10 @@ module Spear.Math.Vector.Vector3
 where

 

 

-import Spear.Math.Vector.Class

+import           Spear.Math.Vector.Vector

 

-import Foreign.C.Types (CFloat)

-import Foreign.Storable

+import           Foreign.C.Types          (CFloat)

+import           Foreign.Storable

 

 type Right3 = Vector3

 type Up3 = Vector3

@@ -76,7 +76,7 @@ instance Ord Vector3 where
     min (Vector3 ax ay az) (Vector3 bx by bz) = Vector3 (Prelude.min ax bx) (Prelude.min ay by) (Prelude.min az bz)

 

 

-instance VectorClass Vector3 where

+instance Vector Vector3 where

          {-# INLINABLE fromList #-}

          fromList (ax:ay:az:_) = Vector3 ax ay az

 

diff --git a/Spear/Math/Vector/Vector4.hs b/Spear/Math/Vector/Vector4.hs
index 4314b51..325eefc 100644
--- a/Spear/Math/Vector/Vector4.hs
+++ b/Spear/Math/Vector/Vector4.hs
@@ -12,10 +12,10 @@ module Spear.Math.Vector.Vector4
 where

 

 

-import Spear.Math.Vector.Class

+import           Spear.Math.Vector.Vector

 

-import Foreign.C.Types (CFloat)

-import Foreign.Storable

+import           Foreign.C.Types          (CFloat)

+import           Foreign.Storable

 

 

 -- | Represents a vector in 3D.

@@ -73,7 +73,7 @@ instance Ord Vector4 where
         Vector4 (Prelude.max ax bx) (Prelude.max ay by) (Prelude.max az bz) (Prelude.min aw bw)

 

 

-instance VectorClass Vector4 where

+instance Vector Vector4 where

          {-# INLINABLE fromList #-}

          fromList (ax:ay:az:aw:_) = Vector4 ax ay az aw