Update

cocos · Oct 20, 2024 · 5eb3040 · 5eb3040
1 parent 632b7e9
commit 5eb3040
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 36 deletions.
diff --git a/cocos/2d/components/label.ts b/cocos/2d/components/label.ts
@@ -955,7 +955,7 @@ export class Label extends UIRenderer {
             this._applyFontTexture();
         }
         if (this._assembler) {
-            this._assembler.updateRenderData(this);
+            this._assembler.updateRenderData!(this);
         }
     }
 
@@ -1033,7 +1033,7 @@ export class Label extends UIRenderer {
                 }
                 this.changeMaterialForDefine();
                 if (this._assembler) {
-                    this._assembler.updateRenderData(this);
+                    this._assembler.updateRenderData!(this);
                 }
             }
         } else {

diff --git a/cocos/2d/components/sprite.ts b/cocos/2d/components/sprite.ts
@@ -34,6 +34,7 @@ import { PixelFormat } from '../../asset/assets/asset-enum';
 import { TextureBase } from '../../asset/assets/texture-base';
 import { Material, RenderTexture } from '../../asset/assets';
 import { NodeEventType } from '../../scene-graph/node-event';
+import { RenderData } from '../renderer/render-data';
 
 /**
  * @en
@@ -604,11 +605,11 @@ export class Sprite extends UIRenderer {
 
         if (!this._renderData) {
             if (this._assembler && this._assembler.createData) {
-                this._renderData = this._assembler.createData(this);
-                this._renderData!.material = this.getRenderMaterial(0);
+                this._renderData = this._assembler.createData(this) as RenderData;
+                this._renderData.material = this.getRenderMaterial(0);
                 this.markForUpdateRenderData();
                 if (this.spriteFrame) {
-                    this._assembler.updateUVs(this);
+                    this._assembler.updateUVs!(this);
                 }
                 this._updateColor();
             }
@@ -679,7 +680,7 @@ export class Sprite extends UIRenderer {
 
     private _updateUVs (): void {
         if (this._assembler) {
-            this._assembler.updateUVs(this);
+            this._assembler.updateUVs!(this);
         }
     }
 

diff --git a/cocos/2d/framework/ui-renderer.ts b/cocos/2d/framework/ui-renderer.ts
@@ -401,8 +401,9 @@ export class UIRenderer extends Renderer {
      * @deprecated Since v3.7.0, this is an engine private interface that will be removed in the future.
      */
     public updateRenderer (): void {
-        if (this._assembler) {
-            this._assembler.updateRenderData(this);
+        const assembler = this._assembler;
+        if (assembler && assembler.updateRenderData) {
+            assembler.updateRenderData(this);
         }
         this._renderFlag = this._canRender();
         this._renderEntity.enabled = this._renderFlag;

diff --git a/cocos/2d/renderer/base.ts b/cocos/2d/renderer/base.ts
@@ -39,7 +39,7 @@ export interface IAssembler {
     fillBuffers? (comp: UIRenderer, renderer: IBatcher): void;
     updateUVs? (comp: UIRenderer, ...args: any[]): void;
     updateColor? (comp: UIRenderer): void;
-    updateRenderData (comp: UIRenderer): void;
+    updateRenderData? (comp: UIRenderer): void;
     update? (comp: UIRenderer, dt: number): void;
     resetAssemblerData? (data: any): void;
     removeData? (data: BaseRenderData): void;

diff --git a/cocos/2d/renderer/batcher-2d.ts b/cocos/2d/renderer/batcher-2d.ts
@@ -436,7 +436,7 @@ export class Batcher2D implements IBatcher {
             }
         }
 
-        assembler.fillBuffers(comp, this);
+        if (assembler.fillBuffers) assembler.fillBuffers(comp, this);
     }
 
     /**

diff --git a/cocos/dragon-bones/assembler/simple.ts b/cocos/dragon-bones/assembler/simple.ts
@@ -129,13 +129,6 @@ let _accessor: StaticVBAccessor = null!;
  * 可通过 `UI.simple` 获取该组装器。
  */
 class Simple implements IAssembler {
-    fillBuffers (comp: ArmatureDisplay, renderer: IBatcher): void {
-
-    }
-    updateUVs (comp: ArmatureDisplay): void {
-
-    }
-
     private accessor = _accessor;
     private vCount = 32767;
     ensureAccessor (): StaticVBAccessor {

diff --git a/cocos/particle-2d/motion-streak-2d-assembler.ts b/cocos/particle-2d/motion-streak-2d-assembler.ts
@@ -233,10 +233,6 @@ class MotionStreakAssembler implements IAssembler {
         }
     }
 
-    updateColor (comp: MotionStreak): void {
-        // do nothing
-    }
-
     fillBuffers (comp: MotionStreak, renderer: IBatcher): void {
         const renderData = comp.renderData!;
         const chunk = renderData.chunk;

diff --git a/cocos/particle-2d/particle-system-2d-assembler.ts b/cocos/particle-2d/particle-system-2d-assembler.ts
@@ -26,33 +26,18 @@
 import type { IAssembler, IAssemblerManager } from '../2d/renderer/base';
 import { ParticleSystem2D } from './particle-system-2d';
 import { MeshRenderData } from '../2d/renderer/render-data';
-import type { IBatcher } from '../2d/renderer/i-batcher';
 import { cclegacy } from '../core';
 
 export class Particle2DAssembler implements IAssembler {
     maxParticleDeltaTime = 0;
 
-    updateUVs (comp: ParticleSystem2D): void {
-
-    }
-
-    updateColor (comp: ParticleSystem2D): void {
-
-    }
-
     createData (comp: ParticleSystem2D): MeshRenderData {
         return MeshRenderData.add();
     }
 
     removeData (data: MeshRenderData): void {
         MeshRenderData.remove(data);
     }
-
-    updateRenderData (): void {
-    }
-
-    fillBuffers (comp: ParticleSystem2D, renderer: IBatcher): void {
-    }
 }
 
 export const particle2DAssembler = new Particle2DAssembler();