Simplify Game monad.

1 files changed, 9 insertions, 9 deletions

diff --git a/Demos/Pong/Main.hs b/Demos/Pong/Main.hs
index de8e6f2..df90020 100644
--- a/Demos/Pong/Main.hs
+++ b/Demos/Pong/Main.hs
@@ -41,16 +41,16 @@ initGame window = do
 
 endGame :: Game GameState ()
 endGame = do
-  game <- getGameState
+  game <- get
   runSubGame' (deleteImmRenderer $ immRenderState game) (renderCoreState game)
 
 
 step :: Elapsed -> Dt -> [InputEvent] -> Game GameState Bool
 step elapsed dt inputEvents = do
-  gs <- getGameState
+  gs <- get
   events <- processInput (window gs)
-  --when (events /= []) $ gameIO . putStrLn $ show events
-  modifyGameState $ \gs ->
+  --when (events /= []) $ liftIO . putStrLn $ show events
+  modify $ \gs ->
     gs
       { world = stepWorld (realToFrac elapsed) (realToFrac dt) events (world gs)
       }
@@ -67,18 +67,18 @@ exitRequested = elem (KeyDown KEY_ESC)
 
 render :: Game GameState ()
 render = do
-  gameState <- getGameState
+  gameState <- get
   immRenderState' <- flip execSubGame (immRenderState gameState) $ do
     immStart
     immSetViewProjectionMatrix (viewProjection gameState)
     -- Clear the background to a different colour than the playable area to make
     -- the latter distinguishable.
-    gameIO $ do
+    liftIO $ do
       setClearColour (0.2, 0.2, 0.2, 0.0)
       clearBuffers [ColourBuffer]
     render' $ world gameState
     immEnd
-  saveGameState $ gameState { immRenderState = immRenderState' }
+  put $ gameState { immRenderState = immRenderState' }
 
 render' :: [GameObject] -> Game ImmRenderState ()
 render' world = do
@@ -122,7 +122,7 @@ resize (ResizeEvent w h) =
       bottom = if r > 1 then 0 else -pad
       top    = if r > 1 then 1 else 1 + pad
   in do
-    gameIO $ setViewport 0 0 w h
-    modifyGameState $ \state -> state {
+    liftIO $ setViewport 0 0 w h
+    modify $ \state -> state {
       viewProjection = Matrix4.ortho left right bottom top (-1) 1
     }