Pass entire model-view-projection matrix from haskell.

1 files changed, 11 insertions, 6 deletions

diff --git a/mainObj.hs b/mainObj.hs
index 9792ff6..0d53a26 100644
--- a/mainObj.hs
+++ b/mainObj.hs
@@ -74,18 +74,23 @@ destroyState :: GLArea -> State -> IO ()
 destroyState glarea st = do
     widgetRemoveTickCallback glarea (stTickCallback st)
 
+deg30 :: Float
+deg30 = pi/6
+
 setUniforms :: glctx -> GLStorage -> State -> IO ()
 setUniforms gl storage st = do
     t <- getSeconds $ stTimeKeeper st
     let tf = realToFrac t :: Float
-        roZ = rotMatrixZ (-tf)
-        roX = rotMatrixX (-tf)
-        ro = roZ <> roX
-        pos = ro #> fromList [0,0,10]
-        up = ro #> fromList [0,1,0]
+        rot = rotMatrixZ (-tf) <> rotMatrixX (-tf)
+        pos = rot #> fromList [0,0,10]
+        up = rot #> fromList [0,1,0]
         cam = lookat pos 0 up
+        aspect = 1
+        proj = perspective 0.1 100 deg30 aspect
+        mvp = proj <> cam
+
     LC.updateUniforms storage $ do
-      "cam" @= return (cam :: Matrix Float)
+      "cam" @= return (mvp :: Matrix Float)
 
 main :: IO ()
 main = do