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

package/dist/browser.js

@@ -2759,22 +2759,17 @@
             var m11 = e[0];
             var m12 = e[1];
             var m13 = e[2];
-            var m14 = e[3];
             var m21 = e[4];
             var m22 = e[5];
             var m23 = e[6];
-            var m24 = e[7];
             var m31 = e[8];
             var m32 = e[9];
             var m33 = e[10];
-            var m34 = e[11];
             translation.set(e[12], e[13], e[14]);
-            var xs = Math.sign(m11 * m12 * m13 * m14) < 0 ? -1 : 1;
-            var ys = Math.sign(m21 * m22 * m23 * m24) < 0 ? -1 : 1;
-            var zs = Math.sign(m31 * m32 * m33 * m34) < 0 ? -1 : 1;
-            var sx = xs * Math.sqrt(m11 * m11 + m12 * m12 + m13 * m13);
-            var sy = ys * Math.sqrt(m21 * m21 + m22 * m22 + m23 * m23);
-            var sz = zs * Math.sqrt(m31 * m31 + m32 * m32 + m33 * m33);
+            var sx = Math.sqrt(m11 * m11 + m12 * m12 + m13 * m13);
+            var sy = Math.sqrt(m21 * m21 + m22 * m22 + m23 * m23);
+            var sz = Math.sqrt(m31 * m31 + m32 * m32 + m33 * m33);
+            if (this.determinant() < 0) sx = -sx;
             scale.set(sx, sy, sz);
             if (Math.abs(sx) < MathUtil$1.zeroTolerance || Math.abs(sy) < MathUtil$1.zeroTolerance || Math.abs(sz) < MathUtil$1.zeroTolerance) {
                 rotation.identity();
@@ -5532,6 +5527,9 @@
                         if (sourceProperty._cloneTo) {
                             sourceProperty._cloneTo(targetOProperty);
                         }
+                        if (sourceProperty.copyFrom) {
+                            targetOProperty.copyFrom(sourceProperty);
+                        }
                         break;
                 }
             } else {
@@ -9133,7 +9131,11 @@
             }
             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]));
@@ -12424,13 +12426,12 @@
         var SimpleSpriteAssembler1 = 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 Vector3());
-                    uvs.push(new 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 Vector3());
+                (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new Vector2());
             }
             verticesData.triangles = SimpleSpriteAssembler._rectangleTriangles;
         };
@@ -16556,8 +16557,8 @@
         var SkinnedMeshRenderer = 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);
@@ -16862,6 +16863,9 @@
     (function() {
         SkinnedMeshRenderer._jointMatrixProperty = ShaderProperty.getByName("renderer_JointMatrix");
     })();
+    __decorate$1([
+        deepClone
+    ], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
     __decorate$1([
         ignoreClone
     ], SkinnedMeshRenderer.prototype, "_jointDataCreateCache", void 0);
@@ -16874,9 +16878,6 @@
     __decorate$1([
         ignoreClone
     ], SkinnedMeshRenderer.prototype, "_rootBone", void 0);
-    __decorate$1([
-        ignoreClone
-    ], SkinnedMeshRenderer.prototype, "_localBounds", void 0);
     __decorate$1([
         ignoreClone
     ], SkinnedMeshRenderer.prototype, "_jointMatrices", void 0);
@@ -17902,7 +17903,7 @@
             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);
                 }
             }
         };
@@ -17992,12 +17993,12 @@
        */ 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;
     }();
@@ -21523,9 +21524,6 @@
         _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();
@@ -27548,17 +27546,17 @@
         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 Vector3());
-                    uvs.push(new 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 Vector3());
+                (_uvs = uvs)[_i1 = i] || (_uvs[_i1] = new 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.
@@ -27641,34 +27639,16 @@
             //  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);
@@ -27676,6 +27656,63 @@
         };
         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 Matrix();
     }(), _SlicedSpriteAssembler);
@@ -27686,8 +27723,7 @@
     var TiledSpriteAssembler = (_TiledSpriteAssembler = /*#__PURE__*/ function() {
         var TiledSpriteAssembler1 = 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;
@@ -29097,7 +29133,7 @@
             this.component = target.getComponent(type);
             this.cureType = cureType;
             var isBlendShape = _instanceof1$2(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();
@@ -29175,7 +29211,8 @@
                         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);
                     }
                 }
@@ -29185,7 +29222,8 @@
             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;
             }
         };
@@ -31995,6 +32033,7 @@
             context.camera._renderPipeline.pushRenderData(context, renderData);
         };
         _proto._onDestroy = function _onDestroy() {
+            Renderer1.prototype._onDestroy.call(this);
             this.generator._destroy();
         };
         _create_class$3(ParticleRenderer, [
@@ -32583,8 +32622,8 @@
             /**  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;
@@ -32634,7 +32673,8 @@
         };
         /**
        * @internal
-       */ _proto._resetBurst = function _resetBurst() {
+       */ _proto._reset = function _reset() {
+            this._frameRateTime = 0;
             this._currentBurstIndex = 0;
         };
         _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -33584,7 +33624,7 @@
                     this._firstActiveElement = firstFreeElement;
                     this._firstNewElement = firstFreeElement;
                     this._playTime = 0;
-                    this.emission._resetBurst();
+                    this.emission._reset();
                 }
             }
         };
