@galacean/engine-core 1.1.0-beta.14 → 1.1.0-beta.16

package/dist/miniprogram.js

@@ -566,6 +566,9 @@ function _instanceof(left, right) {
                     if (sourceProperty._cloneTo) {
                         sourceProperty._cloneTo(targetOProperty);
                     }
+                    if (sourceProperty.copyFrom) {
+                        targetOProperty.copyFrom(sourceProperty);
+                    }
                     break;
             }
         } else {
@@ -4208,7 +4211,11 @@ var ComponentCloner = /*#__PURE__*/ function() {
         }
         cloneEntity.layer = srcEntity.layer;
         cloneEntity._isActive = srcEntity._isActive;
-        cloneEntity.transform.localMatrix = srcEntity.transform.localMatrix;
+        var cloneTransform = cloneEntity.transform;
+        var srcTransform = srcEntity.transform;
+        cloneTransform.position = srcTransform.position;
+        cloneTransform.rotation = srcTransform.rotation;
+        cloneTransform.scale = srcTransform.scale;
         var children = srcEntity._children;
         for(var i = 0, n = srcEntity._children.length; i < n; i++){
             cloneEntity.addChild(this._createCloneEntity(children[i]));
@@ -11777,8 +11784,8 @@ var PrimitiveType;
     function SkinnedMeshRenderer(entity) {
         var _this;
         _this = MeshRenderer1.call(this, entity) || this;
-        _this._jointDataCreateCache = new miniprogram.Vector2(-1, -1);
         _this._localBounds = new miniprogram.BoundingBox();
+        _this._jointDataCreateCache = new miniprogram.Vector2(-1, -1);
         _this._skin = null;
         var rhi = _this.entity.engine._hardwareRenderer;
         var maxVertexUniformVectors = rhi.renderStates.getParameter(rhi.gl.MAX_VERTEX_UNIFORM_VECTORS);
@@ -12082,6 +12089,9 @@ var PrimitiveType;
 (function() {
     SkinnedMeshRenderer._jointMatrixProperty = ShaderProperty.getByName("renderer_JointMatrix");
 })();
+__decorate([
+    deepClone
+], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_jointDataCreateCache", void 0);
@@ -12094,9 +12104,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_rootBone", void 0);
-__decorate([
-    ignoreClone
-], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_jointMatrices", void 0);
@@ -13224,12 +13231,12 @@ var /** @internal */ PromiseState;
    */ ResourceManager._addLoader = function _addLoader(type, loader, extNames) {
         this._loaders[type] = loader;
         for(var i = 0, len = extNames.length; i < len; i++){
-            this._extTypeMapping[extNames[i]] = type;
+            this._extTypeMapping[extNames[i].toLowerCase()] = type;
         }
     };
     ResourceManager._getTypeByUrl = function _getTypeByUrl(url) {
         var path = url.split("?")[0];
-        return this._extTypeMapping[path.substring(path.lastIndexOf(".") + 1)];
+        return this._extTypeMapping[path.substring(path.lastIndexOf(".") + 1).toLowerCase()];
     };
     return ResourceManager;
 }();
@@ -24486,9 +24493,7 @@ var DirtyFlag;
         this.property = property;
         this.component = target.getComponent(type);
         this.cureType = cureType;
-        var isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
-        // @todo: Temp solution with blendShape
-        this._isCopyMode = cureType._isCopyMode && !isBlendShape;
+        this._isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
         var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
         this._assembler = new assemblerType();
         this._assembler.initialize(this);
@@ -24520,7 +24525,7 @@ var DirtyFlag;
         this._assembler.setTargetValue(this.defaultValue);
     };
     _proto.getEvaluateValue = function getEvaluateValue(out) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.baseEvaluateData.value, out);
             return out;
         } else {
@@ -24528,14 +24533,14 @@ var DirtyFlag;
         }
     };
     _proto.saveDefaultValue = function saveDefaultValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.defaultValue);
         } else {
             this.defaultValue = this._assembler.getTargetValue();
         }
     };
     _proto.saveFixedPoseValue = function saveFixedPoseValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.fixedPoseValue);
         } else {
             this.fixedPoseValue = this._assembler.getTargetValue();
@@ -24544,25 +24549,37 @@ var DirtyFlag;
     _proto.applyValue = function applyValue(value, weight, additive) {
         var cureType = this.cureType;
         if (additive) {
-            if (this._isCopyMode) {
-                cureType._additiveValue(value, weight, this.referenceTargetValue);
+            var assembler = this._assembler;
+            if (cureType._isCopyMode) {
+                var additiveValue = cureType._additiveValue(value, weight, this.referenceTargetValue);
+                // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                if (this._isBlendShape) {
+                    assembler.setTargetValue(additiveValue);
+                }
             } else {
-                var assembler = this._assembler;
                 var originValue = assembler.getTargetValue();
-                var additiveValue = cureType._additiveValue(value, weight, originValue);
-                assembler.setTargetValue(additiveValue);
+                var additiveValue1 = cureType._additiveValue(value, weight, originValue);
+                assembler.setTargetValue(additiveValue1);
             }
         } else {
             if (weight === 1.0) {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     cureType._setValue(value, this.referenceTargetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(this.referenceTargetValue);
+                    }
                 } else {
                     this._assembler.setTargetValue(value);
                 }
             } else {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     var targetValue = this.referenceTargetValue;
                     cureType._lerpValue(targetValue, value, weight, targetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(targetValue);
+                    }
                 } else {
                     var originValue1 = this._assembler.getTargetValue();
                     var lerpValue = cureType._lerpValue(originValue1, value, weight);
@@ -24572,7 +24589,7 @@ var DirtyFlag;
         }
     };
     _proto._lerpValue = function _lerpValue(srcValue, destValue, crossWeight) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
         } else {
             this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
@@ -27433,6 +27450,7 @@ exports.ParticleStopMode = void 0;
         context.camera._renderPipeline.pushRenderData(context, renderData);
     };
     _proto._onDestroy = function _onDestroy() {
+        Renderer1.prototype._onDestroy.call(this);
         this.generator._destroy();
     };
     _create_class(ParticleRenderer, [
@@ -28032,8 +28050,8 @@ __decorate([
         /**  The rate of particle emission. */ _this.rateOverTime = new ParticleCompositeCurve(10);
         /**  The rate at which the emitter spawns new particles over distance. */ _this.rateOverDistance = new ParticleCompositeCurve(0);
         /** @internal */ _this._shapeRand = new miniprogram.Rand(0, ParticleRandomSubSeeds.Shape);
+        /** @internal */ _this._frameRateTime = 0;
         _this._bursts = [];
-        _this._frameRateTime = 0;
         _this._currentBurstIndex = 0;
         _this._burstRand = new miniprogram.Rand(0, ParticleRandomSubSeeds.Burst);
         return _this;
@@ -28082,7 +28100,8 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._resetBurst = function _resetBurst() {
+   */ _proto._reset = function _reset() {
+        this._frameRateTime = 0;
         this._currentBurstIndex = 0;
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -29040,7 +29059,7 @@ __decorate([
                 this._firstActiveElement = firstFreeElement;
                 this._firstNewElement = firstFreeElement;
                 this._playTime = 0;
-                this.emission._resetBurst();
+                this.emission._reset();
             }
         }
     };
@@ -29075,19 +29094,23 @@ __decorate([
     /**
    * @internal
    */ _proto._update = function _update(elapsedTime) {
+        var _this = this, main = _this.main, emission = _this.emission;
+        var duration = main.duration;
         var lastPlayTime = this._playTime;
         this._playTime += elapsedTime;
         this._retireActiveParticles();
         this._freeRetiredParticles();
-        if (this.emission.enabled && this._isPlaying) {
-            this.emission._emit(lastPlayTime, this._playTime);
-            if (!this.main.isLoop && this._playTime > this.main.duration) {
+        if (emission.enabled && this._isPlaying) {
+            emission._emit(lastPlayTime, this._playTime);
+            if (!main.isLoop && this._playTime > duration) {
                 this._isPlaying = false;
             }
         }
         // Reset play time when is not playing and no active particles to avoid potential precision problems in GPU
         if (!this.isAlive) {
-            this._playTime = 0;
+            var discardTime = Math.min(emission._frameRateTime, Math.floor(this._playTime / duration) * duration);
+            this._playTime -= discardTime;
+            emission._frameRateTime -= discardTime;
         }
         // Add new particles to vertex buffer when has wait process retired element or new particle
         //

package/dist/module.js

@@ -561,6 +561,9 @@ function _instanceof(left, right) {
                     if (sourceProperty._cloneTo) {
                         sourceProperty._cloneTo(targetOProperty);
                     }
+                    if (sourceProperty.copyFrom) {
+                        targetOProperty.copyFrom(sourceProperty);
+                    }
                     break;
             }
         } else {
@@ -4203,7 +4206,11 @@ var ComponentCloner = /*#__PURE__*/ function() {
         }
         cloneEntity.layer = srcEntity.layer;
         cloneEntity._isActive = srcEntity._isActive;
-        cloneEntity.transform.localMatrix = srcEntity.transform.localMatrix;
+        var cloneTransform = cloneEntity.transform;
+        var srcTransform = srcEntity.transform;
+        cloneTransform.position = srcTransform.position;
+        cloneTransform.rotation = srcTransform.rotation;
+        cloneTransform.scale = srcTransform.scale;
         var children = srcEntity._children;
         for(var i = 0, n = srcEntity._children.length; i < n; i++){
             cloneEntity.addChild(this._createCloneEntity(children[i]));
@@ -11772,8 +11779,8 @@ var PrimitiveType;
     function SkinnedMeshRenderer(entity) {
         var _this;
         _this = MeshRenderer1.call(this, entity) || this;
-        _this._jointDataCreateCache = new Vector2(-1, -1);
         _this._localBounds = new BoundingBox();
+        _this._jointDataCreateCache = new Vector2(-1, -1);
         _this._skin = null;
         var rhi = _this.entity.engine._hardwareRenderer;
         var maxVertexUniformVectors = rhi.renderStates.getParameter(rhi.gl.MAX_VERTEX_UNIFORM_VECTORS);
@@ -12077,6 +12084,9 @@ var PrimitiveType;
 (function() {
     SkinnedMeshRenderer._jointMatrixProperty = ShaderProperty.getByName("renderer_JointMatrix");
 })();
+__decorate([
+    deepClone
+], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_jointDataCreateCache", void 0);
@@ -12089,9 +12099,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_rootBone", void 0);
-__decorate([
-    ignoreClone
-], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_jointMatrices", void 0);
@@ -13219,12 +13226,12 @@ var /** @internal */ PromiseState;
    */ ResourceManager._addLoader = function _addLoader(type, loader, extNames) {
         this._loaders[type] = loader;
         for(var i = 0, len = extNames.length; i < len; i++){
-            this._extTypeMapping[extNames[i]] = type;
+            this._extTypeMapping[extNames[i].toLowerCase()] = type;
         }
     };
     ResourceManager._getTypeByUrl = function _getTypeByUrl(url) {
         var path = url.split("?")[0];
-        return this._extTypeMapping[path.substring(path.lastIndexOf(".") + 1)];
+        return this._extTypeMapping[path.substring(path.lastIndexOf(".") + 1).toLowerCase()];
     };
     return ResourceManager;
 }();
@@ -24481,9 +24488,7 @@ var DirtyFlag;
         this.property = property;
         this.component = target.getComponent(type);
         this.cureType = cureType;
-        var isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
-        // @todo: Temp solution with blendShape
-        this._isCopyMode = cureType._isCopyMode && !isBlendShape;
+        this._isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
         var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
         this._assembler = new assemblerType();
         this._assembler.initialize(this);
@@ -24515,7 +24520,7 @@ var DirtyFlag;
         this._assembler.setTargetValue(this.defaultValue);
     };
     _proto.getEvaluateValue = function getEvaluateValue(out) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.baseEvaluateData.value, out);
             return out;
         } else {
@@ -24523,14 +24528,14 @@ var DirtyFlag;
         }
     };
     _proto.saveDefaultValue = function saveDefaultValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.defaultValue);
         } else {
             this.defaultValue = this._assembler.getTargetValue();
         }
     };
     _proto.saveFixedPoseValue = function saveFixedPoseValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.fixedPoseValue);
         } else {
             this.fixedPoseValue = this._assembler.getTargetValue();
@@ -24539,25 +24544,37 @@ var DirtyFlag;
     _proto.applyValue = function applyValue(value, weight, additive) {
         var cureType = this.cureType;
         if (additive) {
-            if (this._isCopyMode) {
-                cureType._additiveValue(value, weight, this.referenceTargetValue);
+            var assembler = this._assembler;
+            if (cureType._isCopyMode) {
+                var additiveValue = cureType._additiveValue(value, weight, this.referenceTargetValue);
+                // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                if (this._isBlendShape) {
+                    assembler.setTargetValue(additiveValue);
+                }
             } else {
-                var assembler = this._assembler;
                 var originValue = assembler.getTargetValue();
-                var additiveValue = cureType._additiveValue(value, weight, originValue);
-                assembler.setTargetValue(additiveValue);
+                var additiveValue1 = cureType._additiveValue(value, weight, originValue);
+                assembler.setTargetValue(additiveValue1);
             }
         } else {
             if (weight === 1.0) {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     cureType._setValue(value, this.referenceTargetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(this.referenceTargetValue);
+                    }
                 } else {
                     this._assembler.setTargetValue(value);
                 }
             } else {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     var targetValue = this.referenceTargetValue;
                     cureType._lerpValue(targetValue, value, weight, targetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(targetValue);
+                    }
                 } else {
                     var originValue1 = this._assembler.getTargetValue();
                     var lerpValue = cureType._lerpValue(originValue1, value, weight);
@@ -24567,7 +24584,7 @@ var DirtyFlag;
         }
     };
     _proto._lerpValue = function _lerpValue(srcValue, destValue, crossWeight) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
         } else {
             this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
@@ -27428,6 +27445,7 @@ var ParticleStopMode;
         context.camera._renderPipeline.pushRenderData(context, renderData);
     };
     _proto._onDestroy = function _onDestroy() {
+        Renderer1.prototype._onDestroy.call(this);
         this.generator._destroy();
     };
     _create_class(ParticleRenderer, [
@@ -28027,8 +28045,8 @@ __decorate([
         /**  The rate of particle emission. */ _this.rateOverTime = new ParticleCompositeCurve(10);
         /**  The rate at which the emitter spawns new particles over distance. */ _this.rateOverDistance = new ParticleCompositeCurve(0);
         /** @internal */ _this._shapeRand = new Rand(0, ParticleRandomSubSeeds.Shape);
+        /** @internal */ _this._frameRateTime = 0;
         _this._bursts = [];
-        _this._frameRateTime = 0;
         _this._currentBurstIndex = 0;
         _this._burstRand = new Rand(0, ParticleRandomSubSeeds.Burst);
         return _this;
@@ -28077,7 +28095,8 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._resetBurst = function _resetBurst() {
+   */ _proto._reset = function _reset() {
+        this._frameRateTime = 0;
         this._currentBurstIndex = 0;
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -29035,7 +29054,7 @@ __decorate([
                 this._firstActiveElement = firstFreeElement;
                 this._firstNewElement = firstFreeElement;
                 this._playTime = 0;
-                this.emission._resetBurst();
+                this.emission._reset();
             }
         }
     };
@@ -29070,19 +29089,23 @@ __decorate([
     /**
    * @internal
    */ _proto._update = function _update(elapsedTime) {
+        var _this = this, main = _this.main, emission = _this.emission;
+        var duration = main.duration;
         var lastPlayTime = this._playTime;
         this._playTime += elapsedTime;
         this._retireActiveParticles();
         this._freeRetiredParticles();
-        if (this.emission.enabled && this._isPlaying) {
-            this.emission._emit(lastPlayTime, this._playTime);
-            if (!this.main.isLoop && this._playTime > this.main.duration) {
+        if (emission.enabled && this._isPlaying) {
+            emission._emit(lastPlayTime, this._playTime);
+            if (!main.isLoop && this._playTime > duration) {
                 this._isPlaying = false;
             }
         }
         // Reset play time when is not playing and no active particles to avoid potential precision problems in GPU
         if (!this.isAlive) {
-            this._playTime = 0;
+            var discardTime = Math.min(emission._frameRateTime, Math.floor(this._playTime / duration) * duration);
+            this._playTime -= discardTime;
+            emission._frameRateTime -= discardTime;
         }
         // Add new particles to vertex buffer when has wait process retired element or new particle
         //