From 2fc28adfd108d1de2b8f431c803cf644b067582a Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Fri, 3 Jan 2014 22:31:01 +0100
Subject: [PATCH] Triiiiangleeeeesss!!!! *narf*

---
 src/Main.hs        |  9 ++++-----
 src/Map/Map.hs     |  4 ++--
 src/Render/Misc.hs | 12 +++++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Main.hs b/src/Main.hs
index 7edc193..910cd30 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -104,8 +104,8 @@ main = do
         GL.position (GL.Light 0) GL.$= GL.Vertex4 5 5 10 0
         GL.light    (GL.Light 0) GL.$= GL.Enabled
         GL.lighting   GL.$= GL.Enabled
-        GL.cullFace   GL.$= Just GL.Back
-        GL.depthFunc  GL.$= Just GL.Less
+        GL.cullFace   GL.$= Just GL.FrontAndBack -- Back
+        GL.depthFunc  GL.$= Just GL.Always       -- Less
         GL.clearColor GL.$= GL.Color4 0.05 0.05 0.05 1
         GL.normalize  GL.$= GL.Enabled
         
@@ -407,14 +407,13 @@ draw = do
         map' = stateMap state
         frust = stateFrustum state
     liftIO $ do
-        GL.clearColor GL.$= GL.Color4 0.5 0.2 1 1
         GL.clear [GL.ColorBuffer, GL.DepthBuffer]
-        lookAtUniformMatrix4fv (0.0,0.0,0.0) (15, 15, 30) up frust proj 1
+        lookAtUniformMatrix4fv (0.0,0.0,0.0) (0, 15, 0) up frust proj 1
         GL.bindBuffer GL.ArrayBuffer GL.$= Just map'
         GL.vertexAttribPointer ci GL.$= fgColorIndex
         GL.vertexAttribPointer ni GL.$= fgNormalIndex
         GL.vertexAttribPointer vi GL.$= fgVertexIndex
-        
+
         GL.drawArrays GL.Triangles 0 numVert
 
 getCursorKeyDirections :: GLFW.Window -> IO (Double, Double)
diff --git a/src/Map/Map.hs b/src/Map/Map.hs
index c42d8eb..29a8050 100644
--- a/src/Map/Map.hs
+++ b/src/Map/Map.hs
@@ -69,6 +69,7 @@ getMapBufferObject = do
         map' <- return $ generateTriangles map'
         putStrLn $ P.unlines $ P.map show (prettyMap map')
         len <- return $ fromIntegral $ P.length map' `div` numComponents
+        putStrLn $ P.unwords ["num verts",show len]
         bo <- genObjectName                     -- create a new buffer
         bindBuffer ArrayBuffer $= Just bo       -- bind buffer
         withArray map' $ \buffer ->
@@ -182,7 +183,6 @@ testMapTemplate = T.transpose [
 
 testMapTemplate2 :: [Text]
 testMapTemplate2 = T.transpose [
-                "~~~~~~",
                 "~~~~~~"
                 ]
 
@@ -190,7 +190,7 @@ testmap :: IO PlayMap
 testmap = do
                 g <- getStdGen
                 rawMap <- return $ parseTemplate (randoms g) (T.concat testMapTemplate2)
-                return $ listArray ((0,0),(5,1)) rawMap
+                return $ listArray ((0,0),(5,0)) rawMap
 
 
 parseTemplate :: [Int] -> Text -> [MapEntry]
diff --git a/src/Render/Misc.hs b/src/Render/Misc.hs
index bb425be..0a49437 100644
--- a/src/Render/Misc.hs
+++ b/src/Render/Misc.hs
@@ -75,7 +75,13 @@ lookAtUniformMatrix4fv :: (Double, Double, Double)  --origin
                         -> GLint -> GLsizei -> IO () --rest of GL-call
 lookAtUniformMatrix4fv o c u frust num size = allocaArray 16 $ \projMat ->
                                                 do
-                                                        pokeArray projMat $ (lookAt o c u) >< frust
+                                                        pokeArray projMat $
+                                                                [1,  0,  0,  0,
+                                                                 0,  0,  1,  0.1,
+                                                                 0,  1,  0,  0,
+                                                                 0,  0,  0,  1
+                                                                ]
+                                                                --(lookAt o c u) >< frust
                                                         glUniformMatrix4fv num size 1 projMat
 
 infixl 5 ><
@@ -121,7 +127,7 @@ _ >< _ = error "non-conformat matrix-multiplication"
 
 -- generates 4x4-Projection-Matrix
 lookAt :: (Double, Double, Double) -> (Double, Double, Double) -> (Double, Double, Double) -> [GLfloat]
-lookAt origin eye up = 
+lookAt at eye up = 
         map (fromRational . toRational) [
          xx, yx, zx, 0,
          xy, yy, zy, 0,
@@ -129,7 +135,7 @@ lookAt origin eye up =
          -(x *. eye), -(y *. eye), -(z *. eye), 1
         ]
         where
-                z@(zx,zy,zz) = normal (origin .- eye)
+                z@(zx,zy,zz) = normal (at .- eye)
                 x@(xx,xy,xz) = normal (up *.* z)
                 y@(yx,yy,yz) = z *.* x