more state machining

src/Commons.hs

@@ -157,7 +157,7 @@ load _ = do
   --   ) [] ([0..9] :: [Int])
   -- liftIO $ gegl_node_link_many $ map hFlange hs
   -- liftIO $ gegl_node_link (last $ map hFlange hs) hnop
-  loadMenu $ UserData
+  return $ UserData
     { nodeGraph = myMap
     , ship      = Ship
       { sPos = (375, 275)

src/Main.hs

@@ -17,6 +17,7 @@ import Debug.Trace
 
 import Types
 import Commons
+import Transitions
 
 import Menu
 import InGame
@@ -26,13 +27,16 @@ main = withAffection $ AffectionConfig
   { initComponents = All
   , windowTitle    = "Haskelloids"
   , windowConfig   = defaultWindow
-  , preLoop        = transition
+  , preLoop        = pre
   , drawLoop       = draw
   , updateLoop     = update
   , loadState      = load
   , cleanUp        = clean
   }
 
+pre :: Affection UserData ()
+pre = smLoad Menu
+
 update :: Double -> Affection UserData ()
 update sec = do
   -- traceM $ (show $ 1 / sec) ++ " FPS"
@@ -47,10 +51,11 @@ update sec = do
     putAffection pd
       { pixelSize = pixelSize wd -1
       }
-  case state wd of
+  -- case state wd of
-    Menu ->
+  --   Menu ->
-      updateMenu sec
+  --     updateMenu sec
-    _    -> return ()
+  --   _    -> return ()
+  smUpdate (state wd) sec
   evs <- SDL.pollEvents
   mapM_ (\e ->
     case state wd of

src/Transitions.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE MultiParamTypeClasses #-}
+
 module Transitions where
 
 import Affection
@@ -5,17 +7,51 @@ import qualified SDL
 import GEGL
 import BABL
 
-loadMenu :: UserData -> IO UserData
+import qualified Data.Map as M
-loadMenu ud = do
+import Data.Maybe (catMaybes)
-  gegl_node_link (nodeGraph ud M.! KeyMenuOver) (nodeGraph ud M.! KeyFGNop)
+
-  hs <- catMaybes <$> foldM (\acc _ -> do
+import Control.Monad (foldM)
-    px <- randomRIO (0, 800)
+
-    py <- randomRIO (0, 600)
+import System.Random (randomRIO)
-    insertHaskelloid acc Nothing (px, py)
+
-    ) [] ([0..9] :: [Int])
+import Types
-  liftIO $ gegl_node_link_many $ map hFlange hs
+import Commons
-  liftIO $ gegl_node_link (last $ map hFlange hs) (nodeGraph ud M.! KeyHNop)
+
-  return ud
+instance StateMachine State UserData where
-    { haskelloids = hs
+  smLoad Menu = do
-    , fade = FadeIn 1
+    ud <- getAffection
-    }
+    liftIO $ gegl_node_link
+      (nodeGraph ud M.! KeyMenuOver)
+      (nodeGraph ud M.! KeyFGNop)
+    hs <- liftIO $ catMaybes <$> foldM (\acc _ -> do
+      px <- randomRIO (0, 800)
+      py <- randomRIO (0, 600)
+      insertHaskelloid acc Nothing (px, py)
+      ) [] ([0..9] :: [Int])
+    liftIO $ gegl_node_link_many $ map hFlange hs
+    liftIO $ gegl_node_link (last $ map hFlange hs) (nodeGraph ud M.! KeyHNop)
+    putAffection ud
+      { haskelloids = hs
+      , fade = FadeIn 1
+      , state = Menu
+      }
+
+  smUpdate Menu sec = do
+    ud <- getAffection
+    case fade ud of
+      FadeIn ttl -> do
+        liftIO $ gegl_node_set (nodeGraph ud M.! KeyMenuText) $
+          Operation "gegl:text"
+            [ Property "color" $ PropertyColor $ GEGL.RGBA 1 1 1 (1.1 - ttl)
+            ]
+        putAffection ud
+          { fade = if (ttl - sec) > 0 then FadeIn (ttl - sec) else FadeOut 1
+          }
+      FadeOut ttl -> do
+        liftIO $ gegl_node_set (nodeGraph ud M.! KeyMenuText) $
+          Operation "gegl:text"
+            [ Property "color" $ PropertyColor $ GEGL.RGBA 1 1 1 ttl
+            ]
+        putAffection ud
+          { fade = if (ttl - sec) > 0 then FadeOut (ttl - sec) else FadeIn 1
+          }

src/Types.hs

@@ -66,13 +66,13 @@ data State
   | InGame
 
 class StateMachine a us where
-  load   :: a -> Affection us ()
+  smLoad   :: a -> Affection us ()
-  update :: a -> Affection us ()
+  smUpdate :: a -> Double -> Affection us ()
-  draw   :: a -> Affection us ()
+  smDraw   :: a -> Affection us ()
-  clean  :: a -> Affection us ()
+  smClean  :: a -> Affection us ()
 
-instance StateMachine State UserData where
+-- instance StateMachine State UserData where
-  update Menu = return ()
+--   update Menu = return ()
   
 
 data MenuFade