@leafer/canvas 1.5.3 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/canvas",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "@leafer/canvas",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,15 +22,15 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/file": "1.5.3",
-    "@leafer/list": "1.5.3",
-    "@leafer/math": "1.5.3",
-    "@leafer/data": "1.5.3",
-    "@leafer/path": "1.5.3",
-    "@leafer/debug": "1.5.3",
-    "@leafer/platform": "1.5.3"
+    "@leafer/file": "1.6.1",
+    "@leafer/list": "1.6.1",
+    "@leafer/math": "1.6.1",
+    "@leafer/data": "1.6.1",
+    "@leafer/path": "1.6.1",
+    "@leafer/debug": "1.6.1",
+    "@leafer/platform": "1.6.1"
   },
   "devDependencies": {
-    "@leafer/interface": "1.5.3"
+    "@leafer/interface": "1.6.1"
   }
 }

package/src/LeaferCanvasBase.ts

@@ -1,4 +1,4 @@
-import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ILeaferCanvasConfig, IExportOptions, IMatrixData, IBoundsData, IAutoBounds, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule, IBlendMode, IExportImageType, IExportFileType, IBlob, ICursorType, ILeaferCanvasView, IRadiusPointData, IObject } from '@leafer/interface'
+import { IBounds, ILeaferCanvas, ICanvasStrokeOptions, ILeaferCanvasConfig, IExportOptions, IMatrixData, IBoundsData, IAutoBounds, IScreenSizeData, IResizeEventListener, IMatrixWithBoundsData, IPointData, InnerId, ICanvasManager, IWindingRule, IBlendMode, IExportImageType, IExportFileType, IBlob, ICursorType, ILeaferCanvasView, IRadiusPointData, IObject, IMatrixWithOptionHalfData } from '@leafer/interface'
 import { Bounds, tempBounds, BoundsHelper, MatrixHelper, IncrementId } from '@leafer/math'
 import { Creator, Platform } from '@leafer/platform'
 import { DataHelper } from '@leafer/data'
@@ -6,7 +6,7 @@ import { DataHelper } from '@leafer/data'
 import { Canvas } from './Canvas'
 
 
-const { copy } = MatrixHelper
+const { copy, multiplyParent } = MatrixHelper, { round } = Math
 const minSize: IScreenSizeData = { width: 1, height: 1, pixelRatio: 1 }
 
 export const canvasSizeAttrs = ['width', 'height', 'pixelRatio']
@@ -28,6 +28,9 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     public get pixelWidth(): number { return this.width * this.pixelRatio }
     public get pixelHeight(): number { return this.height * this.pixelRatio }
 
+    public get pixelSnap(): boolean { return this.config.pixelSnap }
+    public set pixelSnap(value: boolean) { this.config.pixelSnap = value }
+
     public get allowBackgroundColor(): boolean { return this.view && this.parentView }
 
     public bounds: IBounds
@@ -126,32 +129,24 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
 
     public setCursor(_cursor: ICursorType | ICursorType[]): void { }
 
-    public setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void {
-        const { pixelRatio } = this
-        const w = this.worldTransform
-        if (parentMatrix) {
-
-            const { a, b, c, d, e, f } = parentMatrix
-            this.setTransform(
-                w.a = ((matrix.a * a) + (matrix.b * c)) * pixelRatio,
-                w.b = ((matrix.a * b) + (matrix.b * d)) * pixelRatio,
-                w.c = ((matrix.c * a) + (matrix.d * c)) * pixelRatio,
-                w.d = ((matrix.c * b) + (matrix.d * d)) * pixelRatio,
-                w.e = (((matrix.e * a) + (matrix.f * c) + e)) * pixelRatio,
-                w.f = (((matrix.e * b) + (matrix.f * d) + f)) * pixelRatio
-            )
+    public setWorld(matrix: IMatrixWithOptionHalfData, parentMatrix?: IMatrixData): void {
+        const { pixelRatio, pixelSnap } = this, w = this.worldTransform
 
-        } else {
+        if (parentMatrix) multiplyParent(matrix, parentMatrix, w)
 
-            this.setTransform(
-                w.a = matrix.a * pixelRatio,
-                w.b = matrix.b * pixelRatio,
-                w.c = matrix.c * pixelRatio,
-                w.d = matrix.d * pixelRatio,
-                w.e = matrix.e * pixelRatio,
-                w.f = matrix.f * pixelRatio
-            )
+        w.a = matrix.a * pixelRatio
+        w.b = matrix.b * pixelRatio
+        w.c = matrix.c * pixelRatio
+        w.d = matrix.d * pixelRatio
+        w.e = matrix.e * pixelRatio
+        w.f = matrix.f * pixelRatio
+
+        if (pixelSnap) {
+            if (matrix.half && (matrix.half * pixelRatio) % 2) w.e = round(w.e - 0.5) + 0.5, w.f = round(w.f - 0.5) + 0.5
+            else w.e = round(w.e), w.f = round(w.f)
         }
+
+        this.setTransform(w.a, w.b, w.c, w.d, w.e, w.f)
     }
 
     public useWorldTransform(worldTransform?: IMatrixData): void {
@@ -311,12 +306,12 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
 
     // 需要有 manager变量
     public getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas {
-        const canvas = this.manager ? this.manager.get(this.size) : Creator.canvas({ ...this.size })
+        const { size, pixelSnap } = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas({ ...size })
         canvas.save()
 
-
         if (useSameWorldTransform) copy(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform()
         if (useSameSmooth) canvas.smooth = this.smooth
+        canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap)
 
         return canvas
     }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ICanvasManager, ILeaferCanvas, IScreenSizeData, ICanvasAttr, InnerId, ICanvasContext2D, IBlendMode, IMatrixData, IPath2D, IWindingRule, ITextMetrics, IBounds, IBoundsData, ILeaferCanvasConfig, ILeaferCanvasView, IExportFileType, IExportOptions, IBlob, IExportImageType, IAutoBounds, IResizeEventListener, ICursorType, ICanvasStrokeOptions, IPointData, IRadiusPointData, IMatrixWithBoundsData, IPathDrawer } from '@leafer/interface';
+import { ICanvasManager, ILeaferCanvas, IScreenSizeData, ICanvasAttr, InnerId, ICanvasContext2D, IBlendMode, IMatrixData, IPath2D, IWindingRule, ITextMetrics, IBounds, IBoundsData, ILeaferCanvasConfig, ILeaferCanvasView, IExportFileType, IExportOptions, IBlob, IExportImageType, IAutoBounds, IResizeEventListener, ICursorType, IMatrixWithOptionHalfData, ICanvasStrokeOptions, IPointData, IRadiusPointData, IMatrixWithBoundsData, IPathDrawer } from '@leafer/interface';
 
 declare class CanvasManager implements ICanvasManager {
     list: ILeaferCanvas[];
@@ -91,6 +91,8 @@ declare class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     get pixelRatio(): number;
     get pixelWidth(): number;
     get pixelHeight(): number;
+    get pixelSnap(): boolean;
+    set pixelSnap(value: boolean);
     get allowBackgroundColor(): boolean;
     bounds: IBounds;
     clientBounds: IBoundsData;
@@ -116,7 +118,7 @@ declare class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     startAutoLayout(_autoBounds: IAutoBounds, _listener: IResizeEventListener): void;
     stopAutoLayout(): void;
     setCursor(_cursor: ICursorType | ICursorType[]): void;
-    setWorld(matrix: IMatrixData, parentMatrix?: IMatrixData): void;
+    setWorld(matrix: IMatrixWithOptionHalfData, parentMatrix?: IMatrixData): void;
     useWorldTransform(worldTransform?: IMatrixData): void;
     setStroke(color: string | object, strokeWidth: number, options?: ICanvasStrokeOptions): void;
     setStrokeOptions(options: ICanvasStrokeOptions): void;