From c2dc6e28f169c3144fb9b5cebe338b5fa08566a5 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Tue, 20 May 2014 11:01:37 +0200
Subject: [PATCH] cleaned up

---
 src/Render/Render.hs | 66 +++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 47 deletions(-)

diff --git a/src/Render/Render.hs b/src/Render/Render.hs
index 58bccc8..31e1008 100644
--- a/src/Render/Render.hs
+++ b/src/Render/Render.hs
@@ -368,6 +368,17 @@ render = do
         projmo = shdrMOProjMatIndex dmo
         nmatmo = shdrMONormalMatIndex dmo
         vmatmo = shdrMOViewMatIndex dmo
+        suncam = getCam camPos 1 0.7 0 --TODO: Fix position of sun
+        sunnormal' = (case L.inv33 (fmap (^. L._xyz) suncam ^. L._xyz) of
+                                         (Just a) -> a
+                                         Nothing  -> L.eye3) :: L.M33 CFloat
+        sunnmap = collect id sunnormal' :: L.M33 CFloat --transpose...
+        cam' = getCam camPos zDist' xa ya
+        normal' = (case L.inv33 (fmap (^. L._xyz) cam' ^. L._xyz) of
+                                         (Just a) -> a
+                                         Nothing  -> L.eye3) :: L.M33 CFloat
+        nmap = collect id normal' :: L.M33 CFloat --transpose...
+
     liftIO $ do
 
         bindFramebuffer Framebuffer $= (state ^. gl.glFramebuffer)
@@ -399,20 +410,11 @@ render = do
         --set up projection (= copy from state)
         --TODO: Fix width/depth
         mat44ToGPU (createFrustumOrtho 20 20 0 100) proj "shadowmap-projection"
-
         --set up camera
-        --TODO: Fix magic constants... and camPos
-        let ! cam = getCam camPos 1 0.7 0
-        mat44ToGPU cam vmat "shadowmap-cam"
-
+        mat44ToGPU suncam vmat "shadowmap-cam"
         --set up normal--Mat transpose((model*camera)^-1)
-        --needed?
-        let normal' = (case L.inv33 (fmap (^. L._xyz) cam ^. L._xyz) of
-                                             (Just a) -> a
-                                             Nothing  -> L.eye3) :: L.M33 CFloat
-            nmap = collect id normal' :: L.M33 CFloat --transpose...
-
-        mat33ToGPU nmap nmat "nmat"
+        --TODO: needed?
+        mat33ToGPU sunnmap nmat "nmat"
 
     drawMap
 
@@ -427,17 +429,11 @@ render = do
 
         --set up camera
         --TODO: Fix magic constants... and camPos
-        let ! cam = getCam camPos 1 0.7 0
-        mat44ToGPU cam vmatmo "shadowmap-camera"
+        mat44ToGPU suncam vmatmo "shadowmap-camera"
 
         --set up normal--Mat transpose((model*camera)^-1)
         --needed?
-        let normal' = (case L.inv33 (fmap (^. L._xyz) cam ^. L._xyz) of
-                                             (Just a) -> a
-                                             Nothing  -> L.eye3) :: L.M33 CFloat
-            nmap = collect id normal' :: L.M33 CFloat --transpose...
-
-        mat33ToGPU nmap nmatmo "nmat"
+        mat33ToGPU sunnmap nmatmo "nmat"
 
         mapM_ renderObject (state ^. gl.glMap.mapObjects)
         checkError "draw mapobjects"
@@ -461,41 +457,25 @@ render = do
         clear [ColorBuffer, DepthBuffer]
         checkError "clear buffer"
 
-
         currentProgram $= Just (state ^. gl.glMap.mapProgram)
-
         checkError "setting up buffer"
         --set up projection (= copy from state)
         mat44ToGPU frust proj "projection"
-
         --set up camera
-        let ! cam = getCam camPos zDist' xa ya
-        mat44ToGPU cam vmat "camera"
-
+        mat44ToGPU cam' vmat "camera"
         --set up normal--Mat transpose((model*camera)^-1)
-        let normal' = (case L.inv33 (fmap (^. L._xyz) cam ^. L._xyz) of
-                                             (Just a) -> a
-                                             Nothing  -> L.eye3) :: L.M33 CFloat
-            nmap = collect id normal' :: L.M33 CFloat --transpose...
-
         mat33ToGPU nmap nmat "nmat"
 
-    drawMap --draw map -> put to another function for readability
+    drawMap
     liftIO $ do
         ---- RENDER MAPOBJECTS --------------------------------------------
         currentProgram $= Just (state ^. gl.glMap.objectProgram)
         checkError "setting up shadowmap-program"
-
         --set up projection (= copy from state)
         mat44ToGPU frust projmo "mapObjects-projection"
         --set up camera
-        let ! cam = getCam camPos zDist' xa ya
-        mat44ToGPU cam vmatmo "mapObjects-cam"
+        mat44ToGPU cam' vmatmo "mapObjects-cam"
         --set up normal
-        let normal' = (case L.inv33 (fmap (^. L._xyz) cam ^. L._xyz) of
-                                             (Just a) -> a
-                                             Nothing  -> L.eye3) :: L.M33 CFloat
-            nmap = collect id normal' :: L.M33 CFloat --transpose...
         mat33ToGPU nmap nmatmo "mapObjects-nmat"
 
         mapM_ renderObject (state ^. gl.glMap.mapObjects)
@@ -529,11 +509,3 @@ render = do
         bindBuffer ElementArrayBuffer $= Just (hud ^. hudEBO)
         drawElements TriangleStrip 4 UnsignedInt offset0
 
-
-        {-let winRenderer = env ^. renderer
-        tryWithTexture
-                (state ^. hudTexture)                          --maybe tex
-                (\tex -> renderCopy winRenderer tex Nothing Nothing) --function with "hole"
-                                                       --Nothing == whole source-tex, whole dest-tex
-                (return ())                                       --fail-case-}
-