Point primitive stream based ring buffer.

1 files changed, 4 insertions, 17 deletions

diff --git a/hello_obj2.lc b/hello_obj2.lc
index 8e9bbe0..1181943 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -19,8 +19,7 @@ makeFrame (cubemap :: TextureCube)
           (texture :: Texture)
           (prims :: PrimitiveStream Triangle (Vec 4 Float, Vec 3 Float, Vec 3 Float))
           (plane :: PrimitiveStream Triangle ((Vec 4 Float)))
-          (pointsMax :: Int)
-          (pointsStart :: Int)
+          (points :: PrimitiveStream Point ((Vec 3 Float)))
 
     = imageFrame (emptyDepthImage 1, emptyColorImage (V4 0 0 0.4 1))
   `overlay`
@@ -46,23 +45,12 @@ makeFrame (cubemap :: TextureCube)
                                 in ((r + V4 0 0 0 (0.8))))
     & accumulateWith (DepthOp Less True, ColorOp blendplane (V4 True True True True))
   `overlay`
-      zipCount (fetch "Points" ((Attribute "position")) :: PrimitiveStream Point ((Float)))
-    & mapPrimitives (\(n,_) -> {- let nn = 0.2 * fromInt n :: Float
-                                   p = V4 nn nn nn 1
-                                   p' = coordmap cam p
-                                in (p', V4 1 1 0 1 :: Vec 4 Float)) -}
-                               let i = mod (n + pointsStart) pointsMax
-                                   t = TextureBufferSlot "PointBuffer"
-                                   p = V4 (textureBuffer t i)
-                                          (textureBuffer t (i+1))
-                                          (textureBuffer t (i+2))
-                                          1
-                                   p' = coordmap cam p
+      points
+    & mapPrimitives (\((p)) -> let p' = point p -- coordmap cam $ point p
                                 in (p', V4 1 1 0 1 :: Vec 4 Float))
 
     & renderPoints cam
 
-
 renderPoints ::
    Mat 4 4 Float
    -> PrimitiveStream Point (Vec 4 Float, Vec 4 Float)
@@ -86,6 +74,5 @@ main = renderFrame $
              (Texture2DSlot "diffuseTexture")
              (fetch "objects" (Attribute "position", Attribute "normal", Attribute "uvw"))
              (fetch "plane"   ((Attribute "position")))
-             (Uniform "PointsMax")
-             (Uniform "PointsStart")
+             (fetch "Points" ((Attribute "position")))