mainObj.hs: Slower animation, more straight-forward grid calculation.

1 files changed, 7 insertions, 5 deletions

diff --git a/mainObj.hs b/mainObj.hs
index 0d53a26..970f94c 100644
--- a/mainObj.hs
+++ b/mainObj.hs
@@ -59,7 +59,7 @@ uploadState obj glarea storage = do
     -- add OBJ to pipeline input
     addOBJToObjectArray storage "objects" objMesh gpuMtlLib
     -- grid plane
-    uploadMeshToGPU xyplane >>= addMeshToObjectArray storage "plane" []
+    uploadMeshToGPU xzplane >>= addMeshToObjectArray storage "plane" []
 
     -- setup FrameClock
     tm <- newTimeKeeper
@@ -79,10 +79,10 @@ deg30 = pi/6
 
 setUniforms :: glctx -> GLStorage -> State -> IO ()
 setUniforms gl storage st = do
-    t <- getSeconds $ stTimeKeeper st
+    t <- (/ 10.0) <$> getSeconds (stTimeKeeper st)
     let tf = realToFrac t :: Float
         rot = rotMatrixZ (-tf) <> rotMatrixX (-tf)
-        pos = rot #> fromList [0,0,10]
+        pos = rot #> fromList [2,2,10]
         up = rot #> fromList [0,1,0]
         cam = lookat pos 0 up
         aspect = 1
@@ -90,7 +90,8 @@ setUniforms gl storage st = do
         mvp = proj <> cam
 
     LC.updateUniforms storage $ do
-      "cam" @= return (mvp :: Matrix Float)
+      "CameraPosition" @= return (pos :: Vector Float)
+      "ViewProjection" @= return (mvp :: Matrix Float)
 
 main :: IO ()
 main = do
@@ -105,7 +106,8 @@ main = do
           defObjectArray "plane" Triangles $ do
             "position"  @: Attribute_V4F
           defUniforms $ do
-            "cam"             @: M44F
+            "CameraPosition"  @: V3F
+            "ViewProjection"  @: M44F
             "diffuseTexture"  @: FTexture2D
             "diffuseColor"    @: V4F
         return $ (,) <$> mobj <*> mpipeline