@galacean/engine 2.0.0-alpha.15 → 2.0.0-alpha.16

package/dist/browser.js

@@ -5324,74 +5324,69 @@
             return cloneModes;
         };
         CloneManager.cloneProperty = function cloneProperty(source, target, k, cloneMode, srcRoot, targetRoot, deepInstanceMap) {
-            if (cloneMode === CloneMode.Ignore) {
+            var sourceProperty = source[k];
+            // Remappable references (Entity/Component) are always remapped, regardless of clone decorator
+            if (_instanceof1$2(sourceProperty, Object) && sourceProperty._remap) {
+                target[k] = sourceProperty._remap(srcRoot, targetRoot);
                 return;
             }
-            var sourceProperty = source[k];
-            if (_instanceof1$2(sourceProperty, Object)) {
-                if (cloneMode === undefined || cloneMode === CloneMode.Assignment) {
-                    target[k] = sourceProperty;
-                    return;
-                }
-                var type = sourceProperty.constructor;
-                switch(type){
-                    case Uint8Array:
-                    case Uint16Array:
-                    case Uint32Array:
-                    case Int8Array:
-                    case Int16Array:
-                    case Int32Array:
-                    case Float32Array:
-                    case Float64Array:
-                        var targetPropertyT = target[k];
-                        if (targetPropertyT == null || targetPropertyT.length !== sourceProperty.length) {
-                            target[k] = sourceProperty.slice();
-                        } else {
-                            targetPropertyT.set(sourceProperty);
-                        }
-                        break;
-                    case Array:
-                        var targetPropertyA = target[k];
-                        var length = sourceProperty.length;
-                        if (targetPropertyA == null) {
-                            target[k] = targetPropertyA = new Array(length);
-                        } else {
-                            targetPropertyA.length = length;
-                        }
-                        for(var i = 0; i < length; i++){
-                            CloneManager.cloneProperty(sourceProperty, targetPropertyA, i, cloneMode, srcRoot, targetRoot, deepInstanceMap);
-                        }
-                        break;
-                    default:
-                        var targetProperty = target[k];
-                        // If the target property is undefined, create new instance and keep reference sharing like the source
+            if (cloneMode === CloneMode.Ignore) return;
+            // Primitives, undecorated, or @assignmentClone: direct assign
+            if (!_instanceof1$2(sourceProperty, Object) || cloneMode === undefined || cloneMode === CloneMode.Assignment) {
+                target[k] = sourceProperty;
+                return;
+            }
+            // @shallowClone / @deepClone: deep copy complex objects
+            var type = sourceProperty.constructor;
+            switch(type){
+                case Uint8Array:
+                case Uint16Array:
+                case Uint32Array:
+                case Int8Array:
+                case Int16Array:
+                case Int32Array:
+                case Float32Array:
+                case Float64Array:
+                    var targetPropertyT = target[k];
+                    if (targetPropertyT == null || targetPropertyT.length !== sourceProperty.length) {
+                        target[k] = sourceProperty.slice();
+                    } else {
+                        targetPropertyT.set(sourceProperty);
+                    }
+                    break;
+                case Array:
+                    var targetPropertyA = target[k];
+                    var length = sourceProperty.length;
+                    if (targetPropertyA == null) {
+                        target[k] = targetPropertyA = new Array(length);
+                    } else {
+                        targetPropertyA.length = length;
+                    }
+                    for(var i = 0; i < length; i++){
+                        CloneManager.cloneProperty(sourceProperty, targetPropertyA, i, cloneMode, srcRoot, targetRoot, deepInstanceMap);
+                    }
+                    break;
+                default:
+                    var targetProperty = target[k];
+                    // If the target property is undefined, create new instance and keep reference sharing like the source
+                    if (!targetProperty) {
+                        targetProperty = deepInstanceMap.get(sourceProperty);
                         if (!targetProperty) {
-                            targetProperty = deepInstanceMap.get(sourceProperty);
-                            if (!targetProperty) {
-                                targetProperty = new sourceProperty.constructor();
-                                deepInstanceMap.set(sourceProperty, targetProperty);
-                            }
-                            target[k] = targetProperty;
+                            targetProperty = new sourceProperty.constructor();
+                            deepInstanceMap.set(sourceProperty, targetProperty);
                         }
-                        if (sourceProperty.copyFrom) {
-                            // Custom clone
-                            targetProperty.copyFrom(sourceProperty);
-                        } else {
-                            // Universal clone
-                            var cloneModes = CloneManager.getCloneMode(sourceProperty.constructor);
-                            for(var _$k in sourceProperty){
-                                CloneManager.cloneProperty(sourceProperty, targetProperty, _$k, cloneModes[_$k], srcRoot, targetRoot, deepInstanceMap);
-                            }
-                            // Custom incremental clone
-                            if (sourceProperty._cloneTo) {
-                                sourceProperty._cloneTo(targetProperty, srcRoot, targetRoot);
-                            }
+                        target[k] = targetProperty;
+                    }
+                    if (sourceProperty.copyFrom) {
+                        targetProperty.copyFrom(sourceProperty);
+                    } else {
+                        var cloneModes = CloneManager.getCloneMode(sourceProperty.constructor);
+                        for(var _$k in sourceProperty){
+                            CloneManager.cloneProperty(sourceProperty, targetProperty, _$k, cloneModes[_$k], srcRoot, targetRoot, deepInstanceMap);
                         }
-                        break;
-                }
-            } else {
-                // null, undefined, primitive type, function
-                target[k] = sourceProperty;
+                        sourceProperty._cloneTo == null ? void 0 : sourceProperty._cloneTo.call(sourceProperty, targetProperty, srcRoot, targetRoot);
+                    }
+                    break;
             }
         };
         CloneManager.deepCloneObject = function deepCloneObject(source, target, deepInstanceMap) {
@@ -12338,6 +12333,44 @@
         return Background;
     }();
     /** @internal */ Background._premultiplySolidColor = new Color();
+    /**
+     * @internal
+     * Utility functions for remapping Entity/Component references during cloning.
+     */ var CloneUtils = /*#__PURE__*/ function() {
+        function CloneUtils() {}
+        CloneUtils.remapEntity = function remapEntity(srcRoot, targetRoot, entity) {
+            var path = CloneUtils._tempRemapPath;
+            if (!CloneUtils._getEntityHierarchyPath(srcRoot, entity, path)) return entity;
+            return CloneUtils._getEntityByHierarchyPath(targetRoot, path);
+        };
+        CloneUtils.remapComponent = function remapComponent(srcRoot, targetRoot, component) {
+            var path = CloneUtils._tempRemapPath;
+            var srcEntity = component.entity;
+            if (!CloneUtils._getEntityHierarchyPath(srcRoot, srcEntity, path)) return component;
+            return CloneUtils._getEntityByHierarchyPath(targetRoot, path)._components[srcEntity._components.indexOf(component)];
+        };
+        CloneUtils._getEntityHierarchyPath = function _getEntityHierarchyPath(rootEntity, searchEntity, inversePath) {
+            inversePath.length = 0;
+            while(searchEntity !== rootEntity){
+                var parent = searchEntity.parent;
+                if (!parent) {
+                    return false;
+                }
+                inversePath.push(searchEntity.siblingIndex);
+                searchEntity = parent;
+            }
+            return true;
+        };
+        CloneUtils._getEntityByHierarchyPath = function _getEntityByHierarchyPath(rootEntity, inversePath) {
+            var entity = rootEntity;
+            for(var i = inversePath.length - 1; i >= 0; i--){
+                entity = entity.children[inversePath[i]];
+            }
+            return entity;
+        };
+        return CloneUtils;
+    }();
+    CloneUtils._tempRemapPath = [];
     var ActiveChangeFlag = /*#__PURE__*/ function(ActiveChangeFlag) {
         ActiveChangeFlag[ActiveChangeFlag["None"] = 0] = "None";
         ActiveChangeFlag[ActiveChangeFlag["Scene"] = 1] = "Scene";
@@ -12412,6 +12445,11 @@
                 }
             }
         };
+        /**
+       * @internal
+       */ _proto._remap = function _remap(srcRoot, targetRoot) {
+            return CloneUtils.remapComponent(srcRoot, targetRoot, this);
+        };
         _proto._addResourceReferCount = function _addResourceReferCount(resource, count) {
             this._entity._isTemplate || resource._addReferCount(count);
         };
@@ -12485,9 +12523,6 @@
         ]);
         return Component;
     }(EngineObject);
