update examples to use current pixie

examples/circle2circle.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Circle
@@ -14,12 +14,12 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a.pos = getMousePos()
-  screen.fillCircle(a.pos, a.radius, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, b): parseHtmlColor("#e74c3c")
     else: parseHtmlColor("#3498db")
   color.a = 0.75
-  screen.fillCircle(b.pos, b.radius, color)
+  screen.fillCircle(b, color)
 
   tick()

examples/circle2line.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 var
   c: Circle
   l: Line
@@ -14,7 +14,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   c.pos = getMousePos()
-  screen.fillCircle(c.pos, c.radius, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(c, parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(c, l): parseHtmlColor("#e74c3c")

examples/circle2rect.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Circle
@@ -15,7 +15,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a.pos = getMousePos()
-  screen.fillCircle(a.pos, a.radius, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, b): parseHtmlColor("#e74c3c")

examples/circle2seg.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 var
   a: Circle
   s: Segment
@@ -14,7 +14,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a.pos = getMousePos()
-  screen.fillCircle(a.pos, a.radius, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, s): parseHtmlColor("#e74c3c")

examples/common.nim

@@ -1,17 +1,38 @@
 import pixie
 
 proc fillPoly*(image: Image, poly: seq[Vec2], color: SomeColor) =
-  var path: Path
+  let path = newPath()
   path.moveTo(poly[0])
   for p in poly[1..^1]:
     path.lineTo(p)
   path.closePath()
   image.fillPath(path, color)
 
 proc strokePoly*(image: Image, poly: seq[Vec2], color: SomeColor) =
-  var path: Path
+  let path = newPath()
   path.moveTo(poly[0])
   for p in poly[1..^1]:
     path.lineTo(p)
   path.closePath()
   image.strokePath(path, color)
+
+proc fillRect*(image: Image, rect: Rect, color: SomeColor) =
+  let p = newPath()
+  p.rect(rect)
+  image.fillPath(p, color)
+
+proc fillCircle*(image: Image, circle: Circle, color: SomeColor) =
+  let p = newPath()
+  p.circle(circle)
+  image.fillPath(p, color)
+
+proc strokeCircle*(image: Image, circle: Circle, color: SomeColor) =
+  let p = newPath()
+  p.circle(circle)
+  image.fillPath(p, color)
+
+proc strokeSegment*(image: Image, segment: Segment, color: SomeColor) =
+  let p = newPath()
+  p.moveTo(segment.at)
+  p.lineTo(segment.to)
+  image.strokePath(p, color)

examples/convexhull.nim

@@ -31,7 +31,7 @@ while true:
       inc i
 
   for p in points:
-    screen.strokeCircle(p, 5, parseHtmlColor("#2ecc71"))
+    screen.strokeCircle(circle(p, 5), parseHtmlColor("#2ecc71"))
 
   if isKeyDown(KEY_SPACE):
     gen()
@@ -42,7 +42,7 @@ while true:
         if p.dist(getMousePos()) < 6:
           dragging = i
     if dragging != -1:
-      screen.fillCircle(points[dragging], 7, parseHtmlColor("#2ecc71"))
+      screen.fillCircle(circle(points[dragging], 7), parseHtmlColor("#2ecc71"))
       points[dragging] = getMousePos()
       hull = convexHull(points)
   else:

examples/hull2hull.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma, random, common
+import bumpy, pixie/demo, vmath, chroma, random
 
 var
   hull1: seq[Vec2]
@@ -59,7 +59,7 @@ while true:
       var at: Vec2
       if a.intersects(b, at):
         ctx.strokeStyle = rgba(255, 0, 0, 255)
-        ctx.strokeCircle(at, 3)
+        ctx.strokeCircle(circle(at, 3))
         let normalA = a.convexHullNormal
         ctx.strokeStyle = rgba(255, 0, 0, 255)
         ctx.strokeSegment(segment(at, at + normalA*40))
@@ -77,7 +77,7 @@ while true:
   normA /= numA.float32
   normB /= numA.float32
   ctx.strokeStyle = rgba(255, 0, 0, 255)
-  ctx.strokeCircle(avgA, 5)
+  ctx.strokeCircle(circle(avgA, 5))
   ctx.strokeStyle = rgba(255, 0, 0, 255)
   ctx.strokeSegment(segment(avgA, avgA + normA*80))
   ctx.strokeStyle = rgba(0, 255, 0, 255)

examples/line2line.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -11,12 +11,13 @@ a.a.y = 100
 
 b.a.x = 0
 b.a.y = 400
-b.b.x = screen.width.float32
 b.b.y = 600
 
 start()
 
 while true:
+  b.b.x = screen.width.float32
+
   screen.fill(rgba(255, 255, 255, 255))
 
   if getMousePos().x > 300:

examples/line2poly.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma, common
+import bumpy, common, pixie/demo, vmath, chroma, common
 
 # The lines always overlap unless you get them to be perfectly parallel.
 

examples/line2rect.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 # The lines always overlap unless you get them to be perfectly parallel.
 

examples/line2seg.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 # The lines always overlap unless you get them to be perfectly parallel.
 

examples/point2circle.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Vec2
@@ -13,12 +13,12 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a = getMousePos()
-  screen.strokeCircle(a, 10, parseHtmlColor("#2ecc71"))
+  screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, b): parseHtmlColor("#e74c3c")
     else: parseHtmlColor("#3498db")
   color.a = 0.75
-  screen.fillCircle(b.pos, b.radius, color)
+  screen.fillCircle(b, color)
 
   tick()

examples/point2line.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -17,7 +17,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   p = getMousePos()
-  screen.strokeCircle(p, 10, parseHtmlColor("#2ecc71"))
+  screen.strokeCircle(circle(p, 10), parseHtmlColor("#2ecc71"))
 
   let color =
     if overlaps(l, p, fudge = 1.5):

examples/point2point.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var a, b: Vec2
 b.x = 300
@@ -10,12 +10,12 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a = getMousePos()
-  screen.strokeCircle(a, 10, parseHtmlColor("#2ecc71"))
+  screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, b): parseHtmlColor("#e74c3c")
     else: parseHtmlColor("#3498db")
   color.a = 0.75
