@leafer/helper 1.0.0-beta.2 → 1.0.0-beta.5

package/package.json

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

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

@@ -40,45 +40,54 @@ 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 {
         const local = { x, y }
         if (t.parent) MatrixHelper.toInnerPoint(t.parent.__world, local, local, true)
         L.moveLocal(t, local.x, local.y)
     },
 
-    moveLocal(t: ILeaf, x: number, y: number): void {
+    moveLocal(t: ILeaf, x: number, y: number = 0): void {
         t.x = t.__.x + x
         t.y = 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 {
+        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 {
+    zoomOfLocal(t: ILeaf, origin: IPointData, scaleX: number, scaleY?: number, moveLayer?: ILeaf): void {
         if (!scaleY) scaleY = scaleX
         if (!moveLayer) moveLayer = t
         const { x, y } = moveLayer.__
-        const matrix = new Matrix().translate(x, y).scaleOf(center, scaleX, scaleY)
+        const matrix = new Matrix().translate(x, y).scaleOfOuter(origin, scaleX, scaleY)
         moveLayer.x = matrix.e
         moveLayer.y = matrix.f
         t.scaleX = t.__.scaleX * scaleX
         t.scaleY = 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 {
+        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 {
         if (!moveLayer) moveLayer = t
         const { x, y } = moveLayer.__
-        const matrix = new Matrix().translate(x, y).rotateOf(center, angle)
+        const matrix = new Matrix().translate(x, y).rotateOfOuter(origin, angle)
         moveLayer.x = matrix.e
         moveLayer.y = matrix.f
         t.rotation = t.__.rotation + angle