Update GUI code

packages/core/src/2d/assembler/ISpriteAssembler.ts

@@ -1,4 +1,4 @@
-import { Vector2, Vector3 } from "@galacean/engine-math";
+import { Matrix, Vector2, Vector3 } from "@galacean/engine-math";
 import { ISpriteRenderer } from "./ISpriteRenderer";
 
 /**
@@ -8,6 +8,7 @@ export interface ISpriteAssembler {
   resetData(renderer: ISpriteRenderer, vertexCount?: number): void;
   updatePositions(
     renderer: ISpriteRenderer,
+    worldMatrix: Matrix,
     width: number,
     height: number,
     pivot: Vector2,

packages/core/src/2d/assembler/ISpriteRenderer.ts

@@ -1,7 +1,6 @@
 import { Color } from "@galacean/engine-math";
 import { PrimitiveChunkManager } from "../../RenderPipeline/PrimitiveChunkManager";
 import { SubPrimitiveChunk } from "../../RenderPipeline/SubPrimitiveChunk";
-import { Transform } from "../../Transform";
 import { SpriteTileMode } from "../enums/SpriteTileMode";
 import { Sprite } from "../sprite";
 
@@ -10,7 +9,6 @@ export interface ISpriteRenderer {
   color?: Color;
   tileMode?: SpriteTileMode;
   tiledAdaptiveThreshold?: number;
-  _transform: Transform;
   _subChunk: SubPrimitiveChunk;
   _getChunkManager(): PrimitiveChunkManager;
 }

packages/core/src/2d/assembler/SimpleSpriteAssembler.ts

@@ -9,7 +9,7 @@ import { ISpriteRenderer } from "./ISpriteRenderer";
 @StaticInterfaceImplement<ISpriteAssembler>()
 export class SimpleSpriteAssembler {
   private static _rectangleTriangles = [0, 1, 2, 2, 1, 3];
-  private static _worldMatrix = new Matrix();
+  private static _matrix = new Matrix();
 
   static resetData(renderer: ISpriteRenderer): void {
     const manager = renderer._getChunkManager();
@@ -22,6 +22,7 @@ export class SimpleSpriteAssembler {
 
   static updatePositions(
     renderer: ISpriteRenderer,
+    worldMatrix: Matrix,
     width: number,
     height: number,
     pivot: Vector2,
@@ -31,10 +32,9 @@ export class SimpleSpriteAssembler {
     const { sprite } = renderer;
     const { x: pivotX, y: pivotY } = pivot;
     // Renderer's worldMatrix
-    const worldMatrix = SimpleSpriteAssembler._worldMatrix;
-    const { elements: wE } = worldMatrix;
+    const { elements: wE } = SimpleSpriteAssembler._matrix;
     // Parent's worldMatrix
-    const { elements: pWE } = renderer._transform.worldMatrix;
+    const { elements: pWE } = worldMatrix;
     const sx = flipX ? -width : width;
     const sy = flipY ? -height : height;
     (wE[0] = pWE[0] * sx), (wE[1] = pWE[1] * sx), (wE[2] = pWE[2] * sx);

packages/core/src/2d/assembler/SlicedSpriteAssembler.ts

@@ -12,7 +12,7 @@ export class SlicedSpriteAssembler {
     0, 1, 4, 1, 5, 4, 1, 2, 5, 2, 6, 5, 2, 3, 6, 3, 7, 6, 4, 5, 8, 5, 9, 8, 5, 6, 9, 6, 10, 9, 6, 7, 10, 7, 11, 10, 8,
     9, 12, 9, 13, 12, 9, 10, 13, 10, 14, 13, 10, 11, 14, 11, 15, 14
   ];
-  private static _worldMatrix = new Matrix();
+  private static _matrix = new Matrix();
   private static _row = new Array<number>(4);
   private static _column = new Array<number>(4);
 
@@ -27,6 +27,7 @@ export class SlicedSpriteAssembler {
 
   static updatePositions(
     renderer: ISpriteRenderer,
+    worldMatrix: Matrix,
     width: number,
     height: number,
     pivot: Vector2,
@@ -83,10 +84,9 @@ export class SlicedSpriteAssembler {
     const localTransX = width * pivotX;
     const localTransY = height * pivotY;
     // Renderer's worldMatrix.
-    const worldMatrix = SlicedSpriteAssembler._worldMatrix;
-    const { elements: wE } = worldMatrix;
+    const { elements: wE } = SlicedSpriteAssembler._matrix;
     // Parent's worldMatrix.
-    const { elements: pWE } = renderer._transform.worldMatrix;
+    const { elements: pWE } = worldMatrix;
     const sx = flipX ? -1 : 1;
     const sy = flipY ? -1 : 1;
     (wE[0] = pWE[0] * sx), (wE[1] = pWE[1] * sx), (wE[2] = pWE[2] * sx);

packages/core/src/2d/assembler/TiledSpriteAssembler.ts

@@ -12,7 +12,7 @@ import { SimpleSpriteAssembler } from "./SimpleSpriteAssembler";
  */
 @StaticInterfaceImplement<ISpriteAssembler>()
 export class TiledSpriteAssembler {
-  private static _worldMatrix = new Matrix();
+  private static _matrix = new Matrix();
   private static _posRow = new DisorderedArray<number>();
   private static _posColumn = new DisorderedArray<number>();
   private static _uvRow = new DisorderedArray<number>();
@@ -35,6 +35,7 @@ export class TiledSpriteAssembler {
 
   static updatePositions(
     renderer: ISpriteRenderer,
+    worldMatrix: Matrix,
     width: number,
     height: number,
     pivot: Vector2,
@@ -53,10 +54,9 @@ export class TiledSpriteAssembler {
     const localTransX = width * pivotX;
     const localTransY = height * pivotY;
     // Renderer's worldMatrix
-    const { _worldMatrix: worldMatrix } = TiledSpriteAssembler;
-    const { elements: wE } = worldMatrix;
+    const { elements: wE } = TiledSpriteAssembler._matrix;
     // Parent's worldMatrix
-    const { elements: pWE } = renderer._transform.worldMatrix;
+    const { elements: pWE } = worldMatrix;
     const sx = flipX ? -1 : 1;
     const sy = flipY ? -1 : 1;
     let wE0: number, wE1: number, wE2: number;

packages/core/src/2d/sprite/SpriteMask.ts

@@ -154,7 +154,10 @@ export class SpriteMask extends Renderer implements ISpriteRenderer {
         this.shaderData.setTexture(SpriteMask._textureProperty, null);
       }
       this._sprite = value;
-      this._calDefaultSize();
+      if (this._customWidth === undefined || this._customHeight === undefined) {
+        this._calDefaultSize();
+        this._dirtyUpdateFlag |= RendererUpdateFlags.AllPositionAndBounds;
+      }
     }
   }
 
@@ -274,7 +277,15 @@ export class SpriteMask extends Renderer implements ISpriteRenderer {
 
     // Update position
     if (this._dirtyUpdateFlag & RendererUpdateFlags.AllPositions) {
-      SimpleSpriteAssembler.updatePositions(this, this.width, this.height, sprite.pivot, this._flipX, this._flipY);
+      SimpleSpriteAssembler.updatePositions(
+        this,
+        this._transformEntity.transform.worldMatrix,
+        this.width,
+        this.height,
+        sprite.pivot,
+        this._flipX,
+        this._flipY
+      );
       this._dirtyUpdateFlag &= ~RendererUpdateFlags.AllPositions;
     }
 

packages/core/src/2d/sprite/SpriteRenderer.ts

@@ -349,6 +349,7 @@ export class SpriteRenderer extends Renderer implements ISpriteRenderer {
     if (this._dirtyUpdateFlag & RendererUpdateFlags.AllPositions) {
       this._assembler.updatePositions(
         this,
+        this._transformEntity.transform.worldMatrix,
         this.width,
         this.height,
         sprite.pivot,

packages/core/src/ComponentsDependencies.ts

@@ -11,7 +11,6 @@ export class ComponentsDependencies {
   private static _invDependenciesMap = new Map<ComponentConstructor, ComponentConstructor[]>();
 
   static _dependenciesMap = new Map<ComponentConstructor, DependentInfo>();
-  static _inheritedMap = new Map<ComponentConstructor, Boolean>();
 
   /**
    * @internal
@@ -40,7 +39,13 @@ export class ComponentsDependencies {
    * @internal
    */
   static _removeCheck(entity: Entity, type: ComponentConstructor): void {
+    const components = entity._components;
+    const n = components.length;
     while (type !== Component) {
+      let count = 0;
+      for (let i = 0; i < n; i++) {
+        if (components[i] instanceof type && ++count > 1) return;
+      }
       const invDependencies = ComponentsDependencies._invDependenciesMap.get(type);
       if (invDependencies) {
         for (let i = 0, len = invDependencies.length; i < len; i++) {
@@ -53,15 +58,6 @@ export class ComponentsDependencies {
     }
   }
 
-  /**
-   * @internal
-   */
-  static _createChildCheck(child: Entity, type: ComponentConstructor): void {
-    if (ComponentsDependencies._inheritedMap.get(type)) {
-      child.addComponent(type);
-    }
-  }
-
   /**
    * @internal
    */
@@ -94,12 +90,6 @@ export class ComponentsDependencies {
   private constructor() {}
 }
 
-export function markAsInherited() {
-  return function <T extends ComponentConstructor>(target: T): void {
-    ComponentsDependencies._inheritedMap.set(target, true);
-  };
-}
-
 /**
  * Declare dependent component.
  * @param component - Dependent component

packages/core/src/ComponentsManager.ts

@@ -1,4 +1,4 @@
-import { IUICanvas, IUIElement } from "@galacean/engine-design";
+import { IUICanvas } from "@galacean/engine-design";
 import { Camera } from "./Camera";
 import { Component } from "./Component";
 import { Renderer } from "./Renderer";
@@ -39,9 +39,6 @@ export class ComponentsManager {
   // Render
   private _onUpdateRenderers: DisorderedArray<Renderer> = new DisorderedArray();
 
-  // UIElement
-  private _onUpdateUIElements: DisorderedArray<IUIElement> = new DisorderedArray();
-
   // Delay dispose active/inActive Pool
   private _componentsContainerPool: Component[][] = [];
 
@@ -182,17 +179,6 @@ export class ComponentsManager {
     renderer._onUpdateIndex = -1;
   }
 
-  addOnUpdateUIElement(element: IUIElement): void {
-    element._onUIUpdateIndex = this._onUpdateRenderers.length;
-    this._onUpdateUIElements.add(element);
-  }
-
-  removeOnUpdateUIElement(element: IUIElement): void {
-    const replaced = this._onUpdateUIElements.deleteByIndex(element._onUIUpdateIndex);
-    replaced && (replaced._onUIUpdateIndex = element._onUIUpdateIndex);
-    element._onUIUpdateIndex = -1;
-  }
-
   addPendingDestroyScript(component: Script): void {
     this._pendingDestroyScripts.push(component);
   }
@@ -269,12 +255,6 @@ export class ComponentsManager {
     );
   }
 
-  callUIOnUpdate(deltaTime: number): void {
-    this._onUpdateUIElements.forEach((element: IUIElement) => {
-      element._onUpdate();
-    });
-  }
-
   handlingInvalidScripts(): void {
     const { _disposeDestroyScripts: pendingDestroyScripts, _pendingDestroyScripts: disposeDestroyScripts } = this;
     this._disposeDestroyScripts = disposeDestroyScripts;

packages/core/src/Engine.ts

@@ -480,9 +480,7 @@ export class Engine extends EventDispatcher {
     for (let i = 0, n = scenes.length; i < n; i++) {
       const scene = scenes[i];
       if (!scene.isActive || scene.destroyed) continue;
-      const componentsManager = scene._componentsManager;
-      componentsManager.callUIOnUpdate(deltaTime);
-      componentsManager.callRendererOnUpdate(deltaTime);
+      scene._componentsManager.callRendererOnUpdate(deltaTime);
       scene._updateShaderData();
     }
 

packages/core/src/Entity.ts

@@ -99,8 +99,9 @@ export class Entity extends EngineObject {
   /** @internal */
   _updateFlagManager: UpdateFlagManager = new UpdateFlagManager();
   /** @internal */
-  _transform: Transform;
+  _modifyFlagManager: UpdateFlagManager;
 
+  private _transform: Transform;
   private _templateResource: ReferResource;
   private _parent: Entity = null;
   private _activeChangedComponents: Component[];
@@ -228,6 +229,13 @@ export class Entity extends EngineObject {
     ComponentsDependencies._addCheck(this, type);
     const component = new type(this, ...args) as InstanceType<T>;
     this._components.push(component);
+
+    // @todo: temporary solution
+    if (component instanceof Transform) {
+      const transform = this._transform;
+      this._transform = component;
+      transform?.destroy();
+    }
     component._setActive(true, ActiveChangeFlag.All);
     return component;
   }
@@ -550,7 +558,7 @@ export class Entity extends EngineObject {
    * @internal
    */
   _removeComponent(component: Component): void {
-    ComponentsDependencies._removeCheck(this, component.constructor as any);
+    ComponentsDependencies._removeCheck(this, component.constructor as ComponentConstructor);
     const components = this._components;
     components.splice(components.indexOf(component), 1);
   }
@@ -625,21 +633,21 @@ export class Entity extends EngineObject {
    * @internal
    */
   _registerModifyListener(onChange: (flag: EntityModifyFlags) => void): void {
-    (this._updateFlagManager ||= new UpdateFlagManager()).addListener(onChange);
+    (this._modifyFlagManager ||= new UpdateFlagManager()).addListener(onChange);
   }
 
   /**
    * @internal
    */
   _unRegisterModifyListener(onChange: (flag: EntityModifyFlags) => void): void {
-    this._updateFlagManager?.removeListener(onChange);
+    this._modifyFlagManager?.removeListener(onChange);
   }
 
   /**
    * @internal
    */
   _dispatchModify(flag: EntityModifyFlags, param?: any): void {
-    this._updateFlagManager?.dispatch(flag, param);
+    this._modifyFlagManager?.dispatch(flag, param);
   }
 
   private _addToChildrenList(index: number, child: Entity): void {

packages/core/src/RenderPipeline/RenderQueue.ts

@@ -186,7 +186,7 @@ export class RenderQueue {
 
         renderState._applyStates(
           engine,
-          renderer._transformEntity.transform._isFrontFaceInvert(),
+          renderer._isFrontFaceInvert(),
           shaderPass._renderStateDataMap,
           material.shaderData,
           customStates

packages/core/src/Renderer.ts

@@ -55,9 +55,6 @@ export class Renderer extends Component implements IComponentCustomClone {
   /** @internal */
   @ignoreClone
   _batchedTransformShaderData: boolean = false;
-  /** @internal */
-  @ignoreClone
-  _transformEntity: Entity;
 
   @ignoreClone
   protected _overrideUpdate: boolean = false;
@@ -71,6 +68,8 @@ export class Renderer extends Component implements IComponentCustomClone {
   protected _localBounds: BoundingBox = new BoundingBox();
   @ignoreClone
   protected _bounds: BoundingBox = new BoundingBox();
+  @ignoreClone
+  protected _transformEntity: Entity;
 
   @deepClone
   private _shaderData: ShaderData = new ShaderData(ShaderDataGroup.Renderer);
@@ -376,6 +375,13 @@ export class Renderer extends Component implements IComponentCustomClone {
     }
   }
 
+  /**
+   * @internal
+   */
+  _isFrontFaceInvert(): boolean {
+    return this._transformEntity.transform._isFrontFaceInvert();
+  }
+
   /**
    * @internal
    */
@@ -494,7 +500,7 @@ export class Renderer extends Component implements IComponentCustomClone {
   protected _updateLocalBounds(localBounds: BoundingBox): void {}
 
   protected _updateBounds(worldBounds: BoundingBox): void {
-    BoundingBox.transform(this.localBounds, this._transform.worldMatrix, worldBounds);
+    BoundingBox.transform(this.localBounds, this._transformEntity.transform.worldMatrix, worldBounds);
   }
 
   protected _render(context: RenderContext): void {

packages/core/src/Transform.ts

@@ -340,12 +340,6 @@ export class Transform extends Component {
     this._worldRotationQuaternion._onValueChanged = this._onWorldRotationQuaternionChanged;
     //@ts-ignore
     this._scale._onValueChanged = this._onScaleChanged;
-
-    if (entity._transform) {
-      throw `Entity already has a transform.`;
-    } else {
-      entity._transform = this;
-    }
   }
 
   /**

packages/core/src/index.ts

@@ -12,7 +12,7 @@ export { Entity } from "./Entity";
 export { Component } from "./Component";
 export { Script } from "./Script";
 export { Renderer, RendererUpdateFlags } from "./Renderer";
-export { DependentMode, dependentComponents, markAsInherited } from "./ComponentsDependencies";
+export { DependentMode, dependentComponents } from "./ComponentsDependencies";
 export { Camera } from "./Camera";
 export { Transform } from "./Transform";
 export { BoolUpdateFlag } from "./BoolUpdateFlag";