@galacean/engine-core 0.0.0-experimental-2.0-migrate.2 → 0.0.0-experimental-2.0-migrate.3

package/dist/module.js

@@ -5313,10 +5313,12 @@ __decorate([
     };
     /**
    * @internal
-   */ ComponentsDependencies._removeCheck = function _removeCheck(entity, type) {
+   */ ComponentsDependencies._removeCheck = function _removeCheck(entity, type, replace) {
         var components = entity._components;
         var n = components.length;
         while(type !== Component){
+            // The replacement still satisfies this type and all of its base types.
+            if (replace && (replace === type || _instanceof(replace.prototype, type))) return;
             var count = 0;
             for(var i = 0; i < n; i++){
                 if (_instanceof(components[i], type) && ++count > 1) return;
@@ -6475,10 +6477,22 @@ var ComponentCloner = /*#__PURE__*/ function() {
         _this = EngineObject.call(this, engine) || this, /** The layer the entity belongs to. */ _this.layer = Layer.Layer0, /** @internal */ _this._isActiveInHierarchy = false, /** @internal */ _this._isActiveInScene = false, /** @internal */ _this._components = [], /** @internal */ _this._scripts = new DisorderedArray(), /** @internal */ _this._scriptsVersion = 0, /** @internal */ _this._children = [], /** @internal */ _this._isRoot = false, /** @internal */ _this._isActive = true, /** @internal */ _this._siblingIndex = -1, /** @internal */ _this._isTemplate = false, /** @internal */ _this._updateFlagManager = new UpdateFlagManager(), _this._parent = null, //--------------------------------------------------------------deprecated----------------------------------------------------------------
         _this._invModelMatrix = new Matrix();
         _this.name = name != null ? name : "Entity";
-        for(var i = 0, n = components.length; i < n; i++){
-            _this.addComponent(components[i]);
+        var transformType = Transform;
+        var n = components.length;
+        for(var i = n - 1; i >= 0; i--){
+            var componentType = components[i];
+            if (Entity._isTransformType(componentType)) {
+                transformType = componentType;
+                break;
+            }
+        }
+        _this._transform = _this.addComponent(transformType);
+        for(var i1 = 0; i1 < n; i1++){
+            var componentType1 = components[i1];
+            if (!Entity._isTransformType(componentType1)) {
+                _this.addComponent(componentType1);
+            }
         }
-        !_this._transform && _this.addComponent(Transform);
         _this._inverseWorldMatFlag = _this.registerWorldChangeFlag();
         return _this;
     }
@@ -6492,13 +6506,19 @@ var ComponentCloner = /*#__PURE__*/ function() {
         for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
             args[_key - 1] = arguments[_key];
         }
+        var needReplaceTransform = Entity._isTransformType(type) && this._transform;
+        if (needReplaceTransform) {
+            ComponentsDependencies._removeCheck(this, this._transform.constructor, type);
+        }
         ComponentsDependencies._addCheck(this, type);
         var component = _construct(type, [].concat([
             this
         ], args));
-        this._components.push(component);
-        // @todo: temporary solution
-        if (_instanceof(component, Transform)) this._setTransform(component);
+        if (needReplaceTransform) {
+            this._replaceTransform(component);
+        } else {
+            this._components.push(component);
+        }
         component._setActive(true, ActiveChangeFlag.All);
         return component;
     };
@@ -6706,9 +6726,13 @@ var ComponentCloner = /*#__PURE__*/ function() {
     /**
    * @internal
    */ _proto._removeComponent = function _removeComponent(component) {
-        ComponentsDependencies._removeCheck(this, component.constructor);
         var components = this._components;
-        components.splice(components.indexOf(component), 1);
+        var index = components.indexOf(component);
+        // A replaced Transform is detached from the component slot immediately but
+        // can still reach here later because object destruction may be deferred.
+        if (index < 0) return;
+        ComponentsDependencies._removeCheck(this, component.constructor);
+        components.splice(index, 1);
     };
     /**
    * @internal
@@ -6910,15 +6934,18 @@ var ComponentCloner = /*#__PURE__*/ function() {
             }
         }
     };
-    _proto._setTransform = function _setTransform(value) {
+    _proto._replaceTransform = function _replaceTransform(value) {
         var previous = this._transform;
-        if (previous) {
-            value.position.copyFrom(previous.position);
-            value.rotationQuaternion.copyFrom(previous.rotationQuaternion);
-            value.scale.copyFrom(previous.scale);
-            previous.destroy();
-        }
+        value.position.copyFrom(previous.position);
+        value.rotationQuaternion.copyFrom(previous.rotationQuaternion);
+        value.scale.copyFrom(previous.scale);
+        // Keep the unique Transform in the same component slot. Detach the old
+        // instance before destroy because destroy can be deferred during a frame.
+        var components = this._components;
+        var previousIndex = components.indexOf(previous);
+        components[previousIndex] = value;
         this._transform = value;
+        previous.destroy();
         var children = this._children;
         for(var i = 0, n = children.length; i < n; i++){
             var _children_i_transform;
@@ -6934,6 +6961,9 @@ var ComponentCloner = /*#__PURE__*/ function() {
         }
         return this._invModelMatrix;
     };
+    Entity._isTransformType = function _isTransformType(type) {
+        return type === Transform || _instanceof(type.prototype, Transform);
+    };
     /**
    * @internal
    */ Entity._findChildByName = function _findChildByName(entity, childIndex, paths, pathIndex) {