Skip to content

Commit f31b59e

Browse files
akhraakhra
committed
General cleanup on examples
1 parent 69ec371 commit f31b59e

24 files changed

+111
-158
lines changed

‎examples/AudioExample.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Control.Monad
77
import Control.Concurrent
88
import Data.Int (Int16)
99
import SDL
10-
import Data.Vector.Storable.Mutable as V
10+
import qualified Data.Vector.Storable.Mutable as V
1111

1212
sinSamples :: [Int16]
1313
sinSamples =
@@ -17,17 +17,17 @@ sinSamples =
1717
in round (fromIntegral (maxBound `div` 2 :: Int16) * sin (t * freq)))
1818
[0 :: Int16 ..]
1919

20-
audioCB :: IORef [Int16] -> AudioFormat sampleType -> IOVector sampleType -> IO ()
20+
audioCB :: IORef [Int16] -> AudioFormat sampleType -> V.IOVector sampleType -> IO ()
2121
audioCB samples format buffer =
2222
case format of
2323
Signed16BitLEAudio ->
2424
do samples' <- readIORef samples
2525
let n = V.length buffer
26-
sequence_ (zipWith (write buffer)
27-
[0 ..]
28-
(Prelude.take n samples'))
26+
zipWithM_ (V.write buffer)
27+
[0 ..]
28+
(take n samples')
2929
writeIORef samples
30-
(Prelude.drop n samples')
30+
(drop n samples')
3131
_ -> error "Unsupported audio format"
3232

3333
main :: IO ()

‎examples/OpenGLExample.hs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ import SDL (($=))
1616
import qualified SDL
1717
import qualified Graphics.Rendering.OpenGL as GL
1818

19-
#if !MIN_VERSION_base(4,8,0)
20-
import Control.Applicative
21-
#endif
22-
2319
screenWidth, screenHeight :: CInt
2420
(screenWidth, screenHeight) = (640, 480)
2521

@@ -38,18 +34,18 @@ main = do
3834
SDL.windowOpenGL = Just SDL.defaultOpenGL}
3935
SDL.showWindow window
4036

41-
_ <- SDL.glCreateContext(window)
37+
_ <- SDL.glCreateContext window
4238
(prog, attrib) <- initResources
4339

4440
let loop = do
4541
events <- SDL.pollEvents
46-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
42+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
4743

4844
GL.clear [GL.ColorBuffer]
4945
draw prog attrib
5046
SDL.glSwapWindow window
5147

52-
unless quit (loop)
48+
unless quit loop
5349

5450
loop
5551

@@ -131,4 +127,3 @@ vertices = V.fromList [ 0.0, 0.8
131127
, -0.8, -0.8
132128
, 0.8, -0.8
133129
]
134-

‎examples/lazyfoo/Lesson03.hs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE CPP #-}
21
{-# LANGUAGE LambdaCase #-}
32
{-# LANGUAGE OverloadedStrings #-}
43

@@ -11,10 +10,6 @@ import qualified SDL
1110

1211
import Paths_sdl2 (getDataFileName)
1312

14-
#if !MIN_VERSION_base(4,8,0)
15-
import Control.Applicative
16-
#endif
17-
1813
screenWidth, screenHeight :: CInt
1914
(screenWidth, screenHeight) = (640, 480)
2015

@@ -30,7 +25,7 @@ main = do
3025
let
3126
loop = do
3227
events <- SDL.pollEvents
33-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
28+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
3429

3530
SDL.surfaceBlit xOut Nothing screenSurface Nothing
3631
SDL.updateWindowSurface window

‎examples/lazyfoo/Lesson04.hs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE LambdaCase #-}
3-
{-# LANGUAGE MultiWayIf #-}
43
{-# LANGUAGE OverloadedStrings #-}
54
{-# LANGUAGE PatternSynonyms #-}
65
module Lazyfoo.Lesson04 (main) where
76

87
import Prelude hiding (any, mapM_)
98
import Control.Monad hiding (mapM_)
10-
import Data.Foldable
9+
import Data.Foldable hiding (elem)
1110
import Data.Maybe
1211
import Data.Monoid
1312
import Foreign.C.Types
@@ -23,7 +22,7 @@ import Control.Applicative
2322
screenWidth, screenHeight :: CInt
2423
(screenWidth, screenHeight) = (640, 480)
2524

26-
loadBMP :: FilePath -> IO (SDL.Surface)
25+
loadBMP :: FilePath -> IO SDL.Surface
2726
loadBMP path = getDataFileName path >>= SDL.loadBMP
2827

2928
main :: IO ()
@@ -42,7 +41,7 @@ main = do
4241
let
4342
loop oldSurface = do
4443
events <- map SDL.eventPayload <$> SDL.pollEvents
45-
let quit = any (== SDL.QuitEvent) events
44+
let quit = SDL.QuitEvent `elem` events
4645

4746
currentSurface =
4847
fromMaybe oldSurface $ getLast $

‎examples/lazyfoo/Lesson05.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ main = do
3434
let
3535
loop = do
3636
events <- SDL.pollEvents
37-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
37+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
3838

3939
SDL.surfaceBlitScaled stretchedSurface Nothing screenSurface Nothing
4040
SDL.updateWindowSurface window

‎examples/lazyfoo/Lesson07.hs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE CPP #-}
21
{-# LANGUAGE OverloadedStrings #-}
32
module Lazyfoo.Lesson07 (main) where
43

@@ -10,10 +9,6 @@ import qualified SDL
109

1110
import Paths_sdl2 (getDataFileName)
1211

13-
#if !MIN_VERSION_base(4,8,0)
14-
import Control.Applicative
15-
#endif
16-
1712
screenWidth, screenHeight :: CInt
1813
(screenWidth, screenHeight) = (640, 480)
1914

@@ -36,10 +31,10 @@ main = do
3631
SDL.createRenderer
3732
window
3833
(-1)
39-
(SDL.RendererConfig
40-
{ SDL.rendererType = SDL.AcceleratedRenderer
41-
, SDL.rendererTargetTexture = False
42-
})
34+
SDL.RendererConfig
35+
{ SDL.rendererType = SDL.AcceleratedRenderer
36+
, SDL.rendererTargetTexture = False
37+
}
4338

4439
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
4540

@@ -50,7 +45,7 @@ main = do
5045
let loop = do
5146
events <- SDL.pollEvents
5247

53-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
48+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
5449

5550
SDL.clear renderer
5651
SDL.copy renderer texture Nothing Nothing

‎examples/lazyfoo/Lesson08.hs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE CPP #-}
21
{-# LANGUAGE OverloadedStrings #-}
32
module Lazyfoo.Lesson08 (main) where
43

@@ -9,10 +8,6 @@ import SDL.Vect
98
import SDL (($=))
109
import qualified SDL
1110

12-
#if !MIN_VERSION_base(4,8,0)
13-
import Control.Applicative
14-
#endif
15-
1611
screenWidth, screenHeight :: CInt
1712
(screenWidth, screenHeight) = (640, 480)
1813

@@ -35,17 +30,17 @@ main = do
3530
SDL.createRenderer
3631
window
3732
(-1)
38-
(SDL.RendererConfig
33+
SDL.RendererConfig
3934
{ SDL.rendererType = SDL.AcceleratedRenderer
4035
, SDL.rendererTargetTexture = False
41-
})
36+
}
4237

4338
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
4439

4540
let loop = do
4641
events <- SDL.pollEvents
4742

48-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
43+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
4944

5045
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
5146
SDL.clear renderer

‎examples/lazyfoo/Lesson09.hs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE CPP #-}
21
{-# LANGUAGE OverloadedStrings #-}
32
module Lazyfoo.Lesson09 (main) where
43

@@ -10,10 +9,6 @@ import qualified SDL
109

1110
import Paths_sdl2 (getDataFileName)
1211

13-
#if !MIN_VERSION_base(4,8,0)
14-
import Control.Applicative
15-
#endif
16-
1712
screenWidth, screenHeight :: CInt
1813
(screenWidth, screenHeight) = (640, 480)
1914

@@ -36,10 +31,10 @@ main = do
3631
SDL.createRenderer
3732
window
3833
(-1)
39-
(SDL.RendererConfig
40-
{ SDL.rendererType = SDL.AcceleratedRenderer
41-
, SDL.rendererTargetTexture = False
42-
})
34+
SDL.RendererConfig
35+
{ SDL.rendererType = SDL.AcceleratedRenderer
36+
, SDL.rendererTargetTexture = False
37+
}
4338

4439
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
4540

@@ -50,7 +45,7 @@ main = do
5045
let loop = do
5146
events <- SDL.pollEvents
5247

53-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
48+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
5449

5550
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
5651
SDL.clear renderer

‎examples/lazyfoo/Lesson10.hs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE CPP #-}
21
{-# LANGUAGE OverloadedStrings #-}
32
module Lazyfoo.Lesson10 (main) where
43

@@ -10,10 +9,6 @@ import qualified SDL
109

1110
import Paths_sdl2 (getDataFileName)
1211

13-
#if !MIN_VERSION_base(4,8,0)
14-
import Control.Applicative
15-
#endif
16-
1712
screenWidth, screenHeight :: CInt
1813
(screenWidth, screenHeight) = (640, 480)
1914

@@ -52,10 +47,10 @@ main = do
5247
SDL.createRenderer
5348
window
5449
(-1)
55-
(SDL.RendererConfig
56-
{ SDL.rendererType = SDL.AcceleratedRenderer
57-
, SDL.rendererTargetTexture = False
58-
})
50+
SDL.RendererConfig
51+
{ SDL.rendererType = SDL.AcceleratedRenderer
52+
, SDL.rendererTargetTexture = False
53+
}
5954

6055
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
6156

@@ -65,7 +60,7 @@ main = do
6560
let loop = do
6661
events <- SDL.pollEvents
6762

68-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
63+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
6964

7065
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
7166
SDL.clear renderer

‎examples/lazyfoo/Lesson11.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ main = do
5353
SDL.createRenderer
5454
window
5555
(-1)
56-
(SDL.RendererConfig
57-
{ SDL.rendererType = SDL.SoftwareRenderer
58-
, SDL.rendererTargetTexture = False
59-
})
56+
SDL.RendererConfig
57+
{ SDL.rendererType = SDL.SoftwareRenderer
58+
, SDL.rendererTargetTexture = False
59+
}
6060

6161
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
6262

@@ -70,7 +70,7 @@ main = do
7070
let loop = do
7171
events <- SDL.pollEvents
7272

73-
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
73+
let quit = elem SDL.QuitEvent $ map SDL.eventPayload events
7474

7575
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
7676
SDL.clear renderer

0 commit comments

Comments
 (0)