@@ -33619,19 +33659,23 @@
         /**
        * @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
             //
@@ -37553,7 +37597,7 @@
                 var encodedMeshData = JSON.parse(jsonDataString);
                 // @ts-ignore Vector3 is not compatible with {x: number, y: number, z: number}.
                 encodedMeshData.bounds && modelMesh.bounds.copyFrom(encodedMeshData.bounds);
-                var offset = Math.ceil(bufferReader.offset / 4) * 4;
+                var offset = Math.ceil(bufferReader.position / 4) * 4;
                 var buffer = bufferReader.data.buffer;
                 var byteOffset = bufferReader.data.byteOffset;
                 var float32Array = new Float32Array(buffer, encodedMeshData.positions.start + offset + byteOffset, (encodedMeshData.positions.end - encodedMeshData.positions.start) / 4);
@@ -39469,7 +39513,7 @@
                     alphaSliceByteLength: sgdReader.nextUint32()
                 };
             }
-            var endpointsByteOffset = sgdByteOffset + sgdReader.offset;
+            var endpointsByteOffset = sgdByteOffset + sgdReader.position;
             var selectorsByteOffset = endpointsByteOffset + endpointsByteLength;
             var tablesByteOffset = selectorsByteOffset + selectorsByteLength;
             var extendedByteOffset = tablesByteOffset + tablesByteLength;
@@ -40120,6 +40164,7 @@
         _proto.initialize = function initialize(engine, configuration) {
             if (configuration.ktx2Loader) {
                 var options = configuration.ktx2Loader;
+                if (options.priorityFormats) exports.KTX2Loader._priorityFormats = options.priorityFormats;
                 if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
                     return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
                 } else {
@@ -40140,25 +40185,7 @@
             });
         };
         _proto._isKhronosSupported = function _isKhronosSupported(priorityFormats, engine) {
-            if (priorityFormats === void 0) priorityFormats = [
-                exports.KTX2TargetFormat.ASTC,
-                exports.KTX2TargetFormat.ETC,
-                exports.KTX2TargetFormat.BC7,
-                exports.KTX2TargetFormat.BC1_BC3,
-                exports.KTX2TargetFormat.PVRTC,
-                exports.KTX2TargetFormat.R8G8B8A8
-            ];
-            var supportedList = new Array();
-            if (Array.isArray(priorityFormats[0])) {
-                for(var i = 0; i < priorityFormats.length; i++){
-                    supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats[i]));
-                }
-            } else {
-                supportedList.push(exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats));
-            }
-            return supportedList.every(function(format) {
-                return KhronosTranscoder.transcoderMap[format];
-            });
+            return !!KhronosTranscoder.transcoderMap[exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
         };
         /**
        * Destroy ktx2 transcoder worker.
@@ -40172,7 +40199,8 @@
         /** @internal */ KTX2Loader1._parseBuffer = function _parseBuffer(buffer, engine, params) {
             var _params;
             var ktx2Container = new KTX2Container(buffer);
-            var formatPriorities = (_params = params) == null ? void 0 : _params.priorityFormats;
+            var _params_priorityFormats;
+            var formatPriorities = (_params_priorityFormats = (_params = params) == null ? void 0 : _params.priorityFormats) != null ? _params_priorityFormats : exports.KTX2Loader._priorityFormats;
             var targetFormat = exports.KTX2Loader._decideTargetFormat(engine, ktx2Container, formatPriorities);
             var transcodeResultPromise;
             if (exports.KTX2Loader._isBinomialInit || !KhronosTranscoder.transcoderMap[targetFormat] || !ktx2Container.isUASTC) {
@@ -40239,18 +40267,22 @@
             return targetFormat;
         };
         KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
-            if (priorityFormats === void 0) priorityFormats = [
-                exports.KTX2TargetFormat.ASTC,
-                exports.KTX2TargetFormat.ETC,
-                exports.KTX2TargetFormat.BC7,
-                exports.KTX2TargetFormat.BC1_BC3,
-                exports.KTX2TargetFormat.PVRTC
-            ];
             for(var i = 0; i < priorityFormats.length; i++){
-                var capabilities = this._supportedMap[priorityFormats[i]];
-                for(var j = 0; j < capabilities.length; j++){
-                    if (renderer.canIUse(capabilities[j])) {
-                        return priorityFormats[i];
+                var format = priorityFormats[i];
+                var capabilities = this._supportedMap[format];
+                if (capabilities) {
+                    for(var j = 0; j < capabilities.length; j++){
+                        if (renderer.canIUse(capabilities[j])) {
+                            return format;
+                        }
+                    }
+                } else {
+                    switch(priorityFormats[i]){
+                        case exports.KTX2TargetFormat.R8G8B8A8:
+                            return format;
+                        case exports.KTX2TargetFormat.R8:
+                        case exports.KTX2TargetFormat.R8G8:
+                            if (renderer.isWebGL2) return format;
                     }
                 }
             }
@@ -40287,6 +40319,14 @@
         return KTX2Loader1;
     }(Loader), function() {
         _KTX2Loader._isBinomialInit = false;
+    }(), function() {
+        _KTX2Loader._priorityFormats = [
+            exports.KTX2TargetFormat.BC7,
+            exports.KTX2TargetFormat.ASTC,
+            exports.KTX2TargetFormat.BC1_BC3,
+            exports.KTX2TargetFormat.ETC,
+            exports.KTX2TargetFormat.PVRTC
+        ];
     }(), function() {
         var _obj;
         _KTX2Loader._supportedMap = (_obj = {}, _obj[exports.KTX2TargetFormat.ASTC] = [
@@ -40756,6 +40796,10 @@
                         relativePath = relativePath === "" ? "" + entity.name : entity.name + "/" + relativePath;
                         entity = entity.parent;
                     }
+                    // If the target node is in the default scene, relativePath will be empty
+                    if (entity !== context.glTFResource.defaultSceneRoot) {
+                        continue;
+                    }
                     var ComponentType = void 0;
                     var propertyName = void 0;
                     switch(target.path){
@@ -43297,7 +43341,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.13";
+    var version = "1.1.0-beta.15";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);