Skip to content

Commit 900bc4c

Browse files
author
Purlox
committed
Replaced collectEvents with SDL.pollEvents
The exact same function with the identical implementation is already in the library, so lets use it instead.
1 parent 02a535b commit 900bc4c

File tree

19 files changed

+19
-120
lines changed

19 files changed

+19
-120
lines changed

examples/lazyfoo/Lesson03.hs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@ main = do
2929

3030
let
3131
loop = do
32-
let collectEvents = do
33-
e <- SDL.pollEvent
34-
case e of
35-
Nothing -> return []
36-
Just e' -> (e' :) <$> collectEvents
37-
38-
events <- collectEvents
32+
events <- SDL.pollEvents
3933
let quit = any (\case SDL.QuitEvent -> True
4034
_ -> False) $ map SDL.eventPayload events
4135

examples/lazyfoo/Lesson04.hs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ main = do
4141

4242
let
4343
loop oldSurface = do
44-
let collectEvents = do
45-
e <- SDL.pollEvent
46-
case e of
47-
Nothing -> return []
48-
Just e' -> (e' :) <$> collectEvents
49-
50-
events <- map SDL.eventPayload <$> collectEvents
44+
events <- map SDL.eventPayload <$> SDL.pollEvents
5145
let quit = any (== SDL.QuitEvent) events
5246

5347
currentSurface =

examples/lazyfoo/Lesson05.hs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,7 @@ main = do
3333

3434
let
3535
loop = do
36-
let collectEvents = do
37-
e <- SDL.pollEvent
38-
case e of
39-
Nothing -> return []
40-
Just e' -> (e' :) <$> collectEvents
41-
42-
events <- collectEvents
36+
events <- SDL.pollEvents
4337
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
4438

4539
SDL.surfaceBlitScaled stretchedSurface Nothing screenSurface Nothing

examples/lazyfoo/Lesson07.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ main = do
4848
SDL.freeSurface xOutSurface
4949

5050
let loop = do
51-
let collectEvents = do
52-
e <- SDL.pollEvent
53-
case e of
54-
Nothing -> return []
55-
Just e' -> (e' :) <$> collectEvents
56-
events <- collectEvents
51+
events <- SDL.pollEvents
5752

5853
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
5954

examples/lazyfoo/Lesson08.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ main = do
4444
SDL.rendererDrawColor renderer $= V4 maxBound maxBound maxBound maxBound
4545

4646
let loop = do
47-
let collectEvents = do
48-
e <- SDL.pollEvent
49-
case e of
50-
Nothing -> return []
51-
Just e' -> (e' :) <$> collectEvents
52-
events <- collectEvents
47+
events <- SDL.pollEvents
5348

5449
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
5550

examples/lazyfoo/Lesson09.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ main = do
4949
SDL.freeSurface textureSurface
5050

5151
let loop = do
52-
let collectEvents = do
53-
e <- SDL.pollEvent
54-
case e of
55-
Nothing -> return []
56-
Just e' -> (e' :) <$> collectEvents
57-
events <- collectEvents
52+
events <- SDL.pollEvents
5853

5954
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
6055

examples/lazyfoo/Lesson10.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@ main = do
6464
backgroundTexture <- loadTexture renderer "examples/lazyfoo/background.bmp"
6565

6666
let loop = do
67-
let collectEvents = do
68-
e <- SDL.pollEvent
69-
case e of
70-
Nothing -> return []
71-
Just e' -> (e' :) <$> collectEvents
72-
events <- collectEvents
67+
events <- SDL.pollEvents
7368

7469
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
7570

examples/lazyfoo/Lesson11.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,7 @@ main = do
7070
clip4 = SDL.Rectangle (P (V2 100 100)) spriteSize
7171

7272
let loop = do
73-
let collectEvents = do
74-
e <- SDL.pollEvent
75-
case e of
76-
Nothing -> return []
77-
Just e' -> (e' :) <$> collectEvents
78-
events <- collectEvents
73+
events <- SDL.pollEvents
7974

8075
let quit = any (== SDL.QuitEvent) $ map SDL.eventPayload events
8176

examples/lazyfoo/Lesson12.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,7 @@ main = do
7272
modulatedTexture <- loadTexture renderer "examples/lazyfoo/colors.bmp"
7373

7474
let loop color = do
75-
let collectEvents = do
76-
e <- SDL.pollEvent
77-
case e of
78-
Nothing -> return []
79-
Just e' -> (e' :) <$> collectEvents
80-
events <- collectEvents
75+
events <- SDL.pollEvents
8176

8277
let (Any quit, Sum colorAdjustment) =
8378
foldMap (\case

examples/lazyfoo/Lesson13.hs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ main = do
7878
backgroundTexture <- loadTexture renderer "examples/lazyfoo/fadein.bmp"
7979

8080
let loop alpha = do
81-
let collectEvents = do
82-
e <- SDL.pollEvent
83-
case e of
84-
Nothing -> return []
85-
Just e' -> (e' :) <$> collectEvents
86-
events <- collectEvents
81+
events <- SDL.pollEvents
8782

8883
let (Any quit, Sum alphaAdjustment) =
8984
foldMap (\case

0 commit comments

Comments
 (0)