refactor: Transform 可绑定多个更新对象

packages-user/client-modules/src/render/fx/image3d.ts

@@ -7,7 +7,7 @@ import { EffectBase } from './base';
 
 export class Image3DEffect
     extends EffectBase<void>
-    implements ITransformUpdatable
+    implements ITransformUpdatable<Transform3D>
 {
     /** 图片的模型变换 */
     private model: Transform3D = new Transform3D();
@@ -65,7 +65,7 @@ export class Image3DEffect
      * @param model 模型变换
      */
     setModel(model: Transform3D) {
-        this.model.bind();
+        this.model.unbind(this);
         this.model = model;
         model.bind(this);
     }
@@ -75,7 +75,7 @@ export class Image3DEffect
      * @param model 视角变换
      */
     setView(view: Transform3D) {
-        this.view.bind();
+        this.view.unbind(this);
         this.view = view;
         view.bind(this);
     }
@@ -85,7 +85,7 @@ export class Image3DEffect
      * @param model 投影变换
      */
     setProj(proj: Transform3D) {
-        this.proj.bind();
+        this.proj.unbind(this);
         this.proj = proj;
         proj.bind(this);
     }

packages-user/client-modules/src/render/map/element.ts

@@ -1,8 +1,4 @@
-import {
+import { MotaOffscreenCanvas2D, RenderItem } from '@motajs/render-core';
-    MotaOffscreenCanvas2D,
-    RenderItem,
-    Transform
-} from '@motajs/render-core';
 import { ILayerState, state } from '@user/data-state';
 import { IMapRenderer } from './types';
 import { MapRenderer } from './renderer';
@@ -51,10 +47,6 @@ export class MapRender extends RenderItem {
         this.sizeGL(width, height);
     }
 
-    updateTransform(transform: Transform): void {
-        super.updateTransform(transform);
-    }
-
     protected render(canvas: MotaOffscreenCanvas2D): void {
         this.renderer.clear(true, true);
         const map = this.renderer.render();

packages-user/client-modules/src/render/map/renderer.ts

@@ -42,7 +42,7 @@ import {
     DYNAMIC_RESERVE,
     MOVING_TOLERANCE
 } from '../shared';
-import { ITransformUpdatable, Transform } from '@motajs/render-core';
+import { Transform } from '@motajs/render-core';
 import { MapViewport } from './viewport';
 import { INSTANCED_COUNT } from './constant';
 import { StaticBlockStatus } from './status';
@@ -54,11 +54,7 @@ const enum BackgroundType {
 }
 
 export class MapRenderer
-    implements
+    implements IMapRenderer, IMovingRenderer, IMapDataGetter
-        IMapRenderer,
-        IMovingRenderer,
-        ITransformUpdatable<Transform>,
-        IMapDataGetter
 {
     //#region 实例属性
 
@@ -296,7 +292,7 @@ export class MapRenderer
     //#region 状态控制
 
     setTransform(transform: Transform): void {
-        this.transform.bind();
+        this.transform.unbind(this);
         this.transform = transform;
         transform.bind(this);
         this.viewport.bindTransform(transform);

packages/render-core/src/item.ts

@@ -301,7 +301,7 @@ export abstract class RenderItem<E extends ERenderItemEvent = ERenderItemEvent>
     /** 该元素的变换矩阵 */
     private _transform: Transform = new Transform();
     set transform(value: Transform) {
-        this._transform.bind();
+        this._transform.unbind(this);
         this._transform = value;
         value.bind(this);
     }
@@ -798,7 +798,7 @@ export abstract class RenderItem<E extends ERenderItemEvent = ERenderItemEvent>
         this._parent = void 0;
         parent.requestSort();
         parent.update();
-        this._transform.bind();
+        this._transform.unbind(this);
         if (!success) return false;
         this._root?.disconnect(this);
         this._root = void 0;

packages/render-core/src/transform.ts

@@ -1,7 +1,11 @@
 import { mat3, mat4, ReadonlyMat3, ReadonlyVec3, vec2, vec3 } from 'gl-matrix';
 
 export interface ITransformUpdatable<T> {
-    updateTransform?(transform: T): void;
+    /**
+     * 当变换矩阵更新时触发
+     * @param transform 触发更新的变换矩阵
+     */
+    updateTransform(transform: T): void;
 }
 
 export class Transform {
@@ -17,14 +21,26 @@ export class Transform {
     private modified: boolean = false;
 
     /** 绑定的可更新元素 */
-    bindedObject?: ITransformUpdatable<Transform>;
+    bindedObject: Set<ITransformUpdatable<Transform>> = new Set();
 
     /**
      * 对这个变换实例添加绑定对象，当矩阵变换时，自动调用其 update 函数
      * @param obj 要绑定的对象
      */
-    bind(obj?: ITransformUpdatable<Transform>) {
+    bind(obj: ITransformUpdatable<Transform>) {
-        this.bindedObject = obj;
+        this.bindedObject.add(obj);
+    }
+
+    /**
+     * 取消对象的绑定
+     * @param obj 要取消绑定的对象
+     */
+    unbind(obj: ITransformUpdatable<Transform>) {
+        this.bindedObject.delete(obj);
+    }
+
+    private emitUpdate() {
+        this.bindedObject.forEach(v => v.updateTransform(this));
     }
 
     /**
@@ -38,7 +54,7 @@ export class Transform {
         this.scaleY = 1;
         this.rad = 0;
         this.modified = false;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
     }
 
     /**
@@ -49,7 +65,7 @@ export class Transform {
         this.scaleX *= x;
         this.scaleY *= y;
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -61,7 +77,7 @@ export class Transform {
         this.x += x;
         this.y += y;
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -76,7 +92,7 @@ export class Transform {
             this.rad -= n * Math.PI * 2;
         }
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -88,7 +104,7 @@ export class Transform {
         this.scaleX = x;
         this.scaleY = y;
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -100,7 +116,7 @@ export class Transform {
         this.x = x;
         this.y = y;
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -111,7 +127,7 @@ export class Transform {
         mat3.rotate(this.mat, this.mat, rad - this.rad);
         this.rad = rad;
         this.modified = true;
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -138,7 +154,7 @@ export class Transform {
             mat3.fromValues(a, b, 0, c, d, 0, e, f, 1)
         );
         this.calAttributes();
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -161,7 +177,7 @@ export class Transform {
     ): this {
         mat3.set(this.mat, a, b, 0, c, d, 0, e, f, 1);
         this.calAttributes();
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -285,14 +301,26 @@ export class Transform3D {
     mat: mat4 = mat4.create();
 
     /** 绑定的可更新元素 */
-    bindedObject?: ITransformUpdatable<Transform3D>;
+    bindedObject: Set<ITransformUpdatable<Transform3D>> = new Set();
 
     /**
-     * 绑定可更新对象
+     * 对这个变换实例添加绑定对象，当矩阵变换时，自动调用其 update 函数
      * @param obj 要绑定的对象
      */
-    bind(obj?: ITransformUpdatable<Transform3D>) {
+    bind(obj: ITransformUpdatable<Transform3D>) {
-        this.bindedObject = obj;
+        this.bindedObject.add(obj);
+    }
+
+    /**
+     * 取消对象的绑定
+     * @param obj 要取消绑定的对象
+     */
+    unbind(obj: ITransformUpdatable<Transform3D>) {
+        this.bindedObject.delete(obj);
+    }
+
+    private emitUpdate() {
+        this.bindedObject.forEach(v => v.updateTransform(this));
     }
 
     /**
@@ -300,7 +328,7 @@ export class Transform3D {
      */
     reset(): this {
         mat4.identity(this.mat);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -312,7 +340,7 @@ export class Transform3D {
      */
     scale(x: number, y: number, z: number): this {
         mat4.scale(this.mat, this.mat, [x, y, z]);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -324,7 +352,7 @@ export class Transform3D {
      */
     translate(x: number, y: number, z: number): this {
         mat4.translate(this.mat, this.mat, [x, y, z]);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -335,7 +363,7 @@ export class Transform3D {
      */
     rotate(rad: number, axis: vec3): this {
         mat4.rotate(this.mat, this.mat, rad, axis);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -371,7 +399,7 @@ export class Transform3D {
      */
     lookAt(eye: vec3, center: vec3, up: vec3): this {
         mat4.lookAt(this.mat, eye, center, up);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -384,7 +412,7 @@ export class Transform3D {
      */
     perspective(fovy: number, aspect: number, near: number, far: number): this {
         mat4.perspective(this.mat, fovy, aspect, near, far);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }
 
@@ -406,7 +434,7 @@ export class Transform3D {
         far: number
     ): this {
         mat4.ortho(this.mat, left, right, bottom, top, near, far);
-        this.bindedObject?.updateTransform?.(this);
+        this.emitUpdate();
         return this;
     }