From 613615d5152a4134100208ecfc07186ec2c9629a Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Wed, 19 Jan 2022 14:05:19 -0600 Subject: [PATCH] dont use pixie/demo, have demo code in examples/common --- examples/circle2circle.nim | 2 +- examples/circle2line.nim | 2 +- examples/circle2rect.nim | 2 +- examples/circle2seg.nim | 2 +- examples/common.nim | 41 +++++++++++++++++++++++++++++++++++++- examples/convexhull.nim | 2 +- examples/hull2hull.nim | 2 +- examples/line2line.nim | 2 +- examples/line2poly.nim | 2 +- examples/line2rect.nim | 2 +- examples/line2seg.nim | 2 +- examples/point2circle.nim | 2 +- examples/point2line.nim | 2 +- examples/point2point.nim | 2 +- examples/point2rect.nim | 2 +- examples/point2seg.nim | 2 +- examples/poly2circle.nim | 2 +- examples/poly2point.nim | 2 +- examples/poly2poly.nim | 2 +- examples/poly2rect.nim | 2 +- examples/poly2seg.nim | 2 +- examples/rect2rect.nim | 2 +- examples/seg2rect.nim | 2 +- examples/seg2seg.nim | 2 +- examples/tri2point.nim | 2 +- 25 files changed, 64 insertions(+), 25 deletions(-) diff --git a/examples/circle2circle.nim b/examples/circle2circle.nim index 6d2d2f6..7ae8595 100644 --- a/examples/circle2circle.nim +++ b/examples/circle2circle.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Circle diff --git a/examples/circle2line.nim b/examples/circle2line.nim index 2ffe13b..8cb12d7 100644 --- a/examples/circle2line.nim +++ b/examples/circle2line.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var c: Circle diff --git a/examples/circle2rect.nim b/examples/circle2rect.nim index 83e9885..e38e345 100644 --- a/examples/circle2rect.nim +++ b/examples/circle2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Circle diff --git a/examples/circle2seg.nim b/examples/circle2seg.nim index 63e4fb0..0fc176c 100644 --- a/examples/circle2seg.nim +++ b/examples/circle2seg.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Circle diff --git a/examples/common.nim b/examples/common.nim index 3ce1464..037f2c8 100644 --- a/examples/common.nim +++ b/examples/common.nim @@ -1,4 +1,43 @@ -import pixie +import boxy, opengl, pixie, windy + +export pixie, windy + +var + window*: Window + screen*: Image + ctx*: Context + bxy: Boxy + +proc tick*() = + ## Called this every frame in a while loop. + + bxy.addImage("screen", screen, genMipmaps = false) + + bxy.beginFrame(window.size) + bxy.drawRect(rect(vec2(0, 0), window.size.vec2), color(1, 1, 1, 1)) + bxy.drawImage("screen", vec2(0, 0)) + bxy.endFrame() + + swapBuffers(window) + + pollEvents() + + if window.closeRequested: + quit() + +proc start*(title = "Demo", windowSize = ivec2(800, 600)) = + ## Start the demo. + window = newWindow(title, windowSize) + window.style = Decorated + window.size = (window.size.vec2 * window.contentScale).ivec2 + + makeContextCurrent(window) + loadExtensions() + + let pixelSize = windowSize.vec2 * window.contentScale + screen = newImage(pixelSize.x.int, pixelSize.y.int) + ctx = newContext(screen) + bxy = newBoxy() proc fillPoly*(image: Image, poly: seq[Vec2], color: SomeColor) = let path = newPath() diff --git a/examples/convexhull.nim b/examples/convexhull.nim index b158a92..92c0899 100644 --- a/examples/convexhull.nim +++ b/examples/convexhull.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo, random +import bumpy, common, random var points: seq[Vec2] diff --git a/examples/hull2hull.nim b/examples/hull2hull.nim index 19738af..e871166 100644 --- a/examples/hull2hull.nim +++ b/examples/hull2hull.nim @@ -1,4 +1,4 @@ -import bumpy, pixie/demo, random +import bumpy, common, random var hull1: seq[Vec2] diff --git a/examples/line2line.nim b/examples/line2line.nim index 210f115..805e1e3 100644 --- a/examples/line2line.nim +++ b/examples/line2line.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common # The lines always overlap unless you get them to be perfectly parallel. diff --git a/examples/line2poly.nim b/examples/line2poly.nim index 951b0fd..9c81ea5 100644 --- a/examples/line2poly.nim +++ b/examples/line2poly.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common # The lines always overlap unless you get them to be perfectly parallel. diff --git a/examples/line2rect.nim b/examples/line2rect.nim index a89cb58..492067e 100644 --- a/examples/line2rect.nim +++ b/examples/line2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common # The lines always overlap unless you get them to be perfectly parallel. diff --git a/examples/line2seg.nim b/examples/line2seg.nim index 35269a5..d179002 100644 --- a/examples/line2seg.nim +++ b/examples/line2seg.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common # The lines always overlap unless you get them to be perfectly parallel. diff --git a/examples/point2circle.nim b/examples/point2circle.nim index 903606c..8239383 100644 --- a/examples/point2circle.nim +++ b/examples/point2circle.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Vec2 diff --git a/examples/point2line.nim b/examples/point2line.nim index 5690c86..4c5179a 100644 --- a/examples/point2line.nim +++ b/examples/point2line.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var l: Line diff --git a/examples/point2point.nim b/examples/point2point.nim index 999c24c..d9210aa 100644 --- a/examples/point2point.nim +++ b/examples/point2point.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a, b: Vec2 b.x = 300 diff --git a/examples/point2rect.nim b/examples/point2rect.nim index 25350a2..d41c72f 100644 --- a/examples/point2rect.nim +++ b/examples/point2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Vec2 diff --git a/examples/point2seg.nim b/examples/point2seg.nim index f9ee19e..9b23da7 100644 --- a/examples/point2seg.nim +++ b/examples/point2seg.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Vec2 diff --git a/examples/poly2circle.nim b/examples/poly2circle.nim index 498a7b1..10c5d81 100644 --- a/examples/poly2circle.nim +++ b/examples/poly2circle.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var poly: seq[Vec2] diff --git a/examples/poly2point.nim b/examples/poly2point.nim index 161e786..06adb66 100644 --- a/examples/poly2point.nim +++ b/examples/poly2point.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var poly: seq[Vec2] diff --git a/examples/poly2poly.nim b/examples/poly2poly.nim index 031ad64..263d7f4 100644 --- a/examples/poly2poly.nim +++ b/examples/poly2poly.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: seq[Vec2] diff --git a/examples/poly2rect.nim b/examples/poly2rect.nim index e79681c..f221bd5 100644 --- a/examples/poly2rect.nim +++ b/examples/poly2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie, pixie/demo +import bumpy, common var poly: seq[Vec2] diff --git a/examples/poly2seg.nim b/examples/poly2seg.nim index c2989ab..1428553 100644 --- a/examples/poly2seg.nim +++ b/examples/poly2seg.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var poly: seq[Vec2] diff --git a/examples/rect2rect.nim b/examples/rect2rect.nim index 4d951e2..c2cdbfe 100644 --- a/examples/rect2rect.nim +++ b/examples/rect2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var a: Rect diff --git a/examples/seg2rect.nim b/examples/seg2rect.nim index 4cd4142..f28a7d5 100644 --- a/examples/seg2rect.nim +++ b/examples/seg2rect.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var s: Segment diff --git a/examples/seg2seg.nim b/examples/seg2seg.nim index ca80452..cced3ba 100644 --- a/examples/seg2seg.nim +++ b/examples/seg2seg.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var d: Segment diff --git a/examples/tri2point.nim b/examples/tri2point.nim index 9e6f858..df70974 100644 --- a/examples/tri2point.nim +++ b/examples/tri2point.nim @@ -1,4 +1,4 @@ -import bumpy, common, pixie/demo +import bumpy, common var tri: seq[Vec2]