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

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]));
@@ -16555,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);
@@ -16861,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);
@@ -16873,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);
@@ -17991,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;
     }();
@@ -29130,9 +29132,7 @@
             this.property = property;
             this.component = target.getComponent(type);
             this.cureType = cureType;
-            var isBlendShape = _instanceof1$2(this.component, SkinnedMeshRenderer);
-            // @todo: Temp solution with blendShape
-            this._isCopyMode = cureType._isCopyMode && !isBlendShape;
+            this._isBlendShape = _instanceof1$2(this.component, SkinnedMeshRenderer);
             var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
             this._assembler = new assemblerType();
             this._assembler.initialize(this);
@@ -29164,7 +29164,7 @@
             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 {
@@ -29172,14 +29172,14 @@
             }
         };
         _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();
@@ -29188,25 +29188,37 @@
         _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);
@@ -29216,7 +29228,7 @@
             }
         };
         _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);
@@ -32029,6 +32041,7 @@
             context.camera._renderPipeline.pushRenderData(context, renderData);
         };
         _proto._onDestroy = function _onDestroy() {
+            Renderer1.prototype._onDestroy.call(this);
             this.generator._destroy();
         };
         _create_class$3(ParticleRenderer, [
@@ -32617,8 +32630,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;
@@ -32668,7 +32681,8 @@
         };
         /**
        * @internal
-       */ _proto._resetBurst = function _resetBurst() {
+       */ _proto._reset = function _reset() {
+            this._frameRateTime = 0;
             this._currentBurstIndex = 0;
         };
         _proto._emitByRateOverTime = function _emitByRateOverTime(playTime) {
@@ -33618,7 +33632,7 @@
                     this._firstActiveElement = firstFreeElement;
                     this._firstNewElement = firstFreeElement;
                     this._playTime = 0;
-                    this.emission._resetBurst();
+                    this.emission._reset();
                 }
             }
         };
@@ -33653,19 +33667,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
             //
@@ -40175,14 +40193,6 @@
             });
         };
         _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
-            ];
             return !!KhronosTranscoder.transcoderMap[exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
         };
         /**
@@ -40266,10 +40276,21 @@
         };
         KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
             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;
                     }
                 }
             }
@@ -40783,6 +40804,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){
@@ -42751,27 +42776,32 @@
                         var promises = [];
                         // parse ambient light
                         var ambient = data.scene.ambient;
-                        var useCustomAmbient = ambient.specularMode === "Custom";
-                        var useSH = ambient.diffuseMode === exports.DiffuseMode.SphericalHarmonics;
-                        scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
-                        scene.ambientLight.specularIntensity = ambient.specularIntensity;
-                        scene.ambientLight.diffuseMode = ambient.diffuseMode;
-                        scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
-                        scene.ambientLight.specularTextureDecodeRGBM = true;
-                        if (useCustomAmbient && ambient.customAmbientLight) {
-                            promises.push(resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
-                                scene.ambientLight.specularTexture = ambientLight.specularTexture;
-                            }));
-                        }
-                        if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
-                            promises.push(resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
-                                if (!useCustomAmbient) {
-                                    scene.ambientLight.specularTexture = ambientLight.specularTexture;
-                                }
-                                if (useSH) {
-                                    scene.ambientLight.diffuseSphericalHarmonics = ambientLight.diffuseSphericalHarmonics;
-                                }
-                            }));
+                        if (ambient) {
+                            var useCustomAmbient = ambient.specularMode === "Custom";
+                            var useSH = ambient.diffuseMode === exports.DiffuseMode.SphericalHarmonics;
+                            scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
+                            scene.ambientLight.specularIntensity = ambient.specularIntensity;
+                            scene.ambientLight.diffuseMode = ambient.diffuseMode;
+                            scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
+                            scene.ambientLight.specularTextureDecodeRGBM = true;
+                            if (useCustomAmbient && ambient.customAmbientLight) {
+                                promises.push(resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
+                                    var _ambientLight;
+                                    scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
+                                }));
+                            }
+                            if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
+                                promises.push(resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
+                                    if (!useCustomAmbient) {
+                                        var _ambientLight;
+                                        scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
+                                    }
+                                    if (useSH) {
+                                        var _ambientLight1;
+                                        scene.ambientLight.diffuseSphericalHarmonics = (_ambientLight1 = ambientLight) == null ? void 0 : _ambientLight1.diffuseSphericalHarmonics;
+                                    }
+                                }));
+                            }
                         }
                         var background = data.scene.background;
                         scene.background.mode = background.mode;
@@ -43324,7 +43354,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.14";
+    var version = "1.1.0-beta.16";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);