Merge code and fix unit test error (#40)

Fix: Merge code and fix unit test error
galacean · Jan 8, 2025 · 8ffb614 · 8ffb614
1 parent dcdfc1a
commit 8ffb614
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 13 deletions.
diff --git a/packages/core/src/Entity.ts b/packages/core/src/Entity.ts
@@ -591,6 +591,7 @@ export class Entity extends EngineObject {
       this._parent = null;
       this._siblingIndex = -1;
     }
+    this._dispatchModify(EntityModifyFlags.Child, oldParent);
   }
 
   /**
@@ -659,6 +660,7 @@ export class Entity extends EngineObject {
         children[i]._siblingIndex++;
       }
     }
+    this._dispatchModify(EntityModifyFlags.Child, this);
   }
 
   private _setParent(parent: Entity, siblingIndex?: number): void {
@@ -785,7 +787,7 @@ export class Entity extends EngineObject {
         }
       }
     }
-    this._dispatchModify(EntityModifyFlags.SiblingIndex, this);
+    this._dispatchModify(EntityModifyFlags.Child, this);
   }
 
   //--------------------------------------------------------------deprecated----------------------------------------------------------------

diff --git a/packages/core/src/enums/EntityModifyFlags.ts b/packages/core/src/enums/EntityModifyFlags.ts
@@ -4,6 +4,6 @@
 export enum EntityModifyFlags {
   /** The parent changes. */
   Parent = 0x1,
-  /** The sibling index changes. */
-  SiblingIndex = 0x2
+  /** The child changes. */
+  Child = 0x2
 }
diff --git a/packages/physics-physx/libs/physx.release.wasm b/packages/physics-physx/libs/physx.release.wasm
diff --git a/packages/ui/src/Utils.ts b/packages/ui/src/Utils.ts
@@ -16,7 +16,7 @@ export class Utils {
     element._isRootCanvasDirty = false;
     this._registerRootCanvas(element, rootCanvas);
     const fromEntity = element instanceof UICanvas ? element.entity.parent : element.entity;
-    const toEntity = rootCanvas?.entity ?? null;
+    const toEntity = rootCanvas?.entity.parent ?? null;
     this._registerListener(fromEntity, toEntity, element._rootCanvasListener, element._rootCanvasListeningEntities);
   }
 

diff --git a/packages/ui/src/component/UIGroup.ts b/packages/ui/src/component/UIGroup.ts
@@ -174,7 +174,6 @@ export class UIGroup extends Component implements IGroupAble {
    */
   @ignoreClone
   _groupListener(flag: number): void {
-    if (this._isGroupDirty) return;
     if (flag === EntityModifyFlags.Parent || flag === EntityUIModifyFlags.GroupEnableInScene) {
       Utils.setGroupDirty(this);
     }
@@ -185,7 +184,6 @@ export class UIGroup extends Component implements IGroupAble {
    */
   @ignoreClone
   _rootCanvasListener(flag: number): void {
-    if (this._isRootCanvasDirty) return;
     if (flag === EntityModifyFlags.Parent || flag === EntityUIModifyFlags.CanvasEnableInScene) {
       Utils.setRootCanvasDirty(this);
       Utils.setGroupDirty(this);

diff --git a/packages/ui/src/component/UIRenderer.ts b/packages/ui/src/component/UIRenderer.ts
@@ -189,7 +189,6 @@ export class UIRenderer extends Renderer implements IGraphics {
    */
   @ignoreClone
   _groupListener(flag: number): void {
-    if (this._isGroupDirty) return;
     if (flag === EntityModifyFlags.Parent || flag === EntityUIModifyFlags.GroupEnableInScene) {
       Utils.setGroupDirty(this);
     }
@@ -200,12 +199,11 @@ export class UIRenderer extends Renderer implements IGraphics {
    */
   @ignoreClone
   _rootCanvasListener(flag: number, entity: Entity): void {
-    if (this._isRootCanvasDirty) return;
     switch (flag) {
       case EntityModifyFlags.Parent:
         Utils.setRootCanvasDirty(this);
         Utils.setGroupDirty(this);
-      case EntityModifyFlags.SiblingIndex:
+      case EntityModifyFlags.Child:
         entity._updateUIHierarchyVersion(UICanvas._hierarchyCounter);
         break;
       default:

diff --git a/packages/ui/src/component/interactive/UIInteractive.ts b/packages/ui/src/component/interactive/UIInteractive.ts
@@ -207,7 +207,6 @@ export class UIInteractive extends Script implements IGroupAble {
    */
   @ignoreClone
   _groupListener(flag: number): void {
-    if (this._isGroupDirty) return;
     if (flag === EntityModifyFlags.Parent || flag === EntityUIModifyFlags.GroupEnableInScene) {
       Utils.setGroupDirty(this);
     }
@@ -218,7 +217,6 @@ export class UIInteractive extends Script implements IGroupAble {
    */
   @ignoreClone
   _rootCanvasListener(flag: number): void {
-    if (this._isRootCanvasDirty) return;
     if (flag === EntityModifyFlags.Parent || flag === EntityUIModifyFlags.CanvasEnableInScene) {
       Utils.setRootCanvasDirty(this);
       Utils.setGroupDirty(this);

diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
@@ -4,7 +4,7 @@ import {
   CullMode,
   Engine,
   Entity,
-  IClassObject,
+  IClass,
   Material,
   PipelineStage,
   ReflectionParser,
@@ -102,7 +102,7 @@ function ApplyMixins(derivedCtor: any, baseCtors: any[]): void {
 ApplyMixins(Engine, [EngineExtension]);
 ApplyMixins(Entity, [EntityExtension]);
 
-ReflectionParser.registerCustomParseComponent("Text", async (instance: any, item: Omit<IClassObject, "class">) => {
+ReflectionParser.registerCustomParseComponent("Text", async (instance: any, item: Omit<IClass, "class">) => {
   const { props } = item;
   if (!props.font) {
     // @ts-ignore