Make fidget work with pixie. (#114)

Pixie is the new fidget. Replace everything in fidget here with pixie instead.

Author: treeform

.github/workflows/build.yml

@@ -23,12 +23,9 @@ jobs:
 
     - uses: jiro4989/setup-nim-action@v1
 
-    - uses: openrndr/setup-opengl@v1
-
     - name: Install GUI
       run: |
         sudo apt update
         sudo apt install -y  build-essential libalut-dev libasound2-dev libc6-dev libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev libxxf86vm-dev mesa-utils pkg-config xorg-dev xvfb
-
-    - run: xvfb-run nimble test -y
+    - run: nimble install -y
     - run: nim c -r tests/run.nim --compile --native --js

fidget.nimble

@@ -11,10 +11,11 @@ srcDir        = "src"
 requires "nim >= 1.0.0"
 requires "chroma >= 0.1.3"
 requires "typography >= 0.4.0"
-requires "flippy >= 0.4.4"
+requires "pixie >= 0.0.2"
 requires "vmath >= 0.3.1"
 requires "print >= 0.1.0"
 requires "opengl >= 1.2.3"
 requires "html5_canvas >= 1.3"
 requires "staticglfw >= 4.1.2"
 requires "cligen >= 1.0.0"
+requires "supersnappy >= 1.0.0"

src/fidget/opengl/base.nim

@@ -1,4 +1,4 @@
-import ../common, ../input, ../internal, chroma, flippy, opengl, os, perf,
+import ../common, ../input, ../internal, chroma, pixie, opengl, os, perf,
     staticglfw, times, typography/textboxes, unicode, vmath, strformat
 
 when defined(glDebugMessageCallback):
@@ -420,8 +420,8 @@ proc setWindowBounds*(min, max: Vec2) =
 
 proc takeScreenshot*(
   frame = rect(0, 0, windowFrame.x, windowFrame.y)
-): flippy.Image =
-  result = newImage("", frame.w.int, frame.h.int, 4)
+): pixie.Image =
+  result = newImage(frame.w.int, frame.h.int)
   glReadPixels(
     frame.x.GLint,
     frame.y.GLint,
@@ -431,4 +431,4 @@ proc takeScreenshot*(
     GL_UNSIGNED_BYTE,
     result.data[0].addr
   )
-  result = result.flipVertical()
+  result.flipVertical()

src/fidget/opengl/context.nim

@@ -1,5 +1,5 @@
-import buffers, chroma, flippy, hashes, opengl, os, shaders, strformat,
-    strutils, tables, textures, times, vmath
+import buffers, chroma, pixie, hashes, opengl, os, shaders, strformat,
+    strutils, tables, textures, times, vmath, formatflippy
 
 const
   quadLimit = 10_921
@@ -500,8 +500,8 @@ proc drawSprite*(
 proc fillRect*(ctx: Context, rect: Rect, color: Color) =
   const imgKey = hash("rect")
   if imgKey notin ctx.entries:
-    var image = newImage(4, 4, 4)
-    image.fill(rgba(255, 255, 255, 255))
+    var image = newImage(4, 4)
+    image.fill2(rgba(255, 255, 255, 255))
     ctx.putImage(imgKey, image)
 
   let
@@ -528,8 +528,8 @@ proc fillRoundedRect*(ctx: Context, rect: Rect, color: Color, radius: float32) =
     w = ceil(rect.w).int
     h = ceil(rect.h).int
   if hash notin ctx.entries:
-    var image = newImage(w, h, 4)
-    image.fill(rgba(255, 255, 255, 0))
+    var image = newImage(w, h)
+    image.fill2(rgba(255, 255, 255, 0))
     image.fillRoundedRect(
       rect(0, 0, rect.w, rect.h),
       radius,
@@ -564,8 +564,8 @@ proc strokeRoundedRect*(
     w = ceil(rect.w).int
     h = ceil(rect.h).int
   if hash notin ctx.entries:
-    var image = newImage(w, h, 4)
-    image.fill(rgba(255, 255, 255, 0))
+    var image = newImage(w, h)
+    image.fill2(rgba(255, 255, 255, 0))
     image.strokeRoundedRect(
       rect(0, 0, rect.w, rect.h),
       radius,
@@ -599,8 +599,8 @@ proc line*(
     pos = vec2(min(a.x, b.x), min(a.y, b.y))
 
   if hash notin ctx.entries:
-    var image = newImage(w, h, 4)
-    image.fill(rgba(255, 255, 255, 0))
+    var image = newImage(w, h)
+    image.fill2(rgba(255, 255, 255, 0))
     image.line(
       a-pos, b-pos,
       rgba(255, 255, 255, 255)