change to suppor new vmath mat and rotate.

Author: treeform

src/pixie/contexts.nim

@@ -551,7 +551,7 @@ proc scale*(ctx: Context, x, y: float32) {.inline, raises: [].} =
 
 proc rotate*(ctx: Context, angle: float32) {.inline, raises: [].} =
   ## Adds a rotation to the transformation matrix.
-  ctx.mat = ctx.mat * rotate(-angle)
+  ctx.mat = ctx.mat * rotate(angle)
 
 proc resetTransform*(ctx: Context) {.inline, raises: [].} =
   ## Resets the current transform to the identity matrix.

src/pixie/fileformats/svg.nim

@@ -261,8 +261,8 @@ proc parseSvgProperties(node: XmlNode, inherited: SvgProperties): SvgProperties
         m[0, 1] = parseFloat(arr[1])
         m[1, 0] = parseFloat(arr[2])
         m[1, 1] = parseFloat(arr[3])
-        m[2, 0] = parseFloat(arr[4])
-        m[2, 1] = parseFloat(arr[5])
+        m[0, 2] = parseFloat(arr[4])
+        m[1, 2] = parseFloat(arr[5])
         result.transform = result.transform * m
       elif f.startsWith("translate("):
         let

src/pixie/fontformats/opentype.nim

@@ -2404,9 +2404,9 @@ proc parseCompositeGlyph(opentype: OpenType, offset: int): Path =
 
     var subPath = opentype.parseGlyfGlyph(component.glyphId)
     subPath.transform(mat3(
-      component.xScale, component.scale10, 0.0,
-      component.scale01, component.yScale, 0.0,
-      component.dx, component.dy, 1.0
+      component.xScale, component.scale10, component.dx,
+      component.scale01, component.yScale, component.dy,
+      0.0, 0.0, 1.0
     ))
 
     result.addPath(subPath)

src/pixie/images.nim

@@ -664,18 +664,23 @@ proc draw*(
     transform = transform * scale(vec2(1/2, 1/2))
 
   let
+    translation = transform.pos
     hasRotationOrScaling = not(dx == vec2(1, 0) and dy == vec2(0, 1))
     smooth = not(
       dx.length == 1.0 and
       dy.length == 1.0 and
-      transform[2, 0].fractional == 0.0 and
-      transform[2, 1].fractional == 0.0
+      translation.x.fractional == 0.0 and
+      translation.y.fractional == 0.0
     )
 
   if hasRotationOrScaling or smooth:
     a.drawSmooth(b, transform, blendMode)
   else:
-    a.blendRect(b, ivec2(transform[2, 0].int32, transform[2, 1].int32), blendMode)
+    a.blendRect(
+      b,
+      ivec2(translation.x.int32, translation.y.int32),
+      blendMode
+    )
 
 proc drawTiled*(
   dst, src: Image, mat: Mat3, blendMode = NormalBlend

src/pixie/paths.nim

@@ -839,7 +839,7 @@ proc commandsToShapes(
 
       ArcParams(
         radii: radii,
-        rotMat: rotate(-radians),
+        rotMat: rotate(radians),
         center: center,
         theta: theta,
         delta: delta

tests/all.nim

@@ -12,15 +12,4 @@ import
   test_ppm,
   test_qoi,
   test_svg,
-  ../examples/text,
-  ../examples/text_spans,
-  ../examples/square,
-  ../examples/line,
-  ../examples/rounded_rectangle,
-  ../examples/heart,
-  ../examples/masking,
-  ../examples/gradient,
-  ../examples/image_tiled,
-  ../examples/shadow,
-  ../examples/blur,
-  ../examples/tiger
+  test_examples

tests/contexts/setTransform_2.png

@@ -201,18 +201,18 @@ block:
 block:
   let ctx = newContext(newImage(300, 150))
 
-  ctx.setTransform(mat3(1, 0.2, 0, 0.8, 1, 0, 0, 0, 1))
+  ctx.setTransform(mat3(1, 0.8, 0, 0.2, 1, 0, 0, 0, 1))
   ctx.fillRect(0, 0, 100, 100)
 
   ctx.image.xray("tests/contexts/setTransform_1.png")
 
 block:
   let ctx = newContext(newImage(300, 150))
 
-  ctx.setTransform(mat3(1, 0.2, 0, 0.8, 1, 0, 0, 0, 1))
+  ctx.setTransform(mat3(1, 0.8, 0, 0.2, 1, 0, 0, 0, 1))
   ctx.fillRect(0, 0, 100, 100)
 
-  ctx.image.xray("tests/contexts/resetTransform_1.png")
+  ctx.image.xray("tests/contexts/setTransform_2.png")
 
 block:
   let ctx = newContext(newImage(300, 150))
@@ -225,7 +225,7 @@ block:
 block:
   let ctx = newContext(newImage(300, 150))
 
-  ctx.transform(mat3(1, 0, 0, 1.7, 1, 0, 0, 0, 1))
+  ctx.transform(mat3(1, 1.7, 0, 0, 1, 0, 0, 0, 1))
   ctx.fillStyle = "gray"
   ctx.fillRect(40, 40, 50, 20)
   ctx.fillRect(40, 90, 50, 20)

tests/test_contexts.nim

@@ -0,0 +1,51 @@
+import os, osproc, strformat, pixie
+
+const examples = [
+  "text",
+  "text_spans",
+  "square",
+  "line",
+  "rounded_rectangle",
+  "heart",
+  "masking",
+  "gradient",
+  "image_tiled",
+  "shadow",
+  "blur",
+  "tiger"
+]
+
+const updateThreshold = 1.0
+
+let
+  generatedDir = "tmp/generated/examples"
+  xrayDir = "tmp/xray/examples"
+
+createDir(generatedDir)
+createDir(xrayDir)
+
+for example in examples:
+  let
+    nimFile = &"examples/{example}.nim"
+    masterPath = &"examples/{example}.png"
+    generatedPath = generatedDir / &"{example}.png"
+    xrayPath = xrayDir / &"{example}.png"
+    run = execCmdEx(
+      &"nim r -d:release {nimFile} -- {generatedPath}",
+      workingDir = getCurrentDir()
+    )
+
+  if run.exitCode != 0:
+    echo run.output
+    raise newException(PixieError, &"Example {example} failed with exit code {run.exitCode}")
+
+  let
+    generated = readImage(generatedPath)
+    master = readImage(masterPath)
+    (score, xray) = diff(generated, master)
+
+  xray.writeFile(xrayPath)
+  echo &"xray {masterPath} -> {score:0.6f}"
+
+  if score > updateThreshold:
+    copyFile(generatedPath, masterPath)

tests/test_examples.nim

@@ -195,9 +195,9 @@ block:
   a.draw(
     b,
     mat3(
-      -0.5, -4.371138828673793e-008, 0.0,
-      -4.371138828673793e-008, 0.5, 0.0,
-      292.0, 45.0, 1.0
+      -0.5, -4.371138828673793e-008, 292.0,
+      -4.371138828673793e-008, 0.5, 45.0,
+      0.0, 0.0, 1.0
     )
   )