-    __decorate$1([
-        ignoreClone
-    ], Component.prototype, "_entity", void 0);
     __decorate$1([
         ignoreClone
     ], Component.prototype, "_awoken", void 0);
@@ -12851,7 +12886,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             var position = target._position, rotation = target._rotation, scale = target._scale;
             // @ts-ignore
             position._onValueChanged = rotation._onValueChanged = scale._onValueChanged = null;
@@ -13463,9 +13498,6 @@
     __decorate$1([
         ignoreClone
     ], Transform.prototype, "_isParentDirty", void 0);
-    __decorate$1([
-        ignoreClone
-    ], Transform.prototype, "_parentTransformCache", void 0);
     __decorate$1([
         ignoreClone
     ], Transform.prototype, "_dirtyFlag", void 0);
@@ -13924,7 +13956,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             var _this__renderTarget;
             (_this__renderTarget = this._renderTarget) == null ? void 0 : _this__renderTarget._addReferCount(1);
         };
@@ -17127,9 +17159,6 @@
         return ColliderShape;
     }();
     ColliderShape._idGenerator = 0;
-    __decorate$1([
-        ignoreClone
-    ], ColliderShape.prototype, "_collider", void 0);
     __decorate$1([
         ignoreClone
     ], ColliderShape.prototype, "_nativeShape", void 0);
