Added colors to pen points + various updates.

1 files changed, 4 insertions, 4 deletions

diff --git a/hello_obj2.lc b/hello_obj2.lc
index fdf08d6..72a87ee 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -19,7 +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)))
-          (points :: PrimitiveStream Point ((Vec 3 Float)))
+          (points :: PrimitiveStream Point (Vec 3 Float, Vec 3 Float))
           (plane_mat :: Mat 4 4 Float)
 
     = imageFrame (emptyDepthImage 1, emptyColorImage (V4 0 0 0.4 1))
@@ -47,8 +47,8 @@ makeFrame (cubemap :: TextureCube)
     & accumulateWith (DepthOp Less True, ColorOp blendplane (V4 True True True True))
   `overlay`
       points
-    & mapPrimitives (\((p)) -> let p' = coordmap cam $ point p
-                                in (p', V4 1 1 0 1 :: Vec 4 Float))
+    & mapPrimitives (\(p,c) -> let p' = coordmap cam $ point p
+                                in (p', point c))
 
     & renderPoints cam
 
@@ -73,5 +73,5 @@ main = renderFrame $
              (Texture2DSlot "diffuseTexture")
              (fetch "objects" (Attribute "position", Attribute "normal", Attribute "uvw"))
              (fetch "plane"   ((Attribute "position")))
-             (fetch "Points" ((Attribute "position")))
+             (fetch "Points" (Attribute "position", Attribute "color"))
              (Uniform "PlaneModel")