fix: transform matrix config

Brooooooklyn · Jan 19, 2021 · 9dcddf2 · 9dcddf2
1 parent cb2561a
commit 9dcddf2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/__test__/draw.spec.ts b/__test__/draw.spec.ts
@@ -411,7 +411,21 @@ test('rect', async (t) => {
   await snapshotImage(t)
 })
 
-test.todo('resetTransform')
+test('resetTransform', async (t) => {
+  const { ctx } = t.context
+  // Skewed rects
+  ctx.transform(1, 0, 1.7, 1, 0, 0)
+  ctx.fillStyle = 'gray'
+  ctx.fillRect(40, 40, 50, 20)
+  ctx.fillRect(40, 90, 50, 20)
+
+  // Non-skewed rects
+  ctx.resetTransform()
+  ctx.fillStyle = 'red'
+  ctx.fillRect(40, 40, 50, 20)
+  ctx.fillRect(40, 90, 50, 20)
+  await snapshotImage(t)
+})
 
 test('save-restore', async (t) => {
   const { ctx } = t.context

diff --git a/__test__/snapshots/resetTransform.png b/__test__/snapshots/resetTransform.png
diff --git a/src/sk.rs b/src/sk.rs
@@ -1924,13 +1924,13 @@ impl Transform {
   }
 
   #[inline]
-  /// | A B C |
-  /// | D E F |
+  /// | A C E |
+  /// | B D F |
   /// | 0 0 1 |
   /// [interface.js](skia/modules/canvaskit/interface.js)
   pub fn invert(&self) -> Option<Self> {
     let m = [
-      self.a, self.b, self.c, self.d, self.e, self.f, 0f32, 0f32, 1f32,
+      self.a, self.c, self.e, self.b, self.d, self.f, 0f32, 0f32, 1f32,
     ];
     // Find the determinant by the sarrus rule. https://en.wikipedia.org/wiki/Rule_of_Sarrus
     let det = m[0] * m[4] * m[8] + m[1] * m[5] * m[6] + m[2] * m[3] * m[7]