1 files changed, 19 insertions, 5 deletions

diff --git a/hello_obj2.lc b/hello_obj2.lc
index b68a04d..7e7defc 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -19,7 +19,8 @@ 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 Line (Vec 3 Float, Vec 3 Float))
+          (lines :: PrimitiveStream Line (Vec 3 Float, 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))
@@ -46,6 +47,17 @@ makeFrame (cubemap :: TextureCube)
                                 in ((r + V4 0 0 0 (0.8))))
     & accumulateWith (DepthOp Less True, ColorOp blendplane (V4 True True True True))
   `overlay`
+      lines
+    & mapPrimitives (\(p,c) -> let p' = coordmap cam $ point p
+                                   w = p'%w
+                                   yellowish = normalize c `dot` V3 1 1 0
+                                   p2 = if yellowish >= 0.9*sqrt 2
+                                            then V4 p'%x p'%y 0.1 w
+                                            else V4 p'%x p'%y 0.11 w
+                                in (p2, point c))
+
+    & renderPoints cam (LineCtx 1.0 LastVertex)
+  `overlay`
       points
     & mapPrimitives (\(p,c) -> let p' = coordmap cam $ point p
                                    w = p'%w
@@ -55,16 +67,17 @@ makeFrame (cubemap :: TextureCube)
                                             else V4 p'%x p'%y 0.11 w
                                 in (p2, point c))
 
-    & renderPoints cam
+    & renderPoints cam (PointCtx (PointSize 5.0) 1.0 LowerLeft)
 
 renderPoints ::
    Mat 4 4 Float
-   -> PrimitiveStream Line (Vec 4 Float, Vec 4 Float)
+   -> RasterContext (Vec 4 Float, Vec 4 Float) pr
+   -> PrimitiveStream pr (Vec 4 Float, Vec 4 Float)
    -> ( (FragmentOperation Depth, FragmentOperation (Color (VecScalar 4 Float)))
       , FragmentStream 1 ((Vec 4 Float)) )
-renderPoints cam points =
+renderPoints cam ctx points =
       points
-    & rasterizePrimitives (LineCtx 1.0 LastVertex) ((Flat))
+    & rasterizePrimitives ctx ((Flat))
     & mapFragments (\((c)) -> ((c)))
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))
 
@@ -78,5 +91,6 @@ main = renderFrame $
              (Texture2DSlot "diffuseTexture")
              (fetch "objects" (Attribute "position", Attribute "normal", Attribute "uvw"))
              (fetch "plane"   ((Attribute "position")))
+             (fetch "Curve" (Attribute "position", Attribute "color"))
              (fetch "Points" (Attribute "position", Attribute "color"))
              (Uniform "PlaneModel")