@leafer/renderer 1.0.0-beta.9 → 1.0.0-rc.10

package/package.json

@@ -1,31 +1,30 @@
 {
   "name": "@leafer/renderer",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.10",
   "description": "@leafer/renderer",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
   "main": "src/index.ts",
+  "types": "types/index.d.ts",
   "files": [
-    "src"
+    "src",
+    "types",
+    "dist"
   ],
   "repository": {
     "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/event": "1.0.0-beta.9",
-    "@leafer/math": "1.0.0-beta.9",
-    "@leafer/data": "1.0.0-beta.9",
-    "@leafer/platform": "1.0.0-beta.9",
-    "@leafer/debug": "1.0.0-beta.9"
+    "@leafer/core": "1.0.0-rc.10"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta.9"
+    "@leafer/interface": "1.0.0-rc.10"
   }
 }

package/src/Renderer.ts

@@ -1,9 +1,5 @@
 import { ILeaf, ILeaferCanvas, IRenderer, IRendererConfig, IEventListenerId, IBounds, IFunction, IRenderOptions } from '@leafer/interface'
-import { AnimateEvent, LayoutEvent, RenderEvent, ResizeEvent } from '@leafer/event'
-import { Bounds } from '@leafer/math'
-import { DataHelper } from '@leafer/data'
-import { Platform } from '@leafer/platform'
-import { Debug, Run } from '@leafer/debug'
+import { AnimateEvent, LayoutEvent, RenderEvent, ResizeEvent, ImageManager, Bounds, DataHelper, Platform, Debug, Run } from '@leafer/core'
 
 
 const debug = Debug.get('Renderer')
@@ -77,7 +73,10 @@ export class Renderer implements IRenderer {
             this.emitRender(RenderEvent.START)
             this.renderOnce(callback)
             this.emitRender(RenderEvent.END, this.totalBounds)
+
+            ImageManager.clearRecycled()
         } catch (e) {
+            this.rendering = false
             debug.error(e)
         }
 
@@ -135,7 +134,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) })
     }
 
@@ -145,7 +144,7 @@ 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()
 
@@ -157,7 +156,7 @@ export class Renderer implements IRenderer {
             canvas.clipWorld(bounds, true)
         }
 
-        this.__render(bounds, realBounds)
+        this.__render(bounds, includes, realBounds)
         canvas.restore()
 
         Run.end(t)
@@ -169,14 +168,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')
@@ -189,6 +188,7 @@ export class Renderer implements IRenderer {
 
         if (Debug.showHitView) this.renderHitView(options)
         if (Debug.showBoundsView) this.renderBoundsView(options)
+        this.canvas.updateRender()
     }
 
     public renderHitView(_options: IRenderOptions): void { }
@@ -204,7 +204,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 +214,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,7 +232,7 @@ 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')
             }
         }
     }
@@ -240,7 +243,7 @@ export class Renderer implements IRenderer {
             if (item.updatedList) item.updatedList.list.some(leaf => {
                 empty = (!leaf.__world.width || !leaf.__world.height)
                 if (empty) {
-                    debug.warn(leaf.innerName, ': none bounds')
+                    if (!leaf.isLeafer) debug.tip(leaf.innerName, ': empty')
                     empty = (!leaf.isBranch || leaf.isBranchLeaf) // render object
                 }
                 return empty

package/types/index.d.ts

@@ -0,0 +1,46 @@
+import { IRenderer, ILeaf, ILeaferCanvas, IBounds, IRendererConfig, IRenderOptions, IEventListenerId, IFunction } from '@leafer/interface';
+import { ResizeEvent, LayoutEvent } from '@leafer/core';
+
+declare class Renderer implements IRenderer {
+    target: ILeaf;
+    canvas: ILeaferCanvas;
+    updateBlocks: IBounds[];
+    FPS: number;
+    totalTimes: number;
+    times: number;
+    running: boolean;
+    rendering: boolean;
+    waitAgain: boolean;
+    changed: boolean;
+    config: IRendererConfig;
+    protected renderBounds: IBounds;
+    protected renderOptions: IRenderOptions;
+    protected totalBounds: IBounds;
+    protected __eventIds: IEventListenerId[];
+    protected get needFill(): boolean;
+    constructor(target: ILeaf, canvas: ILeaferCanvas, userConfig?: IRendererConfig);
+    start(): void;
+    stop(): void;
+    update(): void;
+    requestLayout(): void;
+    render(callback?: IFunction): void;
+    renderAgain(): void;
+    renderOnce(callback?: IFunction): void;
+    partRender(): void;
+    clipRender(block: IBounds): void;
+    fullRender(): void;
+    protected __render(bounds: IBounds, includes?: boolean, realBounds?: IBounds): void;
+    renderHitView(_options: IRenderOptions): void;
+    renderBoundsView(_options: IRenderOptions): void;
+    addBlock(block: IBounds): void;
+    mergeBlocks(): void;
+    protected __requestRender(): void;
+    protected __onResize(e: ResizeEvent): void;
+    protected __onLayoutEnd(event: LayoutEvent): void;
+    protected emitRender(type: string, bounds?: IBounds, options?: IRenderOptions): void;
+    protected __listenEvents(): void;
+    protected __removeListenEvents(): void;
+    destroy(): void;
+}
+
+export { Renderer };