From 1493e04d1fa85f1eef6924f64bcde78cfe91ba29 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Sun, 2 Jan 2022 18:13:43 -0600
Subject: [PATCH] examples use new pixie demo

---
 examples/circle2circle.nim |  4 ++--
 examples/circle2line.nim   |  4 ++--
 examples/circle2rect.nim   |  4 ++--
 examples/circle2seg.nim    |  4 ++--
 examples/convexhull.nim    | 10 +++++-----
 examples/hull2hull.nim     |  6 +++---
 examples/line2line.nim     |  6 +++---
 examples/line2poly.nim     |  4 ++--
 examples/line2rect.nim     |  4 ++--
 examples/line2seg.nim      |  4 ++--
 examples/point2circle.nim  |  4 ++--
 examples/point2line.nim    |  6 ++----
 examples/point2point.nim   |  4 ++--
 examples/point2rect.nim    |  4 ++--
 examples/point2seg.nim     |  4 ++--
 examples/poly2circle.nim   |  4 ++--
 examples/poly2point.nim    |  4 ++--
 examples/poly2poly.nim     |  4 ++--
 examples/poly2rect.nim     |  4 ++--
 examples/poly2seg.nim      |  4 ++--
 examples/rect2rect.nim     |  4 ++--
 examples/seg2rect.nim      |  4 ++--
 examples/seg2seg.nim       |  4 ++--
 examples/tri2point.nim     |  4 ++--
 24 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/examples/circle2circle.nim b/examples/circle2circle.nim
index 60fefbc..6d2d2f6 100644
--- a/examples/circle2circle.nim
+++ b/examples/circle2circle.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Circle
@@ -13,7 +13,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a.pos = getMousePos()
+  a.pos = window.mousePos.vec2
   screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/circle2line.nim b/examples/circle2line.nim
