0.7.6: Update deps.

Author: treeform

fidget.nimble

@@ -1,22 +1,22 @@
 # Package
 
-version       = "0.7.5"
+version       = "0.7.6"
 author        = "treeform"
 description   = "Fidget - UI Library"
 license       = "MIT"
 srcDir        = "src"
 
 # Dependencies
 
-requires "nim >= 1.0.0"
+requires "nim >= 1.4.0"
 requires "chroma >= 0.2.3"
-requires "typography >= 0.7.5"
-requires "pixie >= 1.0.3"
-requires "vmath >= 0.4.0"
+requires "typography >= 0.7.8"
+requires "pixie >= 1.1.2"
+requires "vmath >= 1.0.0"
 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"
-requires "bumpy >= 1.0.0"
+requires "bumpy >= 1.0.3"

src/fidget.nim

@@ -1,7 +1,7 @@
 import algorithm, chroma, fidget/common, fidget/input, json, macros, strutils,
     tables, vmath, bumpy
 
-export chroma, common, input
+export chroma, common, input, vmath
 
 when defined(js):
   import fidget/htmlbackend

src/fidget/common.nim

@@ -252,7 +252,7 @@ when not defined(js):
       of vBottom: Bottom
 
 mouse = Mouse()
-mouse.pos = Vec2()
+mouse.pos = vec2(0)
 
 proc dumpTree*(node: Node, indent = "") =
   echo indent, node.id, node.screenBox

src/fidget/opengl/context.nim

@@ -336,7 +336,7 @@ proc setVertColor(buf: var seq[uint8], i: int, color: ColorRGBA) =
   buf[i * 4 + 3] = color.a
 
 func `*`*(m: Mat4, v: Vec2): Vec2 =
-  (m * vec3(v, 0.0)).xy
+  (m * vec3(v.x, v.y, 0.0)).xy
 
 proc drawQuad*(
   ctx: Context,
@@ -704,7 +704,7 @@ proc beginFrame*(ctx: Context, frameSize: Vec2) =
   beginFrame(
     ctx,
     frameSize,
-    ortho(0, frameSize.x, frameSize.y, 0, -1000, 1000)
+    ortho[float32](0.0, frameSize.x, frameSize.y, 0, -1000.0, 1000.0)
   )
 
 proc endFrame*(ctx: Context) =
@@ -720,17 +720,17 @@ proc translate*(ctx: Context, v: Vec2) =
   ## Translate the internal transform.
   ctx.mat = ctx.mat * translate(vec3(v))
 
-proc rotate*(ctx: Context, angle: float) =
+proc rotate*(ctx: Context, angle: float32) =
   ## Rotates the internal transform.
-  ctx.mat = ctx.mat * rotateZ(angle).mat4()
+  ctx.mat = ctx.mat * rotateZ(angle)
 
-proc scale*(ctx: Context, scale: float) =
+proc scale*(ctx: Context, s: float32) =
   ## Scales the internal transform.
-  ctx.mat = ctx.mat * scaleMat(scale)
+  ctx.mat = ctx.mat * scale(vec3(s))
 
-proc scale*(ctx: Context, scale: Vec2) =
+proc scale*(ctx: Context, s: Vec2) =
   ## Scales the internal transform.
-  ctx.mat = ctx.mat * scaleMat(vec3(scale, 1))
+  ctx.mat = ctx.mat * scale(vec3(s.x, s.y, 1))
 
 proc saveTransform*(ctx: Context) =
   ## Pushes a transform onto the stack.
@@ -751,5 +751,5 @@ proc fromScreen*(ctx: Context, windowFrame: Vec2, v: Vec2): Vec2 =
 
 proc toScreen*(ctx: Context, windowFrame: Vec2, v: Vec2): Vec2 =
   ## Takes a point from current transform and translates it to screen.
-  result = (ctx.mat * vec3(v, 1)).xy
+  result = (ctx.mat * vec3(v.x, v.y, 1)).xy
   result.y = -result.y + windowFrame.y

src/fidget/opengl/shaders.nim

@@ -370,7 +370,7 @@ proc setUniform*(shader: Shader, name: string, v: Vec4) =
   shader.setUniform(name, cGL_FLOAT, bkVEC4, values)
 
 proc setUniform*(shader: Shader, name: string, m: Mat4) =
-  shader.setUniform(name, cGL_FLOAT, bkMAT4, m)
+  shader.setUniform(name, cGL_FLOAT, bkMAT4, cast[array[16, float32]](m))
 
 proc setUniform*(shader: Shader, name: string, b: bool) =
   var values: array[16, int32]