@leafer/renderer 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/renderer",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "@leafer/renderer",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.6.0"
+    "@leafer/core": "1.6.2"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.0"
+    "@leafer/interface": "1.6.2"
   }
 }

package/src/Renderer.ts

@@ -64,6 +64,16 @@ export class Renderer implements IRenderer {
 
     public checkRender(): void {
         if (this.running) {
+            const { target } = this
+            if (target.isApp) {
+                target.emit(RenderEvent.CHILD_START, target);
+                (target.children as ILeaferBase[]).forEach(leafer => {
+                    leafer.renderer.FPS = this.FPS
+                    leafer.renderer.checkRender()
+                })
+                target.emit(RenderEvent.CHILD_END, target)
+            }
+
             if (this.changed && this.canvas.view) this.render()
             this.target.emit(RenderEvent.NEXT)
         }
@@ -162,7 +172,7 @@ export class Renderer implements IRenderer {
         canvas.clearWorld(bounds, true)
         canvas.clipWorld(bounds, true)
 
-        this.__render(bounds, block.includes(this.target.__world), realBounds)
+        this.__render(bounds, realBounds)
         canvas.restore()
 
         Run.end(t)
@@ -174,14 +184,14 @@ export class Renderer implements IRenderer {
 
         canvas.save()
         canvas.clear()
-        this.__render(canvas.bounds, true)
+        this.__render(canvas.bounds)
         canvas.restore()
 
         Run.end(t)
     }
 
-    protected __render(bounds: IBounds, includes?: boolean, realBounds?: IBounds,): void {
-        const { canvas } = this, options: IRenderOptions = includes ? { includes } : { bounds, includes }
+    protected __render(bounds: IBounds, realBounds?: IBounds): void {
+        const { canvas } = this, includes = bounds.includes(this.target.__world), options: IRenderOptions = includes ? { includes } : { bounds, includes }
 
         if (this.needFill) canvas.fillWorld(bounds, this.config.fill)
         if (Debug.showRepaint) Debug.drawRepaint(canvas, bounds)
@@ -212,8 +222,8 @@ export class Renderer implements IRenderer {
 
     protected __requestRender(): void {
         const target = this.target as ILeaferBase
-        if (target.parentApp) return target.parentApp.renderer.update(false) // App 模式下统一走 app 控制渲染帧
-        if (this.requestTime) return
+        if (this.requestTime || !target) return
+        if (target.parentApp) return target.parentApp.requestRender(false) // App 模式下统一走 app 控制渲染帧
 
         const requestTime = this.requestTime = Date.now()
         Platform.requestRender(() => {
@@ -221,15 +231,6 @@ export class Renderer implements IRenderer {
             this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - requestTime)))
             this.requestTime = 0
 
-            if (target.isApp) {
-                target.emit(RenderEvent.CHILD_START, target);
-                (target.children as ILeaferBase[]).forEach(leafer => {
-                    leafer.renderer.FPS = this.FPS
-                    leafer.renderer.checkRender()
-                })
-                target.emit(RenderEvent.CHILD_END, target)
-            }
-
             this.checkRender()
 
         })

package/types/index.d.ts

@@ -33,7 +33,7 @@ declare class Renderer implements IRenderer {
     partRender(): void;
     clipRender(block: IBounds): void;
     fullRender(): void;
-    protected __render(bounds: IBounds, includes?: boolean, realBounds?: IBounds): void;
+    protected __render(bounds: IBounds, realBounds?: IBounds): void;
     addBlock(block: IBounds): void;
     mergeBlocks(): void;
     protected __requestRender(): void;