@leafer/helper 1.0.0-beta → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/helper",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta.10",
   "description": "@leafer/helper",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,9 +19,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-beta"
+    "@leafer/math": "1.0.0-beta.10"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta"
+    "@leafer/interface": "1.0.0-beta.10"
   }
 }

package/src/LeafBoundsHelper.ts

@@ -8,27 +8,27 @@ export const LeafBoundsHelper = {
     },
 
     localBoxBounds(target: ILeaf): IBoundsData {
-        return target.__local
+        return target.__.isEraser ? null : target.__local
     },
 
     localEventBounds(target: ILeaf): IBoundsData {
-        return target.__layout.localStrokeBounds
+        return target.__.isEraser ? null : target.__layout.localStrokeBounds
     },
 
     localRenderBounds(target: ILeaf): IBoundsData {
-        return target.__layout.localRenderBounds
+        return target.__.isEraser ? null : target.__layout.localRenderBounds
     },
 
     maskLocalBoxBounds(target: ILeaf): IBoundsData {
-        return target.isMask ? target.__local : null
+        return target.__.isMask ? target.__local : null
     },
 
     maskLocalEventBounds(target: ILeaf): IBoundsData {
-        return target.isMask ? target.__layout.localStrokeBounds : null
+        return target.__.isMask ? target.__layout.localStrokeBounds : null
     },
 
     maskLocalRenderBounds(target: ILeaf): IBoundsData {
-        return target.isMask ? target.__layout.localRenderBounds : null
+        return target.__.isMask ? target.__layout.localRenderBounds : null
     }
 
 }

package/src/LeafHelper.ts

@@ -1,7 +1,10 @@
-import { IBranch, ILeaf, IPointData } from '@leafer/interface'
-import { Matrix, MatrixHelper, PointHelper } from '@leafer/math'
+import { IBranch, ILeaf, IMatrixData, IPointData } from '@leafer/interface'
+import { MatrixHelper, PointHelper } from '@leafer/math'
 
 
+const { copy, translate, toInnerPoint, scaleOfOuter, rotateOfOuter } = MatrixHelper
+const matrix = {} as IMatrixData
+
 export const LeafHelper = {
 
     updateAllWorldMatrix(leaf: ILeaf): void {
@@ -40,48 +43,61 @@ export const LeafHelper = {
         }
     },
 
+    worldHittable(t: ILeaf): boolean {
+        if (!t.__.hittable) return false
+        let { parent } = t
+        while (parent) {
+            if (!parent.__.hittable || !parent.__.hitChildren) return false
+            parent = parent.parent
+        }
+        return true
+    },
 
     // transform
 
-    move(t: ILeaf, x: number, y: number): void {
+    moveWorld(t: ILeaf, x: number, y: number): void {
+        t.__layout.checkUpdate()
         const local = { x, y }
-        if (t.parent) MatrixHelper.toInnerPoint(t.parent.__world, local, local, true)
+        if (t.parent) toInnerPoint(t.parent.__world, local, local, true)
         L.moveLocal(t, local.x, local.y)
     },
 
-    moveLocal(t: ILeaf, x: number, y: number): void {
-        t.x = t.__.x + x
-        t.y = t.__.y + y
+    moveLocal(t: ILeaf, x: number, y: number = 0): void {
+        t.x += x
+        t.y += y
     },
 
-    zoomOf(t: ILeaf, center: IPointData, scaleX: number, scaleY?: number, moveLayer?: ILeaf): void {
-        const local = t.parent ? PointHelper.tempToInnerOf(center, t.parent.__world) : center
+    zoomOfWorld(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, moveLayer?: ILeaf): void {
+        t.__layout.checkUpdate()
+        const local = t.parent ? PointHelper.tempToInnerOf(origin, t.parent.__world) : origin
         this.zoomOfLocal(t, local, scaleX, scaleY, moveLayer)
     },
 
-    zoomOfLocal(t: ILeaf, center: IPointData, scaleX: number, scaleY?: number, moveLayer?: ILeaf): void {
-        if (!scaleY) scaleY = scaleX
+    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY: number = scaleX, moveLayer?: ILeaf): void {
+        copy(matrix, t.__local)
+        if (moveLayer) translate(matrix, moveLayer.x, moveLayer.y)
+        scaleOfOuter(matrix, origin, scaleX, scaleY)
         if (!moveLayer) moveLayer = t
-        const { x, y } = moveLayer.__
-        const matrix = new Matrix().translate(x, y).scaleOf(center, scaleX, scaleY)
-        moveLayer.x = matrix.e
-        moveLayer.y = matrix.f
-        t.scaleX = t.__.scaleX * scaleX
-        t.scaleY = t.__.scaleY * scaleY
+        moveLayer.x += matrix.e - t.__local.e
+        moveLayer.y += matrix.f - t.__local.f
+        t.scaleX *= scaleX
+        t.scaleY *= scaleY
     },
 
-    rotateOf(t: ILeaf, center: IPointData, angle: number, moveLayer?: ILeaf): void {
-        const local = t.parent ? PointHelper.tempToInnerOf(center, t.parent.__world) : center
+    rotateOfWorld(t: ILeaf, origin: IPointData, angle: number, moveLayer?: ILeaf): void {
+        t.__layout.checkUpdate()
+        const local = t.parent ? PointHelper.tempToInnerOf(origin, t.parent.__world) : origin
         this.rotateOfLocal(t, local, angle, moveLayer)
     },
 
-    rotateOfLocal(t: ILeaf, center: IPointData, angle: number, moveLayer?: ILeaf): void {
+    rotateOfLocal(t: ILeaf, origin: IPointData, angle: number, moveLayer?: ILeaf): void {
+        copy(matrix, t.__local)
+        if (moveLayer) translate(matrix, moveLayer.x, moveLayer.y)
+        rotateOfOuter(matrix, origin, angle)
         if (!moveLayer) moveLayer = t
-        const { x, y } = moveLayer.__
-        const matrix = new Matrix().translate(x, y).rotateOf(center, angle)
-        moveLayer.x = matrix.e
-        moveLayer.y = matrix.f
-        t.rotation = t.__.rotation + angle
+        moveLayer.x += matrix.e - t.__local.e
+        moveLayer.y += matrix.f - t.__local.f
+        t.rotation += angle
     },
 
     drop(t: ILeaf, parent: IBranch): void {