Remove 'linear' package dependency from library

cloudhead · cloudhead · commit 5ffb1218c739 · 2016-07-22T16:00:18.000+02:00
By doing this, we remove the lens dependency too, and a few
dozen other packages. The vector functionality needed (which is
very little) is in SDL.Vect.

There is no reason that a low-level general purpose package such
as SDL incur a lens depndency.
diff --git a/sdl2.cabal b/sdl2.cabal
@@ -61,6 +61,7 @@ library
     SDL.Input.Mouse
     SDL.Power
     SDL.Time
+    SDL.Vect
     SDL.Video
     SDL.Video.OpenGL
     SDL.Video.Renderer
@@ -110,7 +111,6 @@ library
     base >= 4.7 && < 5,
     bytestring >= 0.10.4.0 && < 0.11,
     exceptions >= 0.4 && < 0.9,
-    linear >= 1.10.1.2 && < 1.21,
     StateVar >= 1.1.0.0 && < 1.2,
     text >= 1.1.0.0 && < 1.3,
     transformers >= 0.2 && < 0.6,
@@ -388,7 +388,7 @@ executable twinklebear-lesson-05
 
 executable audio-example
   if flag(examples)
-    build-depends: base >= 4.7 && < 5, lens >= 4.4.0.2 && < 4.15, linear >= 1.10.1.2 && < 1.21, sdl2, vector
+    build-depends: base >= 4.7 && < 5, sdl2, vector
   else
     buildable: False
 
diff --git a/src/SDL.hs b/src/SDL.hs
@@ -23,6 +23,7 @@ module SDL
   , module SDL.Input
   , module SDL.Power
   , module SDL.Time
+  , module SDL.Vect
   , module SDL.Video
 
   -- * Working with State Variables
@@ -45,6 +46,7 @@ import SDL.Init
 import SDL.Input
 import SDL.Power
 import SDL.Time
+import SDL.Vect
 import SDL.Video
 
 {- $gettingStarted
diff --git a/src/SDL/Event.hs b/src/SDL/Event.hs
@@ -80,8 +80,7 @@ import Data.Typeable
 import Foreign
 import Foreign.C
 import GHC.Generics (Generic)
-import Linear
-import Linear.Affine (Point(P))
+import SDL.Vect
 import SDL.Input.Keyboard
 import SDL.Input.Mouse
 import SDL.Internal.Numbered
@@ -170,7 +169,7 @@ data WindowExposedEventData =
 data WindowMovedEventData =
   WindowMovedEventData {windowMovedEventWindow :: Window
                         -- ^ The associated 'Window'.
-                       ,windowMovedEventPosition :: Point V2 Int32
+                       ,windowMovedEventPosition :: V2 Int32
                         -- ^ The new position of the 'Window'.
                        }
   deriving (Eq,Ord,Generic,Show,Typeable)
@@ -290,7 +289,7 @@ data MouseMotionEventData =
                         -- ^ The 'MouseDevice' that was moved.
                        ,mouseMotionEventState :: [MouseButton]
                         -- ^ A collection of 'MouseButton's that are currently held down.
-                       ,mouseMotionEventPos :: Point V2 Int32
+                       ,mouseMotionEventPos :: V2 Int32
                         -- ^ The new position of the mouse.
                        ,mouseMotionEventRelMotion :: V2 Int32
                         -- ^ The relative mouse motion of the mouse.
@@ -309,7 +308,7 @@ data MouseButtonEventData =
                         -- ^ The button that was pressed or released.
                        ,mouseButtonEventClicks :: Word8
                         -- ^ The amount of clicks. 1 for a single-click, 2 for a double-click, etc.
-                       ,mouseButtonEventPos :: Point V2 Int32
+                       ,mouseButtonEventPos :: V2 Int32
                         -- ^ The coordinates of the mouse click.
                        }
   deriving (Eq,Ord,Generic,Show,Typeable)
@@ -429,7 +428,7 @@ data TouchFingerEventData =
                         -- ^ The touch device index.
                        ,touchFingerEventFingerID :: Raw.FingerID
                         -- ^ The finger index.
-                       ,touchFingerEventPos :: Point V2 CFloat
+                       ,touchFingerEventPos :: V2 CFloat
                         -- ^ The location of the touch event, normalized between 0 and 1.
                        ,touchFingerEventRelMotion :: V2 CFloat
                         -- ^ The distance moved, normalized between -1 and 1.
@@ -446,7 +445,7 @@ data MultiGestureEventData =
                          -- ^ The amount that the fingers rotated during this motion.
                         ,multiGestureEventDDist :: CFloat
                          -- ^ The amount that the fingers pinched during this motion.
-                        ,multiGestureEventPos :: Point V2 CFloat
+                        ,multiGestureEventPos :: V2 CFloat
                          -- ^ The normalized center of the gesture.
                         ,multiGestureEventNumFingers :: Word16
                          -- ^ The number of fingers used in this gesture.
@@ -463,7 +462,7 @@ data DollarGestureEventData =
                           -- ^ The number of fingers used to draw the stroke.
                          ,dollarGestureEventError :: CFloat
                           -- ^ The difference between the gesture template and the actual performed gesture (lower errors correspond to closer matches).
-                         ,dollarGestureEventPos :: Point V2 CFloat
+                         ,dollarGestureEventPos :: V2 CFloat
                           -- ^ The normalized center of the gesture.
                          }
   deriving (Eq,Ord,Generic,Show,Typeable)
@@ -514,7 +513,7 @@ convertRaw (Raw.WindowEvent t ts a b c d) =
                       Raw.SDL_WINDOWEVENT_MOVED ->
                         WindowMovedEvent
                           (WindowMovedEventData w'
-                                                (P (V2 c d)))
+                                                ((V2 c d)))
                       Raw.SDL_WINDOWEVENT_RESIZED ->
                         WindowResizedEvent
                           (WindowResizedEventData w'
@@ -583,7 +582,7 @@ convertRaw (Raw.MouseMotionEvent _ ts a b c d e f g) =
                       (MouseMotionEventData w'
                                             (fromNumber b)
                                             buttons
-                                            (P (V2 d e))
+                                            ((V2 d e))
                                             (V2 f g))))
   where mask `test` x =
           if mask .&. x /= 0
@@ -609,7 +608,7 @@ convertRaw (Raw.MouseButtonEvent t ts a b c _ e f g) =
                                             (fromNumber b)
                                             button
                                             e
-                                            (P (V2 f g)))))
+                                            ((V2 f g)))))
 convertRaw (Raw.MouseWheelEvent _ ts a b c d) =
   do w' <- fmap Window (Raw.getWindowFromID a)
      return (Event ts
@@ -649,7 +648,7 @@ convertRaw (Raw.TouchFingerEvent _ ts a b c d e f g) =
                 (TouchFingerEvent
                    (TouchFingerEventData a
                                          b
-                                         (P (V2 c d))
+                                         ((V2 c d))
                                          (V2 e f)
                                          g)))
 convertRaw (Raw.MultiGestureEvent _ ts a b c d e f) =
@@ -658,7 +657,7 @@ convertRaw (Raw.MultiGestureEvent _ ts a b c d e f) =
                    (MultiGestureEventData a
                                           b
                                           c
-                                          (P (V2 d e))
+                                          ((V2 d e))
                                           f)))
 convertRaw (Raw.DollarGestureEvent _ ts a b c d e f) =
   return (Event ts
@@ -667,7 +666,7 @@ convertRaw (Raw.DollarGestureEvent _ ts a b c d e f) =
                                            b
                                            c
                                            d
-                                           (P (V2 e f)))))
+                                           ((V2 e f)))))
 convertRaw (Raw.DropEvent _ ts a) =
   return (Event ts (DropEvent (DropEventData a)))
 convertRaw (Raw.ClipboardUpdateEvent _ ts) =
diff --git a/src/SDL/Input/Joystick.hs b/src/SDL/Input/Joystick.hs
@@ -30,7 +30,7 @@ import Foreign.C.Types
 import Foreign.Marshal.Alloc
 import Foreign.Storable
 import GHC.Generics (Generic)
-import Linear
+import SDL.Vect
 import SDL.Exception
 import SDL.Internal.Types
 import qualified Data.ByteString as BS
diff --git a/src/SDL/Input/Mouse.hs b/src/SDL/Input/Mouse.hs
@@ -52,8 +52,7 @@ import Foreign.Marshal.Alloc
 import Foreign.Ptr
 import Foreign.Storable
 import GHC.Generics (Generic)
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL.Exception
 import SDL.Internal.Numbered
 import SDL.Internal.Types (Window(Window))
@@ -85,7 +84,7 @@ getMouseLocationMode = do
   return $ if relativeMode then RelativeLocation else AbsoluteLocation
 
 -- | Return proper mouse location depending on mouse mode
-getModalMouseLocation :: MonadIO m => m (LocationMode, Point V2 CInt)
+getModalMouseLocation :: MonadIO m => m (LocationMode, V2 CInt)
 getModalMouseLocation = do
   mode <- getMouseLocationMode
   location <- case mode of
@@ -106,7 +105,7 @@ getRelativeMouseMode :: MonadIO m => m Bool
 getRelativeMouseMode = Raw.getRelativeMouseMode
 
 --deprecated
-getMouseLocation :: MonadIO m => m (Point V2 CInt)
+getMouseLocation :: MonadIO m => m (V2 CInt)
 {-# DEPRECATED getMouseLocation "Use getAbsoluteMouseLocation instead, or getModalMouseLocation to match future behavior." #-}
 getMouseLocation = getAbsoluteMouseLocation
 
@@ -139,9 +138,9 @@ data WarpMouseOrigin
   deriving (Data, Eq, Generic, Ord, Show, Typeable)
 
 -- | Move the current location of a mouse pointer. The 'WarpMouseOrigin' specifies the origin for the given warp coordinates.
-warpMouse :: MonadIO m => WarpMouseOrigin -> Point V2 CInt -> m ()
-warpMouse (WarpInWindow (Window w)) (P (V2 x y)) = Raw.warpMouseInWindow w x y
-warpMouse WarpCurrentFocus (P (V2 x y)) = Raw.warpMouseInWindow nullPtr x y
+warpMouse :: MonadIO m => WarpMouseOrigin -> V2 CInt -> m ()
+warpMouse (WarpInWindow (Window w)) ((V2 x y)) = Raw.warpMouseInWindow w x y
+warpMouse WarpCurrentFocus ((V2 x y)) = Raw.warpMouseInWindow nullPtr x y
 
 -- | Get or set whether the cursor is currently visible.
 --
@@ -160,20 +159,20 @@ cursorVisible = makeStateVar getCursorVisible setCursorVisible
   getCursorVisible = (== 1) <$> Raw.showCursor (-1)
 
 -- | Retrieve the current location of the mouse, relative to the currently focused window.
-getAbsoluteMouseLocation :: MonadIO m => m (Point V2 CInt)
+getAbsoluteMouseLocation :: MonadIO m => m (V2 CInt)
 getAbsoluteMouseLocation = liftIO $
   alloca $ \x ->
   alloca $ \y -> do
     _ <- Raw.getMouseState x y -- We don't deal with button states here
-    P <$> (V2 <$> peek x <*> peek y)
+    (V2 <$> peek x <*> peek y)
 
 -- | Retrieve mouse motion
-getRelativeMouseLocation :: MonadIO m => m (Point V2 CInt)
+getRelativeMouseLocation :: MonadIO m => m (V2 CInt)
 getRelativeMouseLocation = liftIO $
   alloca $ \x ->
   alloca $ \y -> do
     _ <- Raw.getRelativeMouseState x y
-    P <$> (V2 <$> peek x <*> peek y)
+    (V2 <$> peek x <*> peek y)
 
 
 -- | Retrieve a mapping of which buttons are currently held down.
@@ -217,9 +216,9 @@ createCursor :: MonadIO m
              => V.Vector Bool -- ^ Whether this part of the cursor is black. Use 'False' for white and 'True' for black.
              -> V.Vector Bool -- ^ Whether or not pixels are visible. Use 'True' for visible and 'False' for transparent.
              -> V2 CInt -- ^ The width and height of the cursor.
-             -> Point V2 CInt -- ^ The X- and Y-axis location of the upper left corner of the cursor relative to the actual mouse position
+             -> V2 CInt -- ^ The X- and Y-axis location of the upper left corner of the cursor relative to the actual mouse position
              -> m Cursor
-createCursor dta msk (V2 w h) (P (V2 hx hy)) =
+createCursor dta msk (V2 w h) ((V2 hx hy)) =
     liftIO . fmap Cursor $
         throwIfNull "SDL.Input.Mouse.createCursor" "SDL_createCursor" $
             V.unsafeWith (V.map (bool 0 1) dta) $ \unsafeDta ->
@@ -237,9 +236,9 @@ freeCursor = Raw.freeCursor . unwrapCursor
 -- See @<https://wiki.libsdl.org/SDL_CreateColorCursor SDL_CreateColorCursor>@ for C documentation.
 createColorCursor :: MonadIO m
                   => Surface
-                  -> Point V2 CInt -- ^ The location of the cursor hot spot
+                  -> V2 CInt -- ^ The location of the cursor hot spot
                   -> m Cursor
-createColorCursor (Surface surfPtr _) (P (V2 hx hy)) =
+createColorCursor (Surface surfPtr _) ((V2 hx hy)) =
     liftIO . fmap Cursor $
         throwIfNull "SDL.Input.Mouse.createColorCursor" "SDL_createColorCursor" $
             Raw.createColorCursor surfPtr hx hy
diff --git a/src/SDL/Vect.hs b/src/SDL/Vect.hs
@@ -0,0 +1,80 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+module SDL.Vect
+    ( V2(..)
+    , V3(..)
+    , V4(..)
+    ) where
+
+-- Copied from the 'linear' package by Edward Kmett.
+
+import           Control.Applicative (liftA2)
+import           Foreign.Storable
+import           Foreign.Ptr (castPtr)
+
+data V2 a = V2 !a !a
+    deriving (Show, Read, Ord, Eq)
+
+data V3 a = V3 !a !a !a
+    deriving (Show, Read, Ord, Eq)
+
+data V4 a = V4 !a !a !a !a
+    deriving (Show, Read, Ord, Eq)
+
+instance Functor V2 where
+  fmap f (V2 a b) = V2 (f a) (f b)
+  {-# INLINE fmap #-}
+  a <$ _ = V2 a a
+  {-# INLINE (<$) #-}
+
+instance Functor V3 where
+  fmap f (V3 a b c) = V3 (f a) (f b) (f c)
+  {-# INLINE fmap #-}
+  a <$ _ = V3 a a a
+  {-# INLINE (<$) #-}
+
+instance Functor V4 where
+  fmap f (V4 a b c d) = V4 (f a) (f b) (f c) (f d)
+  {-# INLINE fmap #-}
+  a <$ _ = V4 a a a a
+  {-# INLINE (<$) #-}
+
+instance Applicative V2 where
+    pure a = V2 a a
+    V2 a b <*> V2 d e = V2 (a d) (b e)
+
+instance Storable a => Storable (V4 a) where
+  sizeOf _ = 4 * sizeOf (undefined::a)
+  {-# INLINE sizeOf #-}
+  alignment _ = alignment (undefined::a)
+  {-# INLINE alignment #-}
+  poke ptr (V4 x y z w) = do poke ptr' x
+                             pokeElemOff ptr' 1 y
+                             pokeElemOff ptr' 2 z
+                             pokeElemOff ptr' 3 w
+    where ptr' = castPtr ptr
+  {-# INLINE poke #-}
+  peek ptr = V4 <$> peek ptr' <*> peekElemOff ptr' 1
+                <*> peekElemOff ptr' 2 <*> peekElemOff ptr' 3
+    where ptr' = castPtr ptr
+  {-# INLINE peek #-}
+
+instance Storable a => Storable (V2 a) where
+  sizeOf _ = 2 * sizeOf (undefined::a)
+  {-# INLINE sizeOf #-}
+  alignment _ = alignment (undefined::a)
+  {-# INLINE alignment #-}
+  poke ptr (V2 x y) = poke ptr' x >> pokeElemOff ptr' 1 y
+    where ptr' = castPtr ptr
+  {-# INLINE poke #-}
+  peek ptr = V2 <$> peek ptr' <*> peekElemOff ptr' 1
+    where ptr' = castPtr ptr
+  {-# INLINE peek #-}
+
+instance Num a => Num (V2 a) where
+    (+) = liftA2 (+)
+    (-) = liftA2 (-)
+    (*) = liftA2 (*)
+    negate = fmap negate
+    abs = fmap abs
+    signum = fmap signum
+    fromInteger = pure . fromInteger
diff --git a/src/SDL/Video.hs b/src/SDL/Video.hs
diff --git a/src/SDL/Video/OpenGL.hs b/src/SDL/Video/OpenGL.hs
diff --git a/src/SDL/Video/Renderer.hs b/src/SDL/Video/Renderer.hs
