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

package/dist/bundled.module.js

@@ -5318,74 +5318,69 @@ function _instanceof1$2(left, right) {
         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) {
@@ -12332,6 +12327,44 @@ Sky._projectionMatrix = new Matrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, Sky._epsilon -
     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";
@@ -12406,6 +12439,11 @@ var ActiveChangeFlag = /*#__PURE__*/ function(ActiveChangeFlag) {
             }
         }
     };
+    /**
+   * @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);
     };
@@ -12479,9 +12517,6 @@ var ActiveChangeFlag = /*#__PURE__*/ function(ActiveChangeFlag) {
     ]);
     return Component;
 }(EngineObject);
-__decorate$1([
-    ignoreClone
-], Component.prototype, "_entity", void 0);
 __decorate$1([
     ignoreClone
 ], Component.prototype, "_awoken", void 0);
@@ -12845,7 +12880,7 @@ function dependentComponents(componentOrComponents, dependentMode) {
     };
     /**
    * @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;
@@ -13457,9 +13492,6 @@ __decorate$1([
 __decorate$1([
     ignoreClone
 ], Transform.prototype, "_isParentDirty", void 0);
-__decorate$1([
-    ignoreClone
-], Transform.prototype, "_parentTransformCache", void 0);
 __decorate$1([
     ignoreClone
 ], Transform.prototype, "_dirtyFlag", void 0);
@@ -13918,7 +13950,7 @@ var Camera = /*#__PURE__*/ function(Component) {
     };
     /**
    * @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);
     };
@@ -17121,9 +17153,6 @@ __decorate$1([
     return ColliderShape;
 }();
 ColliderShape._idGenerator = 0;
-__decorate$1([
-    ignoreClone
-], ColliderShape.prototype, "_collider", void 0);
 __decorate$1([
     ignoreClone
 ], ColliderShape.prototype, "_nativeShape", void 0);
@@ -21505,7 +21534,7 @@ var Renderer = /*#__PURE__*/ function(Component) {
     };
     /**
    * @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]);
@@ -21760,9 +21789,6 @@ __decorate$1([
 __decorate$1([
     ignoreClone
 ], Renderer.prototype, "_bounds", void 0);
-__decorate$1([
-    ignoreClone
-], Renderer.prototype, "_transformEntity", void 0);
 __decorate$1([
     deepClone
 ], Renderer.prototype, "_shaderData", void 0);
@@ -21821,8 +21847,8 @@ var RendererUpdateFlags = /*#__PURE__*/ function(RendererUpdateFlags) {
     };
     /**
    * @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;
     };
     /**
@@ -22132,8 +22158,8 @@ __decorate$1([
     };
     /**
    * @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;
     };
@@ -22555,8 +22581,8 @@ __decorate$1([
     };
     /**
    * @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;
     };
@@ -24238,8 +24264,8 @@ var BlendShapeFrameDirty = /*#__PURE__*/ function(BlendShapeFrameDirty) {
     };
     /**
    * @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;
     };
     /**
@@ -27094,44 +27120,6 @@ PrimitiveMesh._sphereSeedCells = new Float32Array([
 ]);
 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) {
@@ -27163,25 +27151,6 @@ CloneUtils._tempRemapPath = [];
         }
         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",
@@ -27245,10 +27214,7 @@ __decorate$1([
     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
@@ -27297,8 +27263,8 @@ var SkinUpdateFlag = /*#__PURE__*/ function(SkinUpdateFlag) {
     };
     /**
    * @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);
         }
@@ -27834,9 +27800,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
         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;
 }();
@@ -28020,6 +27984,11 @@ var ComponentCloner = /*#__PURE__*/ function() {
     };
     /**
    * @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;
@@ -35995,7 +35964,7 @@ function _type_of1$1(obj) {
     };
     /**
    * @internal
-   */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+   */ _proto._cloneTo = function _cloneTo(target) {
         var animatorController = target._animatorController;
         if (animatorController) {
             target._addResourceReferCount(animatorController, 1);
@@ -41104,9 +41073,6 @@ __decorate$1([
 __decorate$1([
     ignoreClone
 ], ParticleGenerator.prototype, "_subPrimitive", void 0);
-__decorate$1([
-    ignoreClone
-], ParticleGenerator.prototype, "_renderer", void 0);
 __decorate$1([
     ignoreClone
 ], ParticleGenerator.prototype, "_isPlaying", void 0);
@@ -41833,7 +41799,7 @@ ConeShape._tempVector31 = new Vector3();
     };
     /**
    * @internal
-   */ _proto._cloneTo = function _cloneTo(target, _, __) {
+   */ _proto._cloneTo = function _cloneTo(target) {
         target.mesh = this._mesh;
     };
     _create_class$2(MeshShape, [
@@ -42800,7 +42766,7 @@ AudioManager._needsUserGestureResume = false;
     };
     /**
    * @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);
@@ -46501,11 +46467,14 @@ var ReflectionParser = /*#__PURE__*/ function() {
                     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) {
@@ -46563,6 +46532,16 @@ var ReflectionParser = /*#__PURE__*/ function() {
             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;
     };
@@ -46573,10 +46552,10 @@ var ReflectionParser = /*#__PURE__*/ function() {
         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;
@@ -46802,6 +46781,13 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
             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;
         });
     };
@@ -46927,7 +46913,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     _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);
     };
@@ -46940,7 +46925,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
         }).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);
@@ -52920,7 +52904,7 @@ EXT_texture_webp = __decorate([
 ], 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]);