Reorganise rendering in Dodge

app/Main.hs

@@ -10,7 +10,7 @@ import Dodge.Layout
 import Dodge.LoadSound
 import Dodge.Update
 import Dodge.Event
-import Dodge.Rendering
+import Dodge.Render
 import Dodge.Menu
 import Dodge.Floor
 import Dodge.LoadConfig
@@ -53,7 +53,7 @@ main = do
         (fmap (setWindowSize sizex sizey keyConfig) firstWorld)
         ( \preData w -> do
             startTicks <- SDL.ticks
-            doTheRender preData w
+            doDrawing (_renderData preData) w
             playSoundQueue (_soundData preData) (_soundQueue w)
             newSoundData <- playAndUpdate (_sounds w) (_soundData preData)
 
@@ -81,63 +81,3 @@ setWindowSize :: Int -> Int -> KeyConfigSDL-> World -> World
 setWindowSize x y z w = w & windowX .~ fromIntegral x
                         & windowY .~ fromIntegral y
                         & keyConfig .~ z
-doTheRender :: PreloadData a -> World -> IO (Word32)
-doTheRender preData w = do
-    sTicks <- SDL.ticks
-    clear [ColorBuffer,DepthBuffer]
-    let pdata   = _renderData preData
-        rot     = _cameraRot w
-        zoom    = _cameraZoom w
-        trans@(tranx,trany) = _cameraCenter w
-        wins@(winx,winy)    = (_windowX w,_windowY w)
-        wallPointsCol   = wallsPointsAndCols w
-        windowPoints    = wallsWindows w
-        lightPoints     = lightsForGloom' w
-        viewFroms@(viewFromx,viewFromy) = _cameraViewFrom w
-        pic = worldPictures w
-    let wallPoints = map fst wallPointsCol
-
-    setCommonUniforms pdata rot zoom trans wins
-
-    depthFunc $= Just Less
-
-    pmat <- (newMatrix RowMajor 
-                $ perspectiveMatrix rot zoom (tranx,trany) (winx,winy) (viewFromx,viewFromy)
-            ) :: IO (GLmatrix GLfloat)
-
-    createLightMap pdata rot zoom trans wins wallPoints lightPoints viewFroms pmat
-
-    blendFuncSeparate    $= ((SrcAlphaSaturate, OneMinusSrcAlpha), (Zero,One))
-    clear [DepthBuffer]
-
-    renderBackground pdata rot zoom trans wins
-
-    renderWalls pdata wallPointsCol pmat
-
-    setWallDepth pdata wallPoints (viewFromx,viewFromy) pmat
-
-    depthFunc $= Just Lequal
-
-    renderFoldable pdata $ picToLTree (Just 0) pic
-
--- reset blend so that light map doesn't apply
---    blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
-    blendFuncSeparate $= ((SrcAlpha,OneMinusSrcAlpha) , (Zero,One))
---    blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
-    renderFoldable pdata $ picToLTree (Just 1) pic
-
--- set drawing for on top
-    blendFuncSeparate    $= ((SrcAlphaSaturate, OneMinusSrcAlpha), (Zero,One))
-
-    renderFoldable pdata $ picToLTree (Just 2) pic
-
-    depthMask $= Disabled
-    renderWalls pdata windowPoints pmat
-    depthMask $= Enabled
-
-    resetShaderUniforms (map extractProgAndUnis $ _listShaders pdata)
-----------------------
-    blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
-    renderFoldable (_renderData preData) (picToLTree Nothing $ fixedCoordPictures w)
-    eTicks <- SDL.ticks
-    return (eTicks - sTicks)