Pass entire model-view-projection matrix from haskell.

1 files changed, 4 insertions, 9 deletions

diff --git a/Matrix.hs b/Matrix.hs
index 07dbab8..2e27d08 100644
--- a/Matrix.hs
+++ b/Matrix.hs
@@ -54,11 +54,6 @@ lookat pos target up = fromRows
 {-# SPECIALIZE lookat :: Vector R -> Vector R -> Vector R -> Matrix R #-}
 
 
-
--- lookat pos target up <> rot t
---    == lookat ((((pos - target) <# rot (-t))) + target)
---              target
---
 -- | Perspective transformation 4×4 matrix.
 perspective :: (Storable a, Floating a) =>
                 a    -- ^ Near plane clipping distance (always positive).
@@ -67,10 +62,10 @@ perspective :: (Storable a, Floating a) =>
                 -> a -- ^ Aspect ratio, i.e. screen's width\/height.
                 -> Matrix a
 perspective n f fovy aspect = (4><4)
-    [ (2*n/(r-l))    , 0             , 0              , 0
-    , 0              , (2*n/(t-b))   , 0              , 0
-    , (-(r+l)/(r-l)) , ((t+b)/(t-b)) , (-(f+n)/(f-n)) , (-1)
-    , 0              , 0             , (-2*f*n/(f-n)) , 0    ]
+    [ (2*n/(r-l)) , 0           , (-(r+l)/(r-l)) , 0
+    , 0           , (2*n/(t-b)) , ((t+b)/(t-b))  , 0
+    , 0           , 0           , (-(f+n)/(f-n)) , (-2*f*n/(f-n))
+    , 0           , 0           , (-1)           , 0              ]
   where
     t = n*tan(fovy/2)
     b = -t