index f9bfc3e..2ffe13b 100644
--- a/examples/circle2line.nim
+++ b/examples/circle2line.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   c: Circle
@@ -14,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  c.pos = getMousePos()
+  c.pos = window.mousePos.vec2
   screen.fillCircle(c, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/circle2rect.nim b/examples/circle2rect.nim
index bb126a3..83e9885 100644
--- a/examples/circle2rect.nim
+++ b/examples/circle2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Circle
@@ -14,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a.pos = getMousePos()
+  a.pos = window.mousePos.vec2
   screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/circle2seg.nim b/examples/circle2seg.nim
index f25b7ca..63e4fb0 100644
--- a/examples/circle2seg.nim
+++ b/examples/circle2seg.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Circle
@@ -14,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a.pos = getMousePos()
+  a.pos = window.mousePos.vec2
   screen.fillCircle(a, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/convexhull.nim b/examples/convexhull.nim
index 2f2bc00..b158a92 100644
--- a/examples/convexhull.nim
+++ b/examples/convexhull.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, random, vmath
+import bumpy, common, pixie/demo, random
 
 var
   points: seq[Vec2]
@@ -33,17 +33,17 @@ while true:
   for p in points:
     screen.strokeCircle(circle(p, 5), parseHtmlColor("#2ecc71"))
 
-  if isKeyDown(KEY_SPACE):
+  if window.buttonDown[KeySpace]:
     gen()
 
-  if isMouseDown():
+  if window.buttonDown[MouseLeft]:
     if dragging == -1:
       for i, p in points:
-        if p.dist(getMousePos()) < 6:
+        if p.dist(window.mousePos.vec2) < 6:
           dragging = i
     if dragging != -1:
       screen.fillCircle(circle(points[dragging], 7), parseHtmlColor("#2ecc71"))
-      points[dragging] = getMousePos()
+      points[dragging] = window.mousePos.vec2
       hull = convexHull(points)
   else:
     dragging = -1
diff --git a/examples/hull2hull.nim b/examples/hull2hull.nim
index 0b4ef77..19738af 100644
--- a/examples/hull2hull.nim
+++ b/examples/hull2hull.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, pixie/demo, random, vmath
+import bumpy, pixie/demo, random
 
 var
   hull1: seq[Vec2]
@@ -43,7 +43,7 @@ while true:
 
   var hull2shifted = hull2
   for p in hull2shifted.mitems:
-    p += getMousePos() - vec2(100, 100)
+    p += window.mousePos.vec2 - vec2(100, 100)
 
   hull2shifted.drawHull()
 
@@ -83,7 +83,7 @@ while true:
   ctx.strokeStyle = rgba(0, 255, 0, 255)
   ctx.strokeSegment(segment(avgA, avgA + normB*80))
 
-  if isKeyDown(KEY_SPACE):
+  if window.buttonDown[KeySpace]:
     gen()
 
   tick()
diff --git a/examples/line2line.nim b/examples/line2line.nim
index 3603e64..210f115 100644
--- a/examples/line2line.nim
+++ b/examples/line2line.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -20,8 +20,8 @@ while true:
 
   screen.fill(rgba(255, 255, 255, 255))
 
-  if getMousePos().x > 300:
-    a.b = getMousePos()
+  if window.mousePos.x > 300:
+    a.b = window.mousePos.vec2
   else:
     a.b = vec2(screen.width.float32, 300)
   let windowEdge = Line(
diff --git a/examples/line2poly.nim b/examples/line2poly.nim
index 729f8de..951b0fd 100644
--- a/examples/line2poly.nim
+++ b/examples/line2poly.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -16,7 +16,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  l.b = getMousePos()
+  l.b = window.mousePos.vec2
   let windowEdge = Line(
     a: vec2(screen.width.float32, 0),
     b: vec2(screen.width.float32, screen.height.float32)
diff --git a/examples/line2rect.nim b/examples/line2rect.nim
index c87cf60..a89cb58 100644
--- a/examples/line2rect.nim
+++ b/examples/line2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -16,7 +16,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  l.b = getMousePos()
+  l.b = window.mousePos.vec2
   let windowEdge = Line(
     a: vec2(screen.width.float32, 0),
     b: vec2(screen.width.float32, screen.height.float32)
diff --git a/examples/line2seg.nim b/examples/line2seg.nim
index 88f6a6a..35269a5 100644
--- a/examples/line2seg.nim
+++ b/examples/line2seg.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 # The lines always overlap unless you get them to be perfectly parallel.
 
@@ -19,7 +19,7 @@ while true:
   s.to.x = screen.width.float32 - 100
   s.to.y = 500
 
-  l.b = getMousePos()
+  l.b = window.mousePos.vec2
   let windowEdge = Line(
     a: vec2(screen.width.float32, 0),
     b: vec2(screen.width.float32, screen.height.float32)
diff --git a/examples/point2circle.nim b/examples/point2circle.nim
index 819107e..903606c 100644
--- a/examples/point2circle.nim
+++ b/examples/point2circle.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Vec2
@@ -12,7 +12,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a = getMousePos()
+  a = window.mousePos.vec2
   screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/point2line.nim b/examples/point2line.nim
index 29e1b45..5690c86 100644
--- a/examples/point2line.nim
+++ b/examples/point2line.nim
@@ -1,6 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
-
-# The lines always overlap unless you get them to be perfectly parallel.
+import bumpy, common, pixie/demo
 
 var
   l: Line
@@ -16,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  p = getMousePos()
+  p = window.mousePos.vec2
   screen.strokeCircle(circle(p, 10), parseHtmlColor("#2ecc71"))
 
   let color =
diff --git a/examples/point2point.nim b/examples/point2point.nim
index 9655611..999c24c 100644
--- a/examples/point2point.nim
+++ b/examples/point2point.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var a, b: Vec2
 b.x = 300
@@ -9,7 +9,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a = getMousePos()
+  a = window.mousePos.vec2
   screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/point2rect.nim b/examples/point2rect.nim
index ad1375d..25350a2 100644
--- a/examples/point2rect.nim
+++ b/examples/point2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Vec2
@@ -13,7 +13,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a = getMousePos()
+  a = window.mousePos.vec2
   screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/point2seg.nim b/examples/point2seg.nim
index 2afb305..f9ee19e 100644
--- a/examples/point2seg.nim
+++ b/examples/point2seg.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Vec2
@@ -13,7 +13,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a = getMousePos()
+  a = window.mousePos.vec2
   screen.strokeCircle(circle(a, 10), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/poly2circle.nim b/examples/poly2circle.nim
index fb5829e..498a7b1 100644
--- a/examples/poly2circle.nim
+++ b/examples/poly2circle.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   poly: seq[Vec2]
@@ -15,7 +15,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  circle.pos = getMousePos()
+  circle.pos = window.mousePos.vec2
   screen.fillCircle(circle, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/poly2point.nim b/examples/poly2point.nim
index 9fed10f..161e786 100644
--- a/examples/poly2point.nim
+++ b/examples/poly2point.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   poly: seq[Vec2]
@@ -14,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  point = getMousePos()
+  point = window.mousePos.vec2
   screen.fillCircle(circle(point, 10), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/poly2poly.nim b/examples/poly2poly.nim
index 77c1aea..031ad64 100644
--- a/examples/poly2poly.nim
+++ b/examples/poly2poly.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: seq[Vec2]
@@ -14,7 +14,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  let mousePos = getMousePos()
+  let mousePos = window.mousePos.vec2
   a.setLen(0)
   a.add(vec2(-20, -10) + mousePos)
   a.add(vec2(-30, -49) + mousePos)
diff --git a/examples/poly2rect.nim b/examples/poly2rect.nim
index eb359c9..e79681c 100644
--- a/examples/poly2rect.nim
+++ b/examples/poly2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie, pixie/demo, vmath
+import bumpy, common, pixie, pixie/demo
 
 var
   poly: seq[Vec2]
@@ -17,7 +17,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  rect.xy = getMousePos()
+  rect.xy = window.mousePos.vec2
   screen.fillRect(rect, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/poly2seg.nim b/examples/poly2seg.nim
index 60a5f21..c2989ab 100644
--- a/examples/poly2seg.nim
+++ b/examples/poly2seg.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   poly: seq[Vec2]
@@ -17,7 +17,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  s.to = getMousePos()
+  s.to = window.mousePos.vec2
   screen.strokeSegment(segment(s.at, s.to), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/rect2rect.nim b/examples/rect2rect.nim
index c51a455..4d951e2 100644
--- a/examples/rect2rect.nim
+++ b/examples/rect2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   a: Rect
@@ -15,7 +15,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  a.xy = getMousePos()
+  a.xy = window.mousePos.vec2
   screen.fillRect(a, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/seg2rect.nim b/examples/seg2rect.nim
index e316f74..4cd4142 100644
--- a/examples/seg2rect.nim
+++ b/examples/seg2rect.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   s: Segment
@@ -17,7 +17,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  s.to = getMousePos()
+  s.to = window.mousePos.vec2
   screen.strokeSegment(segment(s.at, s.to), parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/seg2seg.nim b/examples/seg2seg.nim
index 978b04b..ca80452 100644
--- a/examples/seg2seg.nim
+++ b/examples/seg2seg.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   d: Segment
@@ -17,7 +17,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  d.to = getMousePos()
+  d.to = window.mousePos.vec2
   screen.strokeSegment(d, parseHtmlColor("#2ecc71"))
 
   var color =
diff --git a/examples/tri2point.nim b/examples/tri2point.nim
index 4f01c52..9e6f858 100644
--- a/examples/tri2point.nim
+++ b/examples/tri2point.nim
@@ -1,4 +1,4 @@
-import bumpy, chroma, common, pixie/demo, vmath
+import bumpy, common, pixie/demo
 
 var
   tri: seq[Vec2]
@@ -13,7 +13,7 @@ start()
 while true:
   screen.fill(rgba(255, 255, 255, 255))
 
-  point = getMousePos()
+  point = window.mousePos.vec2
   screen.fillCircle(circle(point, 10), parseHtmlColor("#2ecc71"))
 
   var color =