@leafer/display 1.5.3 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,17 +22,17 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.5.3",
-    "@leafer/data": "1.5.3",
-    "@leafer/layout": "1.5.3",
-    "@leafer/display-module": "1.5.3",
-    "@leafer/event": "1.5.3",
-    "@leafer/decorator": "1.5.3",
-    "@leafer/helper": "1.5.3",
-    "@leafer/debug": "1.5.3",
-    "@leafer/platform": "1.5.3"
+    "@leafer/math": "1.6.0",
+    "@leafer/data": "1.6.0",
+    "@leafer/layout": "1.6.0",
+    "@leafer/display-module": "1.6.0",
+    "@leafer/event": "1.6.0",
+    "@leafer/decorator": "1.6.0",
+    "@leafer/helper": "1.6.0",
+    "@leafer/debug": "1.6.0",
+    "@leafer/platform": "1.6.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.5.3"
+    "@leafer/interface": "1.6.0"
   }
 }

package/src/Leaf.ts

@@ -99,9 +99,6 @@ export class Leaf implements ILeaf {
     // branch 
     public children?: ILeaf[]
 
-    // other
-    public noBounds?: boolean
-
     public destroyed: boolean
 
 
@@ -115,8 +112,10 @@ export class Leaf implements ILeaf {
     public reset(data?: ILeafInputData): void {
         if (this.leafer) this.leafer.forceRender(this.__world) // fix: add old bounds rendering
 
-        this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1 }
-        if (data !== null) this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
+        if (data as any !== 0) {  // 设为 0 时可用于 text boxStyle 节省开销
+            this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1 }
+            if (data !== null) this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 }
+        }
 
         this.__worldOpacity = 1
 
@@ -335,9 +334,10 @@ export class Leaf implements ILeaf {
     public __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData {
         if (options.matrix) {
             if (!this.__cameraWorld) this.__cameraWorld = {} as IMatrixWithBoundsScaleData
-            const cameraWorld = this.__cameraWorld
-            multiplyParent(this.__world, options.matrix, cameraWorld, undefined, this.__world)
+            const cameraWorld = this.__cameraWorld, world = this.__world
+            multiplyParent(world, options.matrix, cameraWorld, undefined, world)
             toOuterOf(this.__layout.renderBounds, cameraWorld, cameraWorld)
+            cameraWorld.half !== world.half && (cameraWorld.half = world.half)
             return cameraWorld
         } else {
             return this.__world
@@ -561,7 +561,7 @@ export class Leaf implements ILeaf {
 
     public __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
-    public __draw(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
+    public __draw(_canvas: ILeaferCanvas, _options: IRenderOptions, _originCanvas?: ILeaferCanvas): void { }
 
 
     public __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }

package/types/index.d.ts

@@ -51,7 +51,6 @@ declare class Leaf implements ILeaf {
     __captureMap?: IEventListenerMap;
     __bubbleMap?: IEventListenerMap;
     children?: ILeaf[];
-    noBounds?: boolean;
     destroyed: boolean;
     constructor(data?: ILeafInputData);
     reset(data?: ILeafInputData): void;
@@ -154,7 +153,7 @@ declare class Leaf implements ILeaf {
     __updateHitCanvas(): void;
     __render(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
-    __draw(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
+    __draw(_canvas: ILeaferCanvas, _options: IRenderOptions, _originCanvas?: ILeaferCanvas): void;
     __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions, _ignoreFill?: boolean, _ignoreStroke?: boolean): void;
     __updateWorldOpacity(): void;