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

package/dist/main.js

@@ -565,6 +565,9 @@ function _instanceof(left, right) {
                     if (sourceProperty._cloneTo) {
                         sourceProperty._cloneTo(targetOProperty);
                     }
+                    if (sourceProperty.copyFrom) {
+                        targetOProperty.copyFrom(sourceProperty);
+                    }
                     break;
             }
         } else {
@@ -4207,7 +4210,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]));
@@ -7610,13 +7617,12 @@ var SimpleSpriteAssembler = (_SimpleSpriteAssembler = /*#__PURE__*/ function() {
     function SimpleSpriteAssembler1() {}
     SimpleSpriteAssembler1.resetData = function resetData(renderer) {
         var verticesData = renderer._verticesData;
-        var vertexCount = verticesData.vertexCount = 4;
         var positions = verticesData.positions, uvs = verticesData.uvs;
-        if (positions.length < vertexCount) {
-            for(var i = positions.length; i < vertexCount; i++){
-                positions.push(new engineMath.Vector3());
-                uvs.push(new engineMath.Vector2());
-            }
+        verticesData.vertexCount = positions.length = uvs.length = 4;
+        for(var i = 0; i < 4; i++){
+            var _positions, _i, _uvs, _i1;
+            (_positions = positions)[_i = i] || (_positions[_i] = new engineMath.Vector3());
+            (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new engineMath.Vector2());
         }
         verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
     };
@@ -11777,8 +11783,8 @@ var PrimitiveType;
     function SkinnedMeshRenderer(entity) {
         var _this;
         _this = MeshRenderer1.call(this, entity) || this;
-        _this._jointDataCreateCache = new engineMath.Vector2(-1, -1);
         _this._localBounds = new engineMath.BoundingBox();
+        _this._jointDataCreateCache = new engineMath.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 +12088,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 +12103,6 @@ __decorate([
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_rootBone", void 0);
-__decorate([
-    ignoreClone
-], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
 __decorate([
     ignoreClone
 ], SkinnedMeshRenderer.prototype, "_jointMatrices", void 0);
@@ -13134,7 +13140,7 @@ var /** @internal */ PromiseState;
         var objects = Utils.objectValues(this._referResourcePool);
         for(var i = 0, len = objects.length; i < len; i++){
             if (!objects[i].isGCIgnored || forceDestroy) {
-                objects[i].destroy();
+                objects[i].destroy(forceDestroy);
             }
         }
     };
@@ -13224,12 +13230,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;
 }();
@@ -16821,9 +16827,6 @@ ShaderPool.init();
     _proto._destroy = function _destroy() {
         this._sceneManager._destroyAllScene();
         this._resourceManager._destroy();
-        this._whiteTexture2D.destroy(true);
-        this._magentaTexture2D.destroy(true);
-        this._magentaTextureCube.destroy(true);
         this._textDefaultFont = null;
         this._fontMap = null;
         this.inputManager._destroy();
@@ -22896,17 +22899,17 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     SlicedSpriteAssembler1.resetData = function resetData(renderer) {
         var verticesData = renderer._verticesData;
         var positions = verticesData.positions, uvs = verticesData.uvs;
-        if (positions.length < 16) {
-            for(var i = positions.length; i < 16; i++){
-                positions.push(new engineMath.Vector3());
-                uvs.push(new engineMath.Vector2());
-            }
+        verticesData.vertexCount = positions.length = uvs.length = 16;
+        for(var i = 0; i < 16; i++){
+            var _positions, _i, _uvs, _i1;
+            (_positions = positions)[_i = i] || (_positions[_i] = new engineMath.Vector3());
+            (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new engineMath.Vector2());
         }
-        verticesData.triangles = [];
+        verticesData.triangles = SlicedSpriteAssembler._rectangleTriangles;
     };
     SlicedSpriteAssembler1.updatePositions = function updatePositions(renderer) {
         var width = renderer.width, height = renderer.height, sprite = renderer.sprite;
-        var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs, triangles = _renderer__verticesData.triangles;
+        var _renderer__verticesData = renderer._verticesData, positions = _renderer__verticesData.positions, uvs = _renderer__verticesData.uvs;
         var border = sprite.border;
         var spriteUVs = sprite._getUVs();
         // Update local positions.
@@ -22989,34 +22992,16 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
         //  0 - 4 - 8  - 12
         // ------------------------
         // Assemble position and uv.
-        var vertexCount = 0;
-        var realICount = 0;
         for(var i = 0; i < 4; i++){
             var rowValue = row[i];
             var rowU = spriteUVs[i].x;
             for(var j = 0; j < 4; j++){
                 var columnValue = column[j];
-                positions[vertexCount].set(wE[0] * rowValue + wE[4] * columnValue + wE[12], wE[1] * rowValue + wE[5] * columnValue + wE[13], wE[2] * rowValue + wE[6] * columnValue + wE[14]);
-                uvs[vertexCount].set(rowU, spriteUVs[j].y);
-                ++vertexCount;
-            }
-            ++realICount;
-        }
-        var realJCount = vertexCount / realICount;
-        var indexOffset = 0;
-        for(var i1 = 0; i1 < realICount - 1; ++i1){
-            for(var j1 = 0; j1 < realJCount - 1; ++j1){
-                var start = i1 * realJCount + j1;
-                triangles[indexOffset++] = start;
-                triangles[indexOffset++] = start + 1;
-                triangles[indexOffset++] = start + realJCount;
-                triangles[indexOffset++] = start + 1;
-                triangles[indexOffset++] = start + realJCount + 1;
-                triangles[indexOffset++] = start + realJCount;
-            }
-        }
-        renderer._verticesData.vertexCount = realICount * realJCount;
-        triangles.length = (realICount - 1) * (realJCount - 1) * 6;
+                var idx = i * 4 + j;
+                positions[idx].set(wE[0] * rowValue + wE[4] * columnValue + wE[12], wE[1] * rowValue + wE[5] * columnValue + wE[13], wE[2] * rowValue + wE[6] * columnValue + wE[14]);
+                uvs[idx].set(rowU, spriteUVs[j].y);
+            }
+        }
         var _renderer__bounds = renderer._bounds, min = _renderer__bounds.min, max = _renderer__bounds.max;
         min.set(row[0], column[0], 0);
         max.set(row[3], column[3], 0);
@@ -23024,6 +23009,63 @@ var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
     };
     SlicedSpriteAssembler1.updateUVs = function updateUVs(renderer) {};
     return SlicedSpriteAssembler1;
+}(), function() {
+    _SlicedSpriteAssembler._rectangleTriangles = [
+        0,
+        1,
+        4,
+        1,
+        5,
+        4,
+        1,
+        2,
+        5,
+        2,
+        6,
+        5,
+        2,
+        3,
+        6,
+        3,
+        7,
+        6,
+        4,
+        5,
+        8,
+        5,
+        9,
+        8,
+        5,
+        6,
+        9,
+        6,
+        10,
+        9,
+        6,
+        7,
+        10,
+        7,
+        11,
+        10,
+        8,
+        9,
+        12,
+        9,
+        13,
+        12,
+        9,
+        10,
+        13,
+        10,
+        14,
+        13,
+        10,
+        11,
+        14,
+        11,
+        15,
+        14
+    ];
 }(), function() {
     _SlicedSpriteAssembler._worldMatrix = new engineMath.Matrix();
 }(), _SlicedSpriteAssembler);
@@ -23035,8 +23077,7 @@ var _TiledSpriteAssembler;
 var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
     function TiledSpriteAssembler1() {}
     TiledSpriteAssembler1.resetData = function resetData(renderer) {
-        var _renderer__verticesData;
-        (_renderer__verticesData = renderer._verticesData).triangles || (_renderer__verticesData.triangles = []);
+        renderer._verticesData.triangles = [];
     };
     TiledSpriteAssembler1.updatePositions = function updatePositions(renderer) {
         var width = renderer.width, height = renderer.height, sprite = renderer.sprite, tileMode = renderer.tileMode, threshold = renderer.tiledAdaptiveThreshold;
@@ -24452,7 +24493,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();
@@ -24530,7 +24571,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);
                 }
             }
@@ -24540,7 +24582,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;
         }
     };
@@ -27398,6 +27441,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, [
@@ -27997,8 +28041,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 engineMath.Rand(0, ParticleRandomSubSeeds.Shape);
+        /** @internal */ _this._frameRateTime = 0;
         _this._bursts = [];
-        _this._frameRateTime = 0;
         _this._currentBurstIndex = 0;
         _this._burstRand = new engineMath.Rand(0, ParticleRandomSubSeeds.Burst);
         return _this;
@@ -28047,7 +28091,8 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._resetBurst = function _resetBurst() {
+   */ _proto._reset = function _reset() {
+        this._frameRateTime = 0;
         this._currentBurstIndex = 0;
     };
     _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -29005,7 +29050,7 @@ __decorate([
                 this._firstActiveElement = firstFreeElement;
                 this._firstNewElement = firstFreeElement;
                 this._playTime = 0;
-                this.emission._resetBurst();
+                this.emission._reset();
             }
         }
     };
@@ -29040,19 +29085,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
         //