Rename shaders, remove a dependency on Dodge.Data

src/Dodge/Render.hs

@@ -1,7 +1,6 @@
 module Dodge.Render 
     ( module Dodge.Render.Picture
     , doDrawing
-    , doDrawing'
     )
   where
 import Dodge.Data
@@ -55,6 +54,7 @@ doDrawing pdata w = do
     depthFunc $= Just Always
     renderBackground pdata rot zoom trans wins
     depthFunc $= Just Lequal
+--    depthFunc $= Just Less
     renderWalls pdata wallPointsCol pmat
     setWallDepth pdata wallPoints (viewFromx,viewFromy) pmat
 --    depthFunc $= Just Lequal
@@ -64,53 +64,15 @@ doDrawing pdata w = do
     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)
+    resetShaderUniforms (map extractProgAndUnis $ _pictureShaders pdata)
 ----------------------
     blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
     renderFoldable pdata (picToLTree Nothing $ fixedCoordPictures w)
     eTicks <- SDL.ticks
     return (eTicks - sTicks)
-doDrawing' :: RenderData -> World -> IO (Word32)
-doDrawing' pdata w = do
-    bindFramebuffer Framebuffer $= defaultFramebufferObject
-    sTicks <- SDL.ticks
-    clear [ColorBuffer,DepthBuffer]
-    let 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
-        wallPoints = map fst wallPointsCol
-    pmat <- (newMatrix RowMajor 
-                $ perspectiveMatrix w) :: IO (GLmatrix GLfloat)
-    setCommonUniforms pdata rot zoom trans wins
-
-    depthMask $= Disabled
-    renderBackground pdata rot zoom trans wins
-    depthMask $= Enabled
-    blend $= Enabled
-    blendFunc $= (SrcAlpha, OneMinusSrcAlpha)
-    -- not sure why renderWalls and setWallDepth aren't combined
-    renderWalls pdata wallPointsCol pmat
-    setWallDepth pdata wallPoints (viewFromx,viewFromy) pmat
-    depthFunc $= Just Lequal
-    renderFoldable pdata $ picToLTree (Just 0) pic
-    renderFoldable pdata $ picToLTree (Just 1) pic
-    renderFoldable pdata $ picToLTree (Just 2) pic
-    eTicks <- SDL.ticks
-    return (eTicks - sTicks)
-