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

1 files changed, 7 insertions, 10 deletions

diff --git a/hello_obj2.lc b/hello_obj2.lc
index 5a95ad7..d0fc35b 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -7,7 +7,8 @@ blendplane = -- NoBlending -- BlendLogicOp Xor
           ((OneBF,SrcAlpha),(DstAlpha,DstAlpha))
           (V4 0 0 0 0)
 
-makeFrame (cam ::  Mat 4 4 Float)
+makeFrame (cameraPosition :: Vec 3 Float)
+          (cam ::  Mat 4 4 Float)
           (color :: Vec 4 Float)
           (texture :: Texture)
           (prims :: PrimitiveStream Triangle (Vec 4 Float, Vec 3 Float, Vec 3 Float))
@@ -22,21 +23,17 @@ makeFrame (cam ::  Mat 4 4 Float)
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
   `overlay`
       plane
-    & mapPrimitives (\((p)) -> (coordmap cam p, p%xy ))
+    & mapPrimitives (\((p)) -> let p' = coordmap cam p in (p', p%xz))
     & 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)))
-    & mapFragments (\((uv)) -> let k=cos(g *! (8 * pi / 4))
-                                   g=uv -- *! (1 + sqrt (abs (t%x * t%y)))
-                                   t=normalize uv
-                                   c=k -- *! ( t%x * t%y) -- /! ((k%x + k%y) / k%x)
-                                   r = V4 1 1 1 0 *! smoothstepS 0.99 1.0 (max c%x c%y)
+    & mapFragments (\((uv)) -> let c = mixB zero one (fract uv >= (one *! (0.95::Float)))
+                                   r = V4 1 1 1 0 *! (max c%x c%y)
                                 in ((r + V4 0 0 0 (0.8))))
     & accumulateWith (DepthOp Less True, ColorOp blendplane (V4 True True True True))
 
 
 main = renderFrame $
-   makeFrame (Uniform "cam")
+   makeFrame (Uniform "CameraPosition")
+             (Uniform "ViewProjection")
              (Uniform "diffuseColor")
              (Texture2DSlot "diffuseTexture")
              (fetch "objects" (Attribute "position", Attribute "normal", Attribute "uvw"))