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

package/dist/main.js

@@ -220,74 +220,69 @@ function _instanceof(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 (_instanceof(sourceProperty, Object) && sourceProperty._remap) {
+            target[k] = sourceProperty._remap(srcRoot, targetRoot);
             return;
         }
-        var sourceProperty = source[k];
-        if (_instanceof(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 (!_instanceof(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) {
@@ -7394,6 +7389,45 @@ Sky._projectionMatrix = new engineMath.Matrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, Sky.
 }();
 /** @internal */ Background._premultiplySolidColor = new engineMath.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";
@@ -7469,6 +7503,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);
     };
@@ -7542,9 +7581,6 @@ var ActiveChangeFlag = /*#__PURE__*/ function(ActiveChangeFlag) {
     ]);
     return Component;
 }(EngineObject);
-__decorate([
-    ignoreClone
-], Component.prototype, "_entity", void 0);
 __decorate([
     ignoreClone
 ], Component.prototype, "_awoken", void 0);
@@ -7913,7 +7949,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;
@@ -8525,9 +8561,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], Transform.prototype, "_isParentDirty", void 0);
-__decorate([
-    ignoreClone
-], Transform.prototype, "_parentTransformCache", void 0);
 __decorate([
     ignoreClone
 ], Transform.prototype, "_dirtyFlag", void 0);
@@ -8997,7 +9030,7 @@ exports.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);
     };
@@ -12233,9 +12266,6 @@ __decorate([
     return ColliderShape;
 }();
 ColliderShape._idGenerator = 0;
-__decorate([
-    ignoreClone
-], ColliderShape.prototype, "_collider", void 0);
 __decorate([
     ignoreClone
 ], ColliderShape.prototype, "_nativeShape", void 0);
@@ -16671,7 +16701,7 @@ exports.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]);
@@ -16926,9 +16956,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], exports.Renderer.prototype, "_bounds", void 0);
-__decorate([
-    ignoreClone
-], exports.Renderer.prototype, "_transformEntity", void 0);
 __decorate([
     deepClone
 ], exports.Renderer.prototype, "_shaderData", void 0);
@@ -16988,8 +17015,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;
     };
     /**
@@ -17300,8 +17327,8 @@ __decorate([
     };
     /**
    * @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;
     };
@@ -17724,8 +17751,8 @@ __decorate([
     };
     /**
    * @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;
     };
@@ -19427,8 +19454,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;
     };
     /**
@@ -22294,45 +22321,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) {
@@ -22364,25 +22352,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(Skin, [
         {
             key: "rootBone",
@@ -22446,10 +22415,7 @@ __decorate([
     ignoreClone
 ], Skin.prototype, "_updatedManager", void 0);
 __decorate([
-    ignoreClone
-], Skin.prototype, "_rootBone", void 0);
-__decorate([
-    ignoreClone
+    deepClone
 ], Skin.prototype, "_bones", void 0);
 __decorate([
     ignoreClone
@@ -22499,8 +22465,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);
         }
@@ -23041,9 +23007,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;
 }();
@@ -23230,6 +23194,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;
@@ -31338,7 +31307,7 @@ function _type_of(obj) {
     };
     /**
    * @internal
-   */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
+   */ _proto._cloneTo = function _cloneTo(target) {
         var animatorController = target._animatorController;
         if (animatorController) {
             target._addResourceReferCount(animatorController, 1);
@@ -36489,9 +36458,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], ParticleGenerator.prototype, "_subPrimitive", void 0);
-__decorate([
-    ignoreClone
-], ParticleGenerator.prototype, "_renderer", void 0);
 __decorate([
     ignoreClone
 ], ParticleGenerator.prototype, "_isPlaying", void 0);
@@ -37230,7 +37196,7 @@ ConeShape._tempVector31 = new engineMath.Vector3();
     };
     /**
    * @internal
-   */ _proto._cloneTo = function _cloneTo(target, _, __) {
+   */ _proto._cloneTo = function _cloneTo(target) {
         target.mesh = this._mesh;
     };
     _create_class(MeshShape, [
@@ -38210,7 +38176,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);