From 42e7bd65ac033e9107ce7e2f627eabc1a6eef177 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Sat, 4 Jan 2014 03:10:06 +0100
Subject: [PATCH] new projection

---
 Pioneers.cabal |  3 ++-
 src/Main.hs    | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Pioneers.cabal b/Pioneers.cabal
index 1c96d4f..af29ed0 100644
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@@ -25,5 +25,6 @@ executable Pioneers
                    pretty >=1.1,
                    transformers >=0.3.0 && <0.4,
                    mtl >=2.1.2,
-                   stm >=2.4.2
+                   stm >=2.4.2,
+                   vector >=0.10.9 && <0.11
 
diff --git a/src/Main.hs b/src/Main.hs
index db47fb5..7dfb63d 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -11,7 +11,9 @@ import Data.Maybe                (catMaybes)
 import Text.PrettyPrint
 
 import qualified Graphics.Rendering.OpenGL.GL as GL
+import qualified Graphics.Rendering.OpenGL.Raw as GL
 import qualified Graphics.UI.GLFW             as GLFW
+import qualified Data.Vector.Storable as V
 
 import Map.Map
 import Render.Render (initShader)
@@ -215,9 +217,7 @@ run = do
     draw
     liftIO $ do
         GLFW.swapBuffers win
-        GL.flush  -- not necessary, but someone recommended it
         GLFW.pollEvents
-        GL.finish
     -- getEvents & process
     processEvents
 
@@ -379,7 +379,18 @@ draw = do
         map' = stateMap state
         frust = stateFrustum state
     liftIO $ do
-        lookAtUniformMatrix4fv (0.0,0.0,0.0) (0, 15, 0) up frust proj 1
+        GL.clear [GL.ColorBuffer]
+        let fov = 90
+            s = recip (tan $ fov * 0.5 * pi / 180)
+            f = 1000
+            n = 1
+        
+        let perspective = V.fromList [ s, 0, 0, 0
+                                      , 0, s, 0, 0
+                                      , 0, 0, -(f/(f - n)), -1
+                                      , 0, 0, -((f*n)/(f-n)), 0
+                                      ]
+        V.unsafeWith perspective $ \ptr -> GL.glUniformMatrix4fv proj 1 0 ptr
         GL.bindBuffer GL.ArrayBuffer GL.$= Just map'
         GL.vertexAttribPointer vi GL.$= fgVertexIndex