Merge branch 'master' into testing

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
@@ -24,6 +24,7 @@ import Sound.Preload
 
 import Control.Concurrent
 import Control.Lens
+import Foreign (Word32)
 
 import Control.Monad (when)
  
@@ -52,18 +53,7 @@ main = do
         (fmap (setWindowSize sizex sizey keyConfig) firstWorld)
         ( \preData w -> do
             startTicks <- SDL.ticks
-            clear [ColorBuffer,DepthBuffer]
-            (lightTicks,timeSpentPoking) <- renderPicture' (_renderData preData) 
-                (_cameraRot w) (_cameraZoom w) 
-                (_cameraCenter w)
-                (_windowX w,_windowY w) 
-                (wallsPointsAndCols w)
-                (wallsWindows w)
-                (lightsForGloom' w)
-                (_cameraViewFrom w)
-                (worldPictures w)
-            blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
-            renderFoldable (_renderData preData) (picToLTree Nothing $ fixedCoordPictures w)
+            doDrawing (_renderData preData) w
             playSoundQueue (_soundData preData) (_soundQueue w)
             newSoundData <- playAndUpdate (_sounds w) (_soundData preData)