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

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;
 }();
@@ -24487,7 +24494,7 @@ var DirtyFlag;
         this.component = target.getComponent(type);
         this.cureType = cureType;
         var isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
-        // @todo: Temp solution with blendShape
+        // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
         this._isCopyMode = cureType._isCopyMode && !isBlendShape;
         var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
         this._assembler = new assemblerType();
@@ -24565,7 +24572,8 @@ var DirtyFlag;
                     cureType._lerpValue(targetValue, value, weight, targetValue);
                 } else {
                     var originValue1 = this._assembler.getTargetValue();
-                    var lerpValue = cureType._lerpValue(originValue1, value, weight);
+                    // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
+                    var lerpValue = cureType._lerpValue(originValue1, value, weight, originValue1);
                     this._assembler.setTargetValue(lerpValue);
                 }
             }
@@ -24575,7 +24583,8 @@ var DirtyFlag;
         if (this._isCopyMode) {
             return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
         } else {
-            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
+            // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
+            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
             return this.baseEvaluateData.value;
         }
     };
@@ -27433,6 +27442,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 +28042,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 +28092,8 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._resetBurst = function _resetBurst() {
+   */ _proto._reset = function _reset() {
+        this._frameRateTime = 0;
         this._currentBurstIndex = 0;
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -29040,7 +29051,7 @@ __decorate([
                 this._firstActiveElement = firstFreeElement;
                 this._firstNewElement = firstFreeElement;
                 this._playTime = 0;
-                this.emission._resetBurst();
+                this.emission._reset();
             }
         }
     };
@@ -29075,19 +29086,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;
 }();
@@ -24482,7 +24489,7 @@ var DirtyFlag;
         this.component = target.getComponent(type);
         this.cureType = cureType;
         var isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
-        // @todo: Temp solution with blendShape
+        // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
         this._isCopyMode = cureType._isCopyMode && !isBlendShape;
         var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
         this._assembler = new assemblerType();
@@ -24560,7 +24567,8 @@ var DirtyFlag;
                     cureType._lerpValue(targetValue, value, weight, targetValue);
                 } else {
                     var originValue1 = this._assembler.getTargetValue();
-                    var lerpValue = cureType._lerpValue(originValue1, value, weight);
+                    // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
+                    var lerpValue = cureType._lerpValue(originValue1, value, weight, originValue1);
                     this._assembler.setTargetValue(lerpValue);
                 }
             }
@@ -24570,7 +24578,8 @@ var DirtyFlag;
         if (this._isCopyMode) {
             return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
         } else {
-            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
+            // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
+            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
             return this.baseEvaluateData.value;
         }
     };
@@ -27428,6 +27437,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 +28037,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 +28087,8 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._resetBurst = function _resetBurst() {
+   */ _proto._reset = function _reset() {
+        this._frameRateTime = 0;
         this._currentBurstIndex = 0;
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -29035,7 +29046,7 @@ __decorate([
                 this._firstActiveElement = firstFreeElement;
                 this._firstNewElement = firstFreeElement;
                 this._playTime = 0;
-                this.emission._resetBurst();
+                this.emission._reset();
             }
         }
     };
@@ -29070,19 +29081,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
         //