objdemo: pass view matrix from haskell.

1 files changed, 6 insertions, 10 deletions

diff --git a/hello_obj2.lc b/hello_obj2.lc
index ebee807..7adf8b1 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -1,15 +1,11 @@
 deg30 = 0.5235987755982988 -- pi/6
 
-coordmap (time::Float) (p::Vec 4 Float)
+coordmap (cam::Mat 4 4 Float) (p::Vec 4 Float)
     = perspective 0.1 -- near plane
                   100 -- far plane
                 deg30 -- y fov radians
                     1 -- aspect ratio w/h
-                      *. lookat (V3 0 0 10) -- camera position
-                                (V3 0 0 0)  -- target position
-                                (V3 0 1 0)  -- upward direction
-                      *. rotMatrixX time -- time = radians
-                      *. rotMatrixZ time -- time = radians
+                      *. cam
                       *. p
 
 blendplane = -- NoBlending -- BlendLogicOp Xor
@@ -17,7 +13,7 @@ blendplane = -- NoBlending -- BlendLogicOp Xor
           ((OneBF,SrcAlpha),(DstAlpha,DstAlpha))
           (V4 0 0 0 0)
 
-makeFrame (time :: Float)
+makeFrame (cam ::  Mat 4 4 Float)
           (color :: Vec 4 Float)
           (texture :: Texture)
           (prims :: PrimitiveStream Triangle (Vec 4 Float, Vec 3 Float, Vec 3 Float))
@@ -26,13 +22,13 @@ makeFrame (time :: Float)
     = imageFrame (emptyDepthImage 1, emptyColorImage (V4 0 0 0.4 1))
   `overlay`
       prims
-    & mapPrimitives (\(p,n,uvw) -> ( coordmap time p, V2 uvw%x (1 - uvw%y) ))
+    & mapPrimitives (\(p,n,uvw) -> ( coordmap cam p, V2 uvw%x (1 - uvw%y) ))
     & rasterizePrimitives (TriangleCtx CullBack PolygonFill NoOffset LastVertex) ((Smooth))
     & mapFragments (\((uv)) -> ((color * texture2D (Sampler PointFilter MirroredRepeat texture) uv )))
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
   `overlay`
       plane
-    & mapPrimitives (\((p)) -> (coordmap time p, p%xy ))
+    & mapPrimitives (\((p)) -> (coordmap cam p, p%xy ))
     & rasterizePrimitives (TriangleCtx CullNone PolygonFill NoOffset LastVertex) ((Smooth))
     -- & mapFragments (\((uv)) -> ((texture2D (Sampler PointFilter MirroredRepeat texture) uv )))
     -- & mapFragments (\((uv)) -> ((V4 uv%x uv%y 0 1))) -- ((rgb 1 0 0)))
@@ -46,7 +42,7 @@ makeFrame (time :: Float)
 
 
 main = renderFrame $
-   makeFrame (Uniform "time")
+   makeFrame (Uniform "cam")
              (Uniform "diffuseColor")
              (Texture2DSlot "diffuseTexture")
              (fetch "objects" (Attribute "position", Attribute "normal", Attribute "uvw"))