@leafer/renderer 1.0.0-rc.3 → 1.0.0-rc.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/renderer",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.30",
   "description": "@leafer/renderer",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -15,16 +15,16 @@
     "type": "git",
     "url": "https://github.com/leaferjs/leafer.git"
   },
-  "homepage": "https://github.com/leaferjs/leafer/tree/main/packages/renderer",
+  "homepage": "https://github.com/leaferjs/leafer/tree/main/packages/partner/renderer",
   "bugs": "https://github.com/leaferjs/leafer/issues",
   "keywords": [
     "leafer",
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.3"
+    "@leafer/core": "1.0.0-rc.30"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.3"
+    "@leafer/interface": "1.0.0-rc.30"
   }
 }

package/src/Renderer.ts

@@ -19,6 +19,7 @@ export class Renderer implements IRenderer {
 
     public waitAgain: boolean
     public changed: boolean
+    public ignore: boolean
 
     public config: IRendererConfig = {
         usePartRender: true,
@@ -109,6 +110,11 @@ export class Renderer implements IRenderer {
         } else {
             this.requestLayout()
 
+            if (this.ignore) {
+                this.ignore = this.rendering = false
+                return
+            }
+
             this.emitRender(RenderEvent.BEFORE)
 
             if (this.config.usePartRender && this.totalTimes > 1) {
@@ -134,7 +140,7 @@ export class Renderer implements IRenderer {
         const { canvas, updateBlocks: list } = this
         if (!list) return debug.warn('PartRender: need update attr')
 
-        if (list.some(block => block.includes(this.target.__world))) this.mergeBlocks()
+        this.mergeBlocks()
         list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty()) this.clipRender(block) })
     }
 
@@ -144,19 +150,19 @@ export class Renderer implements IRenderer {
 
         const bounds = block.getIntersect(canvas.bounds)
         const includes = block.includes(this.target.__world)
-        const realBounds = new Bounds().copy(bounds)
+        const realBounds = new Bounds(bounds)
 
         canvas.save()
 
         if (includes && !Debug.showRepaint) {
             canvas.clear()
         } else {
-            bounds.spread(1 + 1 / this.canvas.pixelRatio).ceil()
+            bounds.spread(10 + 1 / this.canvas.pixelRatio).ceil()
             canvas.clearWorld(bounds, true)
             canvas.clipWorld(bounds, true)
         }
 
-        this.__render(bounds, realBounds)
+        this.__render(bounds, includes, realBounds)
         canvas.restore()
 
         Run.end(t)
@@ -168,14 +174,14 @@ export class Renderer implements IRenderer {
 
         canvas.save()
         canvas.clear()
-        this.__render(canvas.bounds)
+        this.__render(canvas.bounds, true)
         canvas.restore()
 
         Run.end(t)
     }
 
-    protected __render(bounds: IBounds, realBounds?: IBounds): void {
-        const options: IRenderOptions = bounds?.includes(this.target.__world) ? {} : { bounds }
+    protected __render(bounds: IBounds, includes?: boolean, realBounds?: IBounds,): void {
+        const options: IRenderOptions = bounds.includes(this.target.__world) ? { includes } : { bounds, includes }
 
         if (this.needFill) this.canvas.fillWorld(bounds, this.config.fill)
         if (Debug.showRepaint) this.canvas.strokeWorld(bounds, 'red')
@@ -204,7 +210,7 @@ export class Renderer implements IRenderer {
         const { updateBlocks: list } = this
         if (list) {
             const bounds = new Bounds()
-            bounds.setByList(list)
+            bounds.setList(list)
             list.length = 0
             list.push(bounds)
         }
@@ -214,10 +220,13 @@ export class Renderer implements IRenderer {
         const startTime = Date.now()
         Platform.requestRender(() => {
             this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - startTime)))
-            if (this.changed) {
-                if (this.running && this.canvas.view) this.render()
+
+            if (this.running) {
+                this.target.emit(AnimateEvent.FRAME)
+                if (this.changed && this.canvas.view) this.render()
+                this.target.emit(RenderEvent.NEXT)
             }
-            if (this.running) this.target.emit(AnimateEvent.FRAME)
+
             if (this.target) this.__requestRender()
         })
     }
@@ -229,9 +238,14 @@ export class Renderer implements IRenderer {
             const bounds = new Bounds(0, 0, width, height)
             if (!bounds.includes(this.target.__world) || this.needFill || !e.samePixelRatio) {
                 this.addBlock(this.canvas.bounds)
-                this.target.forceUpdate('blendMode')
+                this.target.forceUpdate('surface')
+                return
             }
         }
+
+        // 需要象征性派发一下渲染事件
+        this.addBlock(new Bounds(0, 0, 1, 1))
+        this.changed = true
     }
 
     protected __onLayoutEnd(event: LayoutEvent): void {
@@ -240,7 +254,7 @@ export class Renderer implements IRenderer {
             if (item.updatedList) item.updatedList.list.some(leaf => {
                 empty = (!leaf.__world.width || !leaf.__world.height)
                 if (empty) {
-                    if (!leaf.isLeafer) debug.warn(leaf.innerName, ': empty')
+                    if (!leaf.isLeafer) debug.tip(leaf.innerName, ': empty')
                     empty = (!leaf.isBranch || leaf.isBranchLeaf) // render object
                 }
                 return empty
@@ -271,9 +285,7 @@ export class Renderer implements IRenderer {
         if (this.target) {
             this.stop()
             this.__removeListenEvents()
-            this.target = null
-            this.canvas = null
-            this.config = null
+            this.target = this.canvas = this.config = null
         }
     }
 }

package/types/index.d.ts

@@ -12,6 +12,7 @@ declare class Renderer implements IRenderer {
     rendering: boolean;
     waitAgain: boolean;
     changed: boolean;
+    ignore: boolean;
     config: IRendererConfig;
     protected renderBounds: IBounds;
     protected renderOptions: IRenderOptions;
@@ -29,7 +30,7 @@ declare class Renderer implements IRenderer {
     partRender(): void;
     clipRender(block: IBounds): void;
     fullRender(): void;
-    protected __render(bounds: IBounds, realBounds?: IBounds): void;
+    protected __render(bounds: IBounds, includes?: boolean, realBounds?: IBounds): void;
     renderHitView(_options: IRenderOptions): void;
     renderBoundsView(_options: IRenderOptions): void;
     addBlock(block: IBounds): void;