Work towards doing transformations using uniforms

2021-02-25 03:41:19 +01:00
parent 1969aa4f4a
commit 32bfab2e02
14 changed files with 310 additions and 205 deletions
@@ -60,17 +60,14 @@ main = do
                                            (_windowX w,_windowY w) 
                                            (wallsForGloom' w)
                                            (lightsForGloom' w)
-                                            (draw blank w)
+                                            (worldPictures w)
+                      blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
+                      renderTree (_renderData preData) (_cameraRot w) (_cameraZoom w) (_cameraPos w)
+                                            (_windowX w,_windowY w) 
+                                            (picToList 1 $ fixedCoordPictures w)
                      playSoundQueue (_soundData preData) (_soundQueue w)
                      newSoundData <- playAndUpdate (_sounds w) (_soundData preData)
                      return $ preData {_soundData = newSoundData}
-                      --renderPicture' preData (_windowX w,_windowY w) (Circle 5)
--            renderPicture' preData 
--                          (pictures [scale 0.5 0.9 $ polygon [(0,0),(0,-0.5),(-0.5,-0.5),(-0.5,0.0)]
--                                    ,scale 0.5 0.9 $ polygon [(0,0),(0,-0.5),(-0.5,-0.5),(-0.5,0.0)]
--                                    ,color red $ scale 0.0005 0.0005 $ text "asdf"
--                                    ]
--                          )
        )
        (flip $ menuEvents $ flip handleEvent)
        (\w -> Just $ update w)