Render curve points as line strips rather than points.

3 files changed, 6 insertions, 5 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index 6475d27..d598bbd 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -330,7 +330,7 @@ new = do
             "uvw"       @: Attribute_V3F
           defObjectArray "plane" Triangles $ do
             "position"  @: Attribute_V4F
-          defObjectArray "Points" Points $ do
+          defObjectArray "Points" Lines $ do
             "position"  @: Attribute_V3F
             "color"     @: Attribute_V3F
           defUniforms $ do
diff --git a/PointPrimitiveRing.hs b/PointPrimitiveRing.hs
index 54405e4..d4fafae 100644
--- a/PointPrimitiveRing.hs
+++ b/PointPrimitiveRing.hs
@@ -54,7 +54,8 @@ newRing storage sz toAttr = fix $ \retProxy -> do
     sizeRef <- newIORef 0
     let ps = fieldParameters paramProxy toAttr
     putStrLn $ "Ring params: " ++ show ps
-    gd <- uploadDynamicBuffer sz ps
+    gd0 <- uploadDynamicBuffer sz ps
+    let gd = gd0 { dPrimitive = LineStrip }
     Just keys <- return $ lookupAttrKeys (lookupAttributeKey gd . toAttr)
     obj <- addToObjectArray storage "Points" [] gd
     readIORef (objCommands obj) >>= mapM_ print
diff --git a/hello_obj2.lc b/hello_obj2.lc
index 7b3d4a2..b68a04d 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, Vec 3 Float))
+          (points :: PrimitiveStream Line (Vec 3 Float, Vec 3 Float))
           (plane_mat :: Mat 4 4 Float)
 
     = imageFrame (emptyDepthImage 1, emptyColorImage (V4 0 0 0.4 1))
@@ -59,12 +59,12 @@ makeFrame (cubemap :: TextureCube)
 
 renderPoints ::
    Mat 4 4 Float
-   -> PrimitiveStream Point (Vec 4 Float, Vec 4 Float)
+   -> PrimitiveStream Line (Vec 4 Float, Vec 4 Float)
    -> ( (FragmentOperation Depth, FragmentOperation (Color (VecScalar 4 Float)))
       , FragmentStream 1 ((Vec 4 Float)) )
 renderPoints cam points =
       points
-    & rasterizePrimitives (PointCtx (PointSize 5.0) 1.0 LowerLeft) ((Flat))
+    & rasterizePrimitives (LineCtx 1.0 LastVertex) ((Flat))
     & mapFragments (\((c)) -> ((c)))
     & accumulateWith (DepthOp Less True, ColorOp NoBlending (V4 True True True True))