start restructuring

pituicat.cabal

@@ -25,7 +25,9 @@ executable pituicat
                      , Types.Graphics
                      , Types.Graphics.VertexArray
                      , Types.Graphics.VertexBuffer
+                     , Types.Util
                      , Classes
+                     , Classes.Scene
                      , Classes.Graphics
                      , Classes.Graphics.Bindable
                      , Classes.Graphics.Buffer
@@ -37,6 +39,7 @@ executable pituicat
                      , State.MainGame.Load
                      , State.MainGame.Update
                      , State.MainGame.Draw
+                     , Scenes.Test
                      , Map
                      , StateMachine
                      , Texture

src/Classes/Scene.hs

@@ -16,7 +16,7 @@ class Scene a where
   initScene :: IO a
 
   -- | Load actual data into the initialized container.
-  loadScene :: a -> TMVar Progress -> IO a
+  loadScene :: a -> TMVar Progress -> IO ()
 
   -- | Query whether loading data is finished.
   isSceneLoaded :: a -> Affection Bool

src/Main.hs

@@ -56,12 +56,6 @@ main = do
 preLoad :: GameData -> Affection ()
 preLoad gd =
   liftIO $ do
-    let projection = ortho 0 800 0 600 (-1) 1 :: M44 GL.GLfloat
-        view = mkTransformationMat (identity :: M33 GL.GLfloat) (V3 0 0 0)
-        model = mkTransformationMat (identity :: M33 GL.GLfloat) (V3 0 0 0)
-
-    -- vertexArrayObject <- GL.genObjectName
-    va <- newVertexArray
     scene <- liftIO $ (initScene :: IO Test)
     atomically $ putTMVar (gameScene gd) (Stage scene)
 

src/Scenes/Test.hs

@@ -3,10 +3,17 @@ module Scenes.Test where
 
 import Affection
 
+import SDL (($=), get)
+import qualified SDL
+
+import qualified Graphics.Rendering.OpenGL as GL
+
 import Control.Concurrent.STM
 
 import Control.Monad (void)
 
+import Linear
+
 -- internal imports
 
 import Types
@@ -30,9 +37,22 @@ instance Scene Test where
     atomically $ putTMVar (testMap level) loadedMap
     void $ atomically $ do
       void $ takeTMVar progress
-      putTMVar progress (1, "Loaded test level!")
+      putTMVar progress (0.5, "Loaded test level map!")
     void $ atomically $ swapTVar (testLoaded level) True
-    return level
+
+    let projection = ortho 0 800 0 600 (-1) 1 :: M44 GL.GLfloat
+        view = mkTransformationMat (identity :: M33 GL.GLfloat) (V3 0 0 0)
+        model = mkTransformationMat (identity :: M33 GL.GLfloat) (V3 0 0 0)
+
+    vertexArrayObject <- GL.genObjectName
+    vertexArray <- newVertexArray
+
+    GL.bindVertexArrayObject $= Just vertexArrayObject
+
+    void $ atomically $ do
+      void $ takeTMVar progress
+      putTMVar progress (1, "Loaded graphics!")
+
 
   isSceneLoaded = liftIO . atomically . readTVar . testLoaded
 

src/State/MainGame/Load.hs

@@ -31,7 +31,8 @@ loadFork
   -> IO ()
 loadFork stage progress = do
   (Stage sceneContainer) <- atomically $ readTMVar stage
-  void . atomically . swapTMVar stage =<< Stage <$> loadScene sceneContainer progress
+  loadScene sceneContainer progress
+  void $ atomically $ swapTMVar stage (Stage sceneContainer)
   -- atomically $ do
   --   _ <- takeTMVar progress
   --   putTMVar progress (0, "Loading test level...")