@@ -21511,7 +21540,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             var materials = this._materials;
             for(var i = 0, n = materials.length; i < n; i++){
                 target._setMaterial(i, materials[i]);
@@ -21766,9 +21795,6 @@
     __decorate$1([
         ignoreClone
     ], exports.Renderer.prototype, "_bounds", void 0);
-    __decorate$1([
-        ignoreClone
-    ], exports.Renderer.prototype, "_transformEntity", void 0);
     __decorate$1([
         deepClone
     ], exports.Renderer.prototype, "_shaderData", void 0);
@@ -21827,8 +21853,8 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            Renderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+       */ _proto._cloneTo = function _cloneTo(target) {
+            Renderer.prototype._cloneTo.call(this, target);
             target.sprite = this._sprite;
         };
         /**
@@ -22138,8 +22164,8 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            Renderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+       */ _proto._cloneTo = function _cloneTo(target) {
+            Renderer.prototype._cloneTo.call(this, target);
             target.sprite = this._sprite;
             target.drawMode = this._drawMode;
         };
@@ -22561,8 +22587,8 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            Renderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+       */ _proto._cloneTo = function _cloneTo(target) {
+            Renderer.prototype._cloneTo.call(this, target);
             target.font = this._font;
             target._subFont = this._subFont;
         };
@@ -24244,8 +24270,8 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            Renderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+       */ _proto._cloneTo = function _cloneTo(target) {
+            Renderer.prototype._cloneTo.call(this, target);
             target.mesh = this._mesh;
         };
         /**
@@ -27100,44 +27126,6 @@
     ]);
     PrimitiveMesh._sphereEdgeIdx = 0;
     PrimitiveMesh._spherePoleIdx = 0;
-    /**
-     * @internal
-     * Utility functions for remapping Entity/Component references during cloning.
-     */ var CloneUtils = /*#__PURE__*/ function() {
-        function CloneUtils() {}
-        CloneUtils.remapEntity = function remapEntity(srcRoot, targetRoot, entity) {
-            var paths = CloneUtils._tempRemapPath;
-            var success = CloneUtils._getEntityHierarchyPath(srcRoot, entity, paths);
-            return success ? CloneUtils._getEntityByHierarchyPath(targetRoot, paths) : entity;
-        };
-        CloneUtils.remapComponent = function remapComponent(srcRoot, targetRoot, component) {
-            var _CloneUtils__getEntityByHierarchyPath;
-            var paths = CloneUtils._tempRemapPath;
-            var success = CloneUtils._getEntityHierarchyPath(srcRoot, component.entity, paths);
-            return success ? (_CloneUtils__getEntityByHierarchyPath = CloneUtils._getEntityByHierarchyPath(targetRoot, paths)) == null ? void 0 : _CloneUtils__getEntityByHierarchyPath.getComponent(component.constructor) : component;
-        };
-        CloneUtils._getEntityHierarchyPath = function _getEntityHierarchyPath(rootEntity, searchEntity, inversePath) {
-            inversePath.length = 0;
-            while(searchEntity !== rootEntity){
-                var parent = searchEntity.parent;
-                if (!parent) {
-                    return false;
-                }
-                inversePath.push(searchEntity.siblingIndex);
-                searchEntity = parent;
-            }
-            return true;
-        };
-        CloneUtils._getEntityByHierarchyPath = function _getEntityByHierarchyPath(rootEntity, inversePath) {
-            var entity = rootEntity;
-            for(var i = inversePath.length - 1; i >= 0; i--){
-                entity = entity.children[inversePath[i]];
-            }
-            return entity;
-        };
-        return CloneUtils;
-    }();
-    CloneUtils._tempRemapPath = [];
     /**
      * Skin used for skinned mesh renderer.
      */ var Skin = /*#__PURE__*/ function(EngineObject) {
@@ -27169,25 +27157,6 @@
             }
             this._updateMark = renderer.engine.time.frameCount;
         };