-  screen.fillCircle(b, 10, color)
+  screen.fillCircle(circle(b, 10), color)
 
   tick()

examples/point2rect.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Vec2
@@ -14,7 +14,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a = getMousePos()
-  screen.strokeCircle(a, 10, parseHtmlColor("#2ecc71"))
+  screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, b): parseHtmlColor("#e74c3c")

examples/point2seg.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Vec2
@@ -14,7 +14,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   a = getMousePos()
-  screen.strokeCircle(a, 10, parseHtmlColor("#2ecc71"))
+  screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(a, s): parseHtmlColor("#e74c3c")

examples/poly2circle.nim

@@ -16,7 +16,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   circle.pos = getMousePos()
-  screen.fillCircle(circle.pos, circle.radius, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(circle, parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(poly, circle):

examples/poly2point.nim

@@ -15,7 +15,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   point = getMousePos()
-  screen.fillCircle(point, 10, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(circle(point, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(poly, point):

examples/rect2rect.nim

@@ -1,4 +1,4 @@
-import bumpy, pixie/demo, vmath, chroma
+import bumpy, common, pixie/demo, vmath, chroma
 
 var
   a: Rect

examples/run.bat

@@ -1,10 +1,16 @@
 
 nim c -r circle2circle.nim
+nim c -r circle2line.nim
 nim c -r circle2rect.nim
 nim c -r circle2seg.nim
+nim c -r convexhull.nim
+nim c -r hull2hull.nom
 nim c -r line2line.nim
+nim c -r line2poly.nim
+nim c -r line2rect.nim
 nim c -r line2seg.nim
 nim c -r point2circle.nim
+nim c -r point2line.nim
 nim c -r point2point.nim
 nim c -r point2rect.nim
 nim c -r point2seg.nim

examples/tri2point.nim

@@ -14,7 +14,7 @@ while true:
   screen.fill(rgba(255, 255, 255, 255))
 
   point = getMousePos()
-  screen.fillCircle(point, 10, parseHtmlColor("#2ecc71"))
+  screen.fillCircle(circle(point, 10), parseHtmlColor("#2ecc71"))
 
   var color =
     if overlaps(tri, point):