From f7dea8e9640ad8cd7b5e2a308f0b888ba1588da6 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Tue, 15 Apr 2014 17:28:38 +0200
Subject: [PATCH] haddock now works as well..

---
 src/Map/Graphics.hs  | 24 +++++++++++++-----------
 src/Render/Render.hs | 28 +++++++++++++++-------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/Map/Graphics.hs b/src/Map/Graphics.hs
index f8562a5..f2e188d 100644
--- a/src/Map/Graphics.hs
+++ b/src/Map/Graphics.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, BangPatterns #-}
-module Map.Graphics 
+module Map.Graphics
 
 (
 mapVertexArrayDescriptor,
@@ -13,7 +13,7 @@ where
 
 import System.Random
 import Data.Array.IArray
-import Data.Text as T 
+import Data.Text as T
 import Prelude as P
 
 --import Graphics.Rendering.OpenGL.GL
@@ -33,8 +33,10 @@ import Linear
 import Map.Types
 import Map.StaticMaps
 
+type Height = Float
+
 type MapEntry = (
-                Float, -- ^ Height
+                Height,
                 TileType
                 )
 
@@ -94,10 +96,10 @@ prettyMap (a:b:c:d:x:y:z:u:v:w:ms) = (a,b,c,d,x,y,z,u,v,w):(prettyMap ms)
 prettyMap _ = []
 
 --generateTriangles :: PlayMap -> [GLfloat]
-generateTriangles :: GraphicsMap -> [GLfloat] 
+generateTriangles :: GraphicsMap -> [GLfloat]
 generateTriangles map' =
                 let ((xl,yl),(xh,yh)) = bounds map' in
-                P.concat [P.concat $ P.map (generateFirstTriLine map' y) [xl .. xh - 2] 
+                P.concat [P.concat $ P.map (generateFirstTriLine map' y) [xl .. xh - 2]
                           ++ P.map (generateSecondTriLine map' (y == yh) y) [xl .. xh - 2]
                          | y <- [yl..yh]]
 
@@ -132,8 +134,8 @@ generateSecondTriLine _ True _ _  = []
 
 
 lookupVertex :: GraphicsMap -> Int -> Int -> [GLfloat]
-lookupVertex map' x y = 
-                let 
+lookupVertex map' x y =
+                let
                         (cr, cg, cb)  = colorLookup map' (x,y)
                         (V3 vx vy vz) = coordLookup (x,y) $ heightLookup map' (x,y)
                         (V3 nx ny nz) = normalLookup map' x y
@@ -157,7 +159,7 @@ normalLookup map' x y = normalize $ normN + normNE + normSE + normS + normSW + n
                       normNW = cross (vNW-vC) (vW -vC)
                       --Vertex Normals
                       vC     = coordLookup (x,y) $ heightLookup map' (x,y)
-                      --TODO: kill guards with eo 
+                      --TODO: kill guards with eo
                       vNW
                         | even x    = coordLookup (x-1,y-1) $ heightLookup map' (x-1,y-1)
                         | otherwise = coordLookup (x-1,y  ) $ heightLookup map' (x-1,y  )
@@ -180,12 +182,12 @@ normalLookup map' x y = normalize $ normN + normNE + normSE + normS + normSW + n
 
 heightLookup :: GraphicsMap -> (Int,Int) -> GLfloat
 heightLookup hs t = if inRange (bounds hs) t then fromRational $ toRational h else 0.0
-                where 
+                where
                         (h,_) = hs ! t
 
 colorLookup :: GraphicsMap -> (Int,Int) -> (GLfloat, GLfloat, GLfloat)
 colorLookup hs t = if inRange (bounds hs) t then c else (0.0, 0.0, 0.0)
-                where 
+                where
                         (_,tp) = hs ! t
                         c = case tp of
                                 Ocean           -> (0.50, 0.50, 1.00)
@@ -256,7 +258,7 @@ testmap2 = do
 
 
 parseTemplate :: [Int] -> Text -> [MapEntry]
-parseTemplate (r:rs) t = 
+parseTemplate (r:rs) t =
         (case T.head t of
                 '~' -> (0, Ocean)
                 'S' -> (0, Beach)
diff --git a/src/Render/Render.hs b/src/Render/Render.hs
index fa2e67c..dd8678a 100644
--- a/src/Render/Render.hs
+++ b/src/Render/Render.hs
@@ -48,18 +48,20 @@ initBuffer varray =
            return bufferObject
 
 initMapShader :: IO (
-                      Program           -- ^ the GLSL-Program
-                      , AttribLocation  -- ^ color
-                      , AttribLocation  -- ^ normal
-                      , AttribLocation  -- ^ vertex
-                      , UniformLocation -- ^ ProjectionMat
-                      , UniformLocation -- ^ ViewMat
-                      , UniformLocation -- ^ ModelMat
-                      , UniformLocation -- ^ NormalMat
-                      , UniformLocation -- ^ TessLevelInner
-                      , UniformLocation -- ^ TessLevelOuter
-                      , TextureObject   -- ^ Texture where to draw into
-                      )
+                      Program           -- the GLSL-Program
+                      , AttribLocation  -- color
+                      , AttribLocation  -- normal
+                      , AttribLocation  -- vertex
+                      , UniformLocation -- ProjectionMat
+                      , UniformLocation -- ViewMat
+                      , UniformLocation -- ModelMat
+                      , UniformLocation -- NormalMat
+                      , UniformLocation -- TessLevelInner
+                      , UniformLocation -- TessLevelOuter
+                      , TextureObject   -- Texture where to draw into
+                      ) -- ^ (the GLSL-Program, color, normal, vertex, ProjectionMat, ViewMat,
+                        --    ModelMat, NormalMat, TessLevelInner, TessLevelOuter,
+                        --    Texture where to draw into)
 initMapShader = do
    ! vertexSource <- B.readFile mapVertexShaderFile
    ! tessControlSource <- B.readFile mapTessControlShaderFile
@@ -138,7 +140,7 @@ initHud = do
    texIndex <- get (uniformLocation program "tex[1]")
    checkError "ui-tex"
 
-   -- | simple triangle over the whole screen.
+   -- simple triangle over the whole screen.
    let vertexBufferData = reverse [-1, -1, 1, -1, -1, 1, 1, 1] :: [GLfloat]
 
    vertexIndex <- get (attribLocation program "position")