-        /**
-       * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            // Clone rootBone
-            var rootBone = this.rootBone;
-            if (rootBone) {
-                target.rootBone = CloneUtils.remapEntity(srcRoot, targetRoot, rootBone);
-            }
-            // Clone bones
-            var bones = this.bones;
-            if (bones.length > 0) {
-                var boneCount = bones.length;
-                var destBones = new Array(boneCount);
-                for(var i = 0; i < boneCount; i++){
-                    destBones[i] = CloneUtils.remapEntity(srcRoot, targetRoot, bones[i]);
-                }
-                target.bones = destBones;
-            }
-        };
         _create_class$2(Skin, [
             {
                 key: "rootBone",
@@ -27251,10 +27220,7 @@
         ignoreClone
     ], Skin.prototype, "_updatedManager", void 0);
     __decorate$1([
-        ignoreClone
-    ], Skin.prototype, "_rootBone", void 0);
-    __decorate$1([
-        ignoreClone
+        deepClone
     ], Skin.prototype, "_bones", void 0);
     __decorate$1([
         ignoreClone
@@ -27303,8 +27269,8 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
-            MeshRenderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
+       */ _proto._cloneTo = function _cloneTo(target) {
+            MeshRenderer.prototype._cloneTo.call(this, target);
             if (this.skin) {
                 target._applySkin(null, target.skin);
             }
@@ -27840,9 +27806,7 @@
             for(var k in source){
                 CloneManager.cloneProperty(source, target, k, cloneModes[k], srcRoot, targetRoot, deepInstanceMap);
             }
-            if (source._cloneTo) {
-                source._cloneTo(target, srcRoot, targetRoot);
-            }
+            source._cloneTo == null ? void 0 : source._cloneTo.call(source, target, srcRoot, targetRoot);
         };
         return ComponentCloner;
     }();
@@ -28026,6 +27990,11 @@
         };
         /**
        * @internal
+       */ _proto._remap = function _remap(srcRoot, targetRoot) {
+            return CloneUtils.remapEntity(srcRoot, targetRoot, this);
+        };
+        /**
+       * @internal
        */ _proto._markAsTemplate = function _markAsTemplate(templateResource) {
             this._isTemplate = true;
             this._templateResource = templateResource;
@@ -36001,7 +35970,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             var animatorController = target._animatorController;
             if (animatorController) {
                 target._addResourceReferCount(animatorController, 1);
@@ -41110,9 +41079,6 @@
     __decorate$1([
         ignoreClone
     ], ParticleGenerator.prototype, "_subPrimitive", void 0);
-    __decorate$1([
-        ignoreClone
-    ], ParticleGenerator.prototype, "_renderer", void 0);
     __decorate$1([
         ignoreClone
     ], ParticleGenerator.prototype, "_isPlaying", void 0);
@@ -41839,7 +41805,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, _, __) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             target.mesh = this._mesh;
         };
         _create_class$2(MeshShape, [
@@ -42806,7 +42772,7 @@
         };
         /**
        * @internal
-       */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+       */ _proto._cloneTo = function _cloneTo(target) {
             var _target__clip;
             (_target__clip = target._clip) == null ? void 0 : _target__clip._addReferCount(1);
             target._gainNode.gain.setValueAtTime(target._volume, AudioManager.getContext().currentTime);
@@ -46507,11 +46473,14 @@
                         return resource;
                     });
                 } else if (ReflectionParser._isComponentRef(value)) {
-                    var _this__context_components_get;
-                    return Promise.resolve((_this__context_components_get = this._context.components.get(value.componentId)) != null ? _this__context_components_get : null);
+                    var entity = this._resolveEntityByPath(value.entityPath);
+                    if (!entity) return Promise.resolve(null);
+                    var type = Loader.getClass(value.componentType);
+                    if (!type) return Promise.resolve(null);
+                    var _entity_getComponents_value_componentIndex;
+                    return Promise.resolve((_entity_getComponents_value_componentIndex = entity.getComponents(type, [])[value.componentIndex]) != null ? _entity_getComponents_value_componentIndex : null);
                 } else if (ReflectionParser._isEntityRef(value)) {
-                    // entity reference
-                    return Promise.resolve(this._context.entityMap.get(value.entityId));
+                    return Promise.resolve(this._resolveEntityByPath(value.entityPath));
                 } else if (ReflectionParser._isSignalRef(value)) {
                     return this.parseSignal(value);
                 } else if (originValue) {
@@ -46569,6 +46538,16 @@
                 return Promise.resolve(entity);
             }
         };
