@leafer-ui/render 1.0.0-rc.2 → 1.0.0-rc.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/render",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.21",
   "description": "@leafer-ui/render",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,17 +15,17 @@
     "type": "git",
     "url": "https://github.com/leaferjs/ui.git"
   },
-  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/render",
+  "homepage": "https://github.com/leaferjs/ui/tree/main/packages/display-module/render",
   "bugs": "https://github.com/leaferjs/ui/issues",
   "keywords": [
     "leafer-ui",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/external": "1.0.0-rc.2"
+    "@leafer-ui/external": "1.0.0-rc.21"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.2",
-    "@leafer-ui/interface": "1.0.0-rc.2"
+    "@leafer/interface": "1.0.0-rc.21",
+    "@leafer-ui/interface": "1.0.0-rc.21"
   }
 }

package/src/RectRender.ts

@@ -18,19 +18,21 @@ export const RectRender: IRectRenderModule = {
 
         if (stroke) {
 
-            const { strokeAlign, strokeWidth } = this.__
-            canvas.setStroke(stroke, strokeWidth, this.__)
-            const half = strokeWidth / 2
+            const { strokeAlign, __strokeWidth } = this.__
+            if (!__strokeWidth) return
+
+            canvas.setStroke(stroke, __strokeWidth, this.__)
+            const half = __strokeWidth / 2
 
             switch (strokeAlign) {
                 case 'center':
                     canvas.strokeRect(0, 0, width, height)
                     break
                 case 'inside':
-                    canvas.strokeRect(half, half, width - strokeWidth, height - strokeWidth)
+                    canvas.strokeRect(half, half, width - __strokeWidth, height - __strokeWidth)
                     break
                 case 'outside':
-                    canvas.strokeRect(-half, -half, width + strokeWidth, height + strokeWidth)
+                    canvas.strokeRect(-half, -half, width + __strokeWidth, height + __strokeWidth)
                     break
             }
         }

package/src/UIRender.ts

@@ -1,6 +1,6 @@
 import { ILeaferCanvas, IRenderOptions } from '@leafer/interface'
 
-import { IUIRenderModule, ILeafPaint, ILeafStrokePaint } from '@leafer-ui/interface'
+import { IUIRenderModule, ILeafPaint, ILeafStrokePaint, IUI } from '@leafer-ui/interface'
 import { Paint, Effect } from '@leafer-ui/external'
 
 
@@ -26,69 +26,81 @@ export const UIRender: IUIRenderModule = {
     },
 
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void {
-        const { fill, stroke, __drawAfterFill } = this.__
-
-        this.__drawRenderPath(canvas)
-
-        if (fill) Paint.fill(this, canvas, fill as string)
-        if (__drawAfterFill) this.__drawAfterFill(canvas, options)
-        if (stroke) Paint.stroke(this, canvas, stroke as string)
+        drawFast(this, canvas, options)
     },
 
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void {
+        const data = this.__
+
+        if (data.__complex) {
 
-        if (this.__.__complex) {
+            if (data.__needComputePaint) data.__computePaint()
 
-            const { fill, stroke, __drawAfterFill } = this.__
+            const { fill, stroke, __drawAfterFill } = data
 
             this.__drawRenderPath(canvas)
 
-            if (this.__.__useEffect) {
+            if (data.__useEffect) {
 
                 const shape = Paint.shape(this, canvas, options)
+                this.__nowWorld = this.__getNowWorld(options) // restore
 
-                const { shadow, innerShadow } = this.__
+                const { shadow, innerShadow } = data
 
-                if (shadow) Effect.shadow(this, canvas, shape, options)
+                if (shadow) Effect.shadow(this, canvas, shape)
 
-                if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill as string)
+                if (fill) data.__isFills ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill(fill as string, this, canvas)
 
                 if (__drawAfterFill) this.__drawAfterFill(canvas, options)
 
-                if (innerShadow) Effect.innerShadow(this, canvas, shape, options)
+                if (innerShadow) Effect.innerShadow(this, canvas, shape)
 
-                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke as string)
+                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
 
                 if (shape.worldCanvas) shape.worldCanvas.recycle()
                 shape.canvas.recycle()
 
             } else {
 
-                if (fill) this.__.__isFills ? Paint.fills(this, canvas, fill as ILeafPaint[]) : Paint.fill(this, canvas, fill as string)
+                if (fill) data.__isFills ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill(fill as string, this, canvas)
                 if (__drawAfterFill) this.__drawAfterFill(canvas, options)
-                if (stroke) this.__.__isStrokes ? Paint.strokes(this, canvas, stroke as ILeafStrokePaint[]) : Paint.stroke(this, canvas, stroke as string)
+                if (stroke) data.__isStrokes ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke(stroke as string, this, canvas)
 
             }
 
-
         } else {
 
-            this.__drawFast(canvas, options)
+            if (data.__pathInputed) {
+                drawFast(this, canvas, options)
+            } else {
+                this.__drawFast(canvas, options)
+            }
 
         }
     },
 
-    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions): void {
-        if (!this.__worldOpacity) return
+    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void {
+        if (this.__worldOpacity) {
+            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options))
 
-        canvas.setWorld(this.__world, options.matrix)
+            const { fill, stroke } = this.__
 
-        const { fill, stroke } = this.__
-
-        this.__drawRenderPath(canvas)
+            this.__drawRenderPath(canvas)
 
-        if (fill) Paint.fill(this, canvas, '#000000')
-        if (stroke) Paint.stroke(this, canvas, '#000000')
+            if (fill && !ignoreFill) this.__.__pixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
+            if (stroke && !ignoreStroke) this.__.__pixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
+        }
     }
 
+}
+
+
+function drawFast(ui: IUI, canvas: ILeaferCanvas, options: IRenderOptions): void {
+    const { fill, stroke, __drawAfterFill } = ui.__
+
+    ui.__drawRenderPath(canvas)
+
+    if (fill) Paint.fill(fill as string, ui, canvas)
+    if (__drawAfterFill) ui.__drawAfterFill(canvas, options)
+    if (stroke) Paint.stroke(stroke as string, ui, canvas)
 }