chore(): Matrix util cleanup

src/parser/parseTransformAttribute.ts

@@ -1,12 +1,15 @@
 import { iMatrix } from '../constants';
 import { reNum } from './constants';
-import { multiplyTransformMatrices } from '../util/misc/matrix';
-import { rotateMatrix } from './rotateMatrix';
-import { scaleMatrix } from './scaleMatrix';
-import { translateMatrix } from './translateMatrix';
 import { TMat2D } from '../typedefs';
 import { cleanupSvgAttribute } from '../util/internals/cleanupSvAttribute';
-import { skewXMatrix, skewYMatrix } from './skewMatrix';
+import {
+  calcRotateMatrix,
+  calcScaleMatrix,
+  calcSkewXMatrix,
+  calcSkewYMatrix,
+  calcTranslateMatrix,
+  multiplyTransformMatrices,
+} from '../util/misc/matrix';
 
 // == begin transform regexp
 const p = `(${reNum})`;
@@ -64,19 +67,19 @@ export function parseTransformAttribute(attributeValue: string): TMat2D {
 
     switch (operation) {
       case 'translate':
-        matrix = translateMatrix(arg0, arg1);
+        matrix = calcTranslateMatrix(arg0, arg1);
         break;
       case 'rotate':
-        matrix = rotateMatrix(arg0, arg1, arg2);
+        matrix = calcRotateMatrix({ angle: arg0 }, arg1, arg2);
         break;
       case 'scale':
-        matrix = scaleMatrix(arg0, arg1);
+        matrix = calcScaleMatrix(arg0, arg1);
         break;
       case 'skewX':
-        matrix = skewXMatrix(arg0);
+        matrix = calcSkewXMatrix(arg0);
         break;
       case 'skewY':
-        matrix = skewYMatrix(arg0);
+        matrix = calcSkewYMatrix(arg0);
         break;
       case 'matrix':
         matrix = [arg0, arg1, arg2, arg3, arg4, arg5];

src/shapes/Object/InteractiveObject.ts

@@ -1,9 +1,10 @@
 import { Point } from '../../Point';
-import type { AssertKeys, TCornerPoint, TDegree, TMat2D } from '../../typedefs';
+import type { AssertKeys, TCornerPoint, TDegree } from '../../typedefs';
 import { FabricObject } from './Object';
 import { degreesToRadians } from '../../util/misc/radiansDegreesConversion';
 import {
   calcRotateMatrix,
+  calcTranslateMatrix,
   multiplyTransformMatrices,
   qrDecompose,
   TQrDecomposeOut,
@@ -235,7 +236,7 @@ export class InteractiveFabricObject<
   calcOCoords(): Record<string, TOCoord> {
     const vpt = this.getViewportTransform(),
       center = this.getCenterPoint(),
-      tMatrix = [1, 0, 0, 1, center.x, center.y] as TMat2D,
+      tMatrix = calcTranslateMatrix(center.x, center.y),
       rMatrix = calcRotateMatrix({
         angle: this.getTotalAngle() - (!!this.group && this.flipX ? 180 : 0),
       }),

src/shapes/Object/ObjectGeometry.ts

@@ -13,6 +13,7 @@ import { makeBoundingBoxFromPoints } from '../../util/misc/boundingBoxFromPoints
 import { cos } from '../../util/misc/cos';
 import {
   calcRotateMatrix,
+  calcTranslateMatrix,
   composeMatrix,
   invertTransform,
   multiplyTransformMatrices,
@@ -26,7 +27,6 @@ import type { StaticCanvas } from '../../canvas/StaticCanvas';
 import { ObjectOrigin } from './ObjectOrigin';
 import { ObjectEvents } from '../../EventTypeDefs';
 import { ControlProps } from './types/ControlProps';
-import { translateMatrix } from '../../parser/translateMatrix';
 
 type TLineDescriptor = {
   o: Point;
@@ -664,7 +664,7 @@ export class ObjectGeometry<EventSpec extends ObjectEvents = ObjectEvents>
   calcACoords(): TCornerPoint {
     const rotateMatrix = calcRotateMatrix({ angle: this.angle }),
       { x, y } = this.getRelativeCenterPoint(),
-      tMatrix = translateMatrix(x, y),
+      tMatrix = calcTranslateMatrix(x, y),
       finalMatrix = multiplyTransformMatrices(tMatrix, rotateMatrix),
       dim = this._getTransformedDimensions(),
       w = dim.x / 2,

src/util/index.ts

@@ -18,8 +18,12 @@ export {
   invertTransform,
   composeMatrix,
   qrDecompose,
-  calcDimensionsMatrix,
+  calcTranslateMatrix,
   calcRotateMatrix,
+  calcScaleMatrix,
+  calcSkewXMatrix,
+  calcSkewYMatrix,
+  calcDimensionsMatrix,
   multiplyTransformMatrices,
   isIdentityMatrix,
 } from './misc/matrix';

src/util/misc/angleSkewConversion.ts

@@ -0,0 +1,8 @@
+import type { TRadian, TDegree } from '../../typedefs';
+import { degreesToRadians, radiansToDegrees } from './radiansDegreesConversion';
+
+export const angleToSkew = (angle: TDegree) =>
+  Math.tan(degreesToRadians(angle));
+
+export const skewToAngle = (value: TRadian) =>
+  radiansToDegrees(Math.atan(value));