@leafer/canvas 1.0.0-rc.6 → 1.0.0-rc.7

package/package.json

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

package/src/Canvas.ts

@@ -3,11 +3,10 @@ import { ICanvasAttr, ITextMetrics, ICanvasContext2D, IPath2D, IObject, InnerId,
 function contextAttr(realName?: string) {
     return (target: Canvas, key: string) => {
         if (!realName) realName = key
-        const property: IObject & ThisType<Canvas> = {
+        Object.defineProperty(target, key, {
             get() { return (this.context as IObject)[realName] },
             set(value: unknown) { (this.context as IObject)[realName] = value }
-        }
-        Object.defineProperty(target, key, property)
+        } as ThisType<Canvas>)
     }
 }
 

package/src/HitCanvasManager.ts

@@ -11,12 +11,12 @@ export class HitCanvasManager extends CanvasManager implements IHitCanvasManager
     protected imageTypeList: ILeafList = new LeafList()
 
     public getImageType(leaf: ILeaf, size: IScreenSizeData): IHitCanvas {
-        this.imageTypeList.push(leaf)
+        this.imageTypeList.add(leaf)
         return Creator.hitCanvas(size)
     }
 
     public getPathType(leaf: ILeaf): IHitCanvas {
-        this.pathTypeList.push(leaf)
+        this.pathTypeList.add(leaf)
         return Creator.hitCanvas()
     }
 

package/src/LeaferCanvasBase.ts

@@ -283,7 +283,7 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     public fillWorld(bounds: IBoundsData, color: string | object, blendMode?: IBlendMode): void {
         if (blendMode) this.blendMode = blendMode
         this.fillStyle = color
-        temp.copy(bounds).scale(this.pixelRatio)
+        temp.set(bounds).scale(this.pixelRatio)
         this.fillRect(temp.x, temp.y, temp.width, temp.height)
         if (blendMode) this.blendMode = 'source-over'
     }
@@ -291,20 +291,20 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     public strokeWorld(bounds: IBoundsData, color: string | object, blendMode?: IBlendMode): void {
         if (blendMode) this.blendMode = blendMode
         this.strokeStyle = color
-        temp.copy(bounds).scale(this.pixelRatio)
+        temp.set(bounds).scale(this.pixelRatio)
         this.strokeRect(temp.x, temp.y, temp.width, temp.height)
         if (blendMode) this.blendMode = 'source-over'
     }
 
     public clearWorld(bounds: IBoundsData, ceilPixel?: boolean): void {
-        temp.copy(bounds).scale(this.pixelRatio)
+        temp.set(bounds).scale(this.pixelRatio)
         if (ceilPixel) temp.ceil()
         this.clearRect(temp.x, temp.y, temp.width, temp.height)
     }
 
     public clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void {
         this.beginPath()
-        temp.copy(bounds).scale(this.pixelRatio)
+        temp.set(bounds).scale(this.pixelRatio)
         if (ceilPixel) temp.ceil()
         this.rect(temp.x, temp.y, temp.width, temp.height)
         this.clip()
@@ -324,7 +324,7 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     }
 
     // 需要有 manager变量
-    public getSameCanvas(useSameWorldTransform?: boolean): ILeaferCanvas {
+    public getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas {
         const { width, height, pixelRatio } = this
 
         const options = { width, height, pixelRatio }
@@ -333,6 +333,7 @@ export class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
         canvas.save()
 
         if (useSameWorldTransform) canvas.useWorldTransform({ ...this.worldTransform })
+        if (useSameSmooth) canvas.smooth = this.smooth
 
         return canvas
     }

package/types/index.d.ts

@@ -146,7 +146,7 @@ declare class LeaferCanvasBase extends Canvas implements ILeaferCanvas {
     clipWorld(bounds: IBoundsData, ceilPixel?: boolean): void;
     clear(): void;
     isSameSize(size: IScreenSizeData): boolean;
-    getSameCanvas(useSameWorldTransform?: boolean): ILeaferCanvas;
+    getSameCanvas(useSameWorldTransform?: boolean, useSameSmooth?: boolean): ILeaferCanvas;
     getBiggerCanvas(addWidth: number, addHeight: number): ILeaferCanvas;
     recycle(): void;
     updateRender(): void;