+        _proto._resolveEntityByPath = function _resolveEntityByPath(entityPath) {
+            var _this__context = this._context, rootIds = _this__context.rootIds, entityMap = _this__context.entityMap;
+            if (!entityPath.length || entityPath[0] >= rootIds.length) return null;
+            var entity = entityMap.get(rootIds[entityPath[0]]);
+            for(var i = 1; i < entityPath.length; i++){
+                if (!entity || entityPath[i] >= entity.children.length) return null;
+                entity = entity.children[entityPath[i]];
+            }
+            return entity;
+        };
         ReflectionParser._isClass = function _isClass(value) {
             return value["class"] !== undefined;
         };
@@ -46579,10 +46558,10 @@
             return value["url"] !== undefined;
         };
         ReflectionParser._isEntityRef = function _isEntityRef(value) {
-            return value["entityId"] !== undefined;
+            return Array.isArray(value["entityPath"]) && value["componentType"] === undefined;
         };
         ReflectionParser._isComponentRef = function _isComponentRef(value) {
-            return value["ownerId"] !== undefined && value["componentId"] !== undefined;
+            return Array.isArray(value["entityPath"]) && value["componentType"] !== undefined;
         };
         ReflectionParser._isSignalRef = function _isSignalRef(value) {
             return value["listeners"] !== undefined;
@@ -46808,6 +46787,13 @@
                 for(var i = 0, l = entities.length; i < l; i++){
                     entityMap.set(entitiesConfig[i].id, entities[i]);
                 }
+                // Build rootIds in serialization order (not async completion order)
+                var rootIds = _this.context.rootIds;
+                for(var i1 = 0, l1 = entitiesConfig.length; i1 < l1; i1++){
+                    if (!entitiesConfig[i1].parent && !entitiesConfig[i1].strippedId) {
+                        rootIds.push(entitiesConfig[i1].id);
+                    }
+                }
                 return entities;
             });
         };
@@ -46933,7 +46919,6 @@
         _proto._parseEntity = function _parseEntity(entityConfig, engine) {
             var transform = entityConfig.transform;
             var entity = new Entity(engine, entityConfig.name, transform ? Loader.getClass(transform.class) : Transform);
-            if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
             this._addEntityPlugin(entityConfig.id, entity);
             return Promise.resolve(entity);
         };
@@ -46946,7 +46931,6 @@
             }).then(function(prefabResource) {
                 var entity = _instanceof1(prefabResource, PrefabResource) ? prefabResource.instantiate() : prefabResource.instantiateSceneRoot();
                 var instanceContext = new ParserContext(engine, ParserType.Prefab, null);
-                if (!entityConfig.parent) _this.context.rootIds.push(entityConfig.id);
                 _this._generateInstanceContext(entity, instanceContext, "");
                 _this._prefabContextMap.set(entity, instanceContext);
                 var cbArray = _this._prefabPromiseMap.get(entityConfig.id);
@@ -52926,7 +52910,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "2.0.0-alpha.15";
+    var version = "2.0.0-alpha.16";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);