Remove lens and linear dependencies from examples

akhra · akhra · commit bce46f374d4b · 2016-09-06T03:22:35.000-07:00
diff --git a/examples/OpenGLExample.hs b/examples/OpenGLExample.hs
@@ -6,7 +6,7 @@ module OpenGLExample where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified Data.ByteString as BS
 import qualified Data.Vector.Storable as V
 import           System.Exit (exitFailure)
diff --git a/examples/lazyfoo/Lesson01.hs b/examples/lazyfoo/Lesson01.hs
@@ -3,7 +3,7 @@ module Lazyfoo.Lesson01 (main) where
 
 import Control.Concurrent (threadDelay)
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified SDL
 
 screenWidth, screenHeight :: CInt
diff --git a/examples/lazyfoo/Lesson02.hs b/examples/lazyfoo/Lesson02.hs
@@ -3,7 +3,7 @@ module Lazyfoo.Lesson02 (main) where
 
 import Control.Concurrent (threadDelay)
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/lazyfoo/Lesson03.hs b/examples/lazyfoo/Lesson03.hs
@@ -6,7 +6,7 @@ module Lazyfoo.Lesson03 (main) where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/lazyfoo/Lesson04.hs b/examples/lazyfoo/Lesson04.hs
@@ -11,7 +11,7 @@ import Data.Foldable
 import Data.Maybe
 import Data.Monoid
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/lazyfoo/Lesson05.hs b/examples/lazyfoo/Lesson05.hs
@@ -4,7 +4,7 @@ module Lazyfoo.Lesson05 (main) where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/lazyfoo/Lesson07.hs b/examples/lazyfoo/Lesson07.hs
@@ -4,7 +4,7 @@ module Lazyfoo.Lesson07 (main) where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson08.hs b/examples/lazyfoo/Lesson08.hs
@@ -5,8 +5,7 @@ module Lazyfoo.Lesson08 (main) where
 import Control.Monad
 import Data.Foldable (for_)
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson09.hs b/examples/lazyfoo/Lesson09.hs
@@ -4,8 +4,7 @@ module Lazyfoo.Lesson09 (main) where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson10.hs b/examples/lazyfoo/Lesson10.hs
@@ -4,8 +4,7 @@ module Lazyfoo.Lesson10 (main) where
 
 import Control.Monad
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson11.hs b/examples/lazyfoo/Lesson11.hs
@@ -2,11 +2,9 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Lazyfoo.Lesson11 (main) where
 
-import Control.Lens.Operators
 import Control.Monad
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
@@ -78,9 +76,9 @@ main = do
         SDL.clear renderer
 
         renderTexture renderer spriteSheetTexture (P (V2 0 0)) (Just clip1)
-        renderTexture renderer spriteSheetTexture (P (V2 (screenWidth - spriteSize ^. _x) 0)) (Just clip2)
-        renderTexture renderer spriteSheetTexture (P (V2 0 (screenHeight - spriteSize ^. _y))) (Just clip3)
-        renderTexture renderer spriteSheetTexture (P (V2 (screenWidth - spriteSize ^. _x) (screenHeight - spriteSize ^. _y))) (Just clip4)
+        renderTexture renderer spriteSheetTexture (P (V2 (screenWidth -) (const 0) <*> spriteSize)) (Just clip2)
+        renderTexture renderer spriteSheetTexture (P (V2 (const 0) (screenHeight -) <*> spriteSize)) (Just clip3)
+        renderTexture renderer spriteSheetTexture (P (V2 (screenWidth -) (screenHeight -) <*> spriteSize)) (Just clip4)
 
         SDL.present renderer
 
diff --git a/examples/lazyfoo/Lesson12.hs b/examples/lazyfoo/Lesson12.hs
@@ -8,8 +8,7 @@ import Control.Monad
 import Data.Monoid
 import Data.Word
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson13.hs b/examples/lazyfoo/Lesson13.hs
@@ -8,8 +8,7 @@ import Control.Monad
 import Data.Monoid
 import Data.Word
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson14.hs b/examples/lazyfoo/Lesson14.hs
@@ -8,8 +8,7 @@ module Lazyfoo.Lesson14 (main) where
 import Control.Monad
 import Data.Monoid
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson15.hs b/examples/lazyfoo/Lesson15.hs
@@ -8,8 +8,7 @@ import Control.Monad
 import Data.Monoid
 import Data.Maybe
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson17.hs b/examples/lazyfoo/Lesson17.hs
@@ -5,14 +5,13 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Lazyfoo.Lesson17 (main) where
 
-import Prelude hiding (foldl1)
+import Prelude hiding (foldl1, and)
 import Control.Monad
 import Data.Foldable
 import Data.Monoid
 import Data.Maybe
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
@@ -59,8 +58,8 @@ buttonSize@(V2 buttonWidth buttonHeight) = V2 300 200
 
 handleEvent :: Point V2 CInt -> SDL.EventPayload -> Button -> Button
 handleEvent mousePos ev (Button buttonPos _) =
-  let inside = foldl1 (&&) ((>=) <$> mousePos <*> buttonPos) &&
-               foldl1 (&&) ((<=) <$> mousePos <*> buttonPos .+^ buttonSize)
+  let inside = and ((>=) <$> mousePos <*> buttonPos) &&
+               and ((<=) <$> mousePos <*> buttonPos + P buttonSize)
       sprite
         | inside = case ev of
                      SDL.MouseButtonEvent e
diff --git a/examples/lazyfoo/Lesson18.hs b/examples/lazyfoo/Lesson18.hs
@@ -10,8 +10,7 @@ import Control.Monad hiding (mapM_)
 import Data.Foldable
 import Data.Maybe
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/lazyfoo/Lesson19.hs b/examples/lazyfoo/Lesson19.hs
@@ -11,8 +11,7 @@ import Data.Int
 import Data.Maybe
 import Data.Monoid
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 import qualified Data.Vector as V
diff --git a/examples/lazyfoo/Lesson20.hs b/examples/lazyfoo/Lesson20.hs
@@ -10,8 +10,7 @@ import Control.Monad hiding (mapM_)
 import Data.Maybe
 import Data.Monoid
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import SDL.Haptic
 import qualified SDL
diff --git a/examples/lazyfoo/Lesson43.hs b/examples/lazyfoo/Lesson43.hs
@@ -10,8 +10,7 @@ import Control.Monad hiding (mapM_)
 import Data.Foldable
 import Data.Maybe
 import Foreign.C.Types
-import Linear
-import Linear.Affine
+import SDL.Vect
 import SDL (($=))
 import qualified SDL
 
diff --git a/examples/twinklebear/Lesson01.hs b/examples/twinklebear/Lesson01.hs
@@ -3,8 +3,7 @@ module TwinkleBear.Lesson01 (main) where
 
 
 import Prelude hiding (init)
-import Linear
-import Linear.Affine ( Point(P) )
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/twinklebear/Lesson02.hs b/examples/twinklebear/Lesson02.hs
@@ -5,8 +5,7 @@ module TwinkleBear.Lesson02 (main) where
 import Prelude hiding (init)
 import Control.Monad
 import Foreign.C.Types
-import Linear
-import Linear.Affine ( Point(P) )
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/twinklebear/Lesson04.hs b/examples/twinklebear/Lesson04.hs
@@ -6,8 +6,7 @@ module TwinkleBear.Lesson04 (main) where
 import Prelude hiding (init)
 import Control.Monad
 import Foreign.C.Types
-import Linear
-import Linear.Affine ( Point(P) )
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/twinklebear/Lesson04a.hs b/examples/twinklebear/Lesson04a.hs
@@ -10,8 +10,7 @@ import Prelude hiding (init)
 import Control.Monad
 import Data.Monoid
 import Foreign.C.Types
-import Linear
-import Linear.Affine ( Point(P) )
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/examples/twinklebear/Lesson05.hs b/examples/twinklebear/Lesson05.hs
@@ -10,8 +10,7 @@ import Control.Applicative
 import Control.Monad
 import Data.Monoid
 import Foreign.C.Types
-import Linear
-import Linear.Affine ( Point(P) )
+import SDL.Vect
 import qualified SDL
 
 import Paths_sdl2 (getDataFileName)
diff --git a/sdl2.cabal b/sdl2.cabal
