@leafer/display-module 1.5.3 → 1.6.0

package/package.json

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

package/src/BranchRender.ts

@@ -23,9 +23,14 @@ export const BranchRender: IBranchRenderModule = {
 
         if (this.__worldOpacity) {
 
-            if (this.__.__single) {
+            const data = this.__
 
-                if (this.__.eraser === 'path') return this.__renderEraser(canvas, options)
+            if (data.dim) options.dimOpacity = data.dim === true ? 0.2 : data.dim
+            else if (data.dimskip) options.dimOpacity && (options.dimOpacity = 0)
+
+            if (data.__single) {
+
+                if (data.eraser === 'path') return this.__renderEraser(canvas, options)
 
                 const tempCanvas = canvas.getSameCanvas(false, true)
 
@@ -33,8 +38,8 @@ export const BranchRender: IBranchRenderModule = {
 
                 const nowWorld = this.__nowWorld
 
-                canvas.opacity = this.__.opacity
-                canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, this.__.__blendMode, true)
+                canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity
+                canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true)
 
                 tempCanvas.recycle(nowWorld)
 

package/src/LeafRender.ts

@@ -1,4 +1,5 @@
 import { ILeaferCanvas, IRenderOptions, ILeafRenderModule } from '@leafer/interface'
+import { Debug } from '@leafer/debug'
 
 
 export const LeafRender: ILeafRenderModule = {
@@ -6,20 +7,22 @@ export const LeafRender: ILeafRenderModule = {
     __render(canvas: ILeaferCanvas, options: IRenderOptions): void {
         if (this.__worldOpacity) {
 
+            const data = this.__
+
             canvas.setWorld(this.__nowWorld = this.__getNowWorld(options))
-            canvas.opacity = this.__.opacity
+            canvas.opacity = options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity
 
             if (this.__.__single) {
 
-                if (this.__.eraser === 'path') return this.__renderEraser(canvas, options)
+                if (data.eraser === 'path') return this.__renderEraser(canvas, options)
 
                 const tempCanvas = canvas.getSameCanvas(true, true)
                 this.__draw(tempCanvas, options, canvas)
 
                 if (this.__worldFlipped) {
-                    canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, this.__.__blendMode, true)
+                    canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, data.__blendMode, true)
                 } else {
-                    canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds, this.__.__blendMode)
+                    canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds, data.__blendMode)
                 }
 
                 tempCanvas.recycle(this.__nowWorld)
@@ -30,6 +33,8 @@ export const LeafRender: ILeafRenderModule = {
 
             }
 
+            if (Debug.showBounds) Debug.drawBounds(this, canvas, options)
+
         }
     },