@galacean/engine 0.0.0-experimental-2.0-game.12 → 0.0.0-experimental-2.0-game.13

package/dist/browser.js

@@ -12744,7 +12744,13 @@
     };
     ShaderFactory._has300OutInFragReg = /\bout\s+(?:\w+\s+)?vec4\s+\w+\s*;/;
     ShaderFactory._precisionStr = "\n#ifdef GL_FRAGMENT_PRECISION_HIGH\n  precision highp float;\n  precision highp int;\n#else\n  precision mediump float;\n  precision mediump int;\n#endif\n";
-    ShaderFactory._derivedDefines = "#define renderer_MVMat (camera_ViewMat * renderer_ModelMat)\n#define renderer_MVPMat (camera_VPMat * renderer_ModelMat)\n#define renderer_NormalMat mat4(transpose(inverse(mat3(renderer_ModelMat))))";
+    // Derived built-ins re-exposed on top of `renderer_ModelMat`.
+    // `renderer_NormalMat` uses the cofactor (cross-product) form, which algebraically equals
+    // `det(M) · transpose(inverse(M))`. After `normalize()` it's directionally identical to the
+    // classic `transpose(inverse(M))`, but stays NaN-free when `M` is singular (e.g. any scale
+    // axis is 0 — common in animations that pop / hide via scale). `sign(det)` (`s` below)
+    // keeps mirrored matrices facing the right way
+    ShaderFactory._derivedDefines = "mat3 _normalMatFromModel(mat3 m) {\n    vec3 c0 = cross(m[1], m[2]);\n    vec3 c1 = cross(m[2], m[0]);\n    vec3 c2 = cross(m[0], m[1]);\n    float s = (dot(m[0], c0) < 0.0) ? -1.0 : 1.0;\n    return mat3(c0 * s, c1 * s, c2 * s);\n}\n#define renderer_MVMat (camera_ViewMat * renderer_ModelMat)\n#define renderer_MVPMat (camera_VPMat * renderer_ModelMat)\n#define renderer_NormalMat mat4(_normalMatFromModel(mat3(renderer_ModelMat)))";
     // Built-in renderer uniforms. value=true means derived (remove but not added to UBO)
     ShaderFactory._builtinRendererUniforms = {
         renderer_ModelMat: false,
@@ -23980,7 +23986,7 @@
         /** Scene. */ AssetType["Scene"] = "Scene";
         /** Font. */ AssetType["Font"] = "Font";
         /** Source Font, include ttf, otf and woff. */ AssetType["SourceFont"] = "SourceFont";
-        /** AudioClip, include ogg, wav and mp3. */ AssetType["Audio"] = "Audio";
+        /** AudioClip, include ogg, wav, mp3, m4a, aac and flac. */ AssetType["Audio"] = "Audio";
         /** Project asset. */ AssetType["Project"] = "project";
         /** PhysicsMaterial. */ AssetType["PhysicsMaterial"] = "PhysicsMaterial";
         /** RenderTarget. */ AssetType["RenderTarget"] = "RenderTarget";
@@ -26860,8 +26866,7 @@
        * You need to obtain the actual number of contact points from the function's return value.
        */ _proto.getContacts = function getContacts(outContacts) {
             var nativeCollision = this._nativeCollision;
-            var smallerShapeId = Math.min(nativeCollision.shape0Id, nativeCollision.shape1Id);
-            var factor = this.shape.id === smallerShapeId ? 1 : -1;
+            var factor = this.shape.id === nativeCollision.shape1Id ? 1 : -1;
             var nativeContactPoints = nativeCollision.getContacts();
             var length = nativeContactPoints.size();
             for(var i = 0; i < length; i++){
@@ -38341,8 +38346,8 @@
             if (this._tryCrossFadeInterrupt(layerData, transitionDuration, destState, deltaTime, aniUpdate)) {
                 return;
             }
-            var srcPlaySpeed = srcState.speed * speed;
-            var dstPlaySpeed = destState.speed * speed;
+            var srcPlaySpeed = srcPlayData.speed * speed;
+            var dstPlaySpeed = destPlayData.speed * speed;
             var dstPlayDeltaTime = dstPlaySpeed * deltaTime;
             srcPlayData && srcPlayData.updateOrientation(srcPlaySpeed * deltaTime);
             destPlayData && destPlayData.updateOrientation(dstPlayDeltaTime);
@@ -53859,32 +53864,10 @@
             if (rootBoneIndex !== -1) {
                 BoundingBox.transform(mesh.bounds, inverseBindMatrices[rootBoneIndex], skinnedMeshRenderer.localBounds);
             } else {
-                // Root bone is not in joints list, we can only compute approximate inverse bind matrix
-                // Average all root bone's children inverse bind matrix
-                var approximateBindMatrix = new Matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-                var subRootBoneCount = this._computeApproximateBindMatrix(bones, inverseBindMatrices, rootBone, approximateBindMatrix);
-                if (subRootBoneCount !== 0) {
-                    Matrix.multiplyScalar(approximateBindMatrix, 1.0 / subRootBoneCount, approximateBindMatrix);
-                    BoundingBox.transform(mesh.bounds, approximateBindMatrix, skinnedMeshRenderer.localBounds);
-                } else {
-                    skinnedMeshRenderer.localBounds.copyFrom(mesh.bounds);
-                }
-            }
-        };
-        _proto._computeApproximateBindMatrix = function _computeApproximateBindMatrix(jointEntities, inverseBindMatrices, rootEntity, approximateBindMatrix) {
-            var subRootBoneCount = 0;
-            var children = rootEntity.children;
-            for(var i = 0, n = children.length; i < n; i++){
-                var rootChild = children[i];
-                var index = jointEntities.indexOf(rootChild);
-                if (index !== -1) {
-                    Matrix.add(approximateBindMatrix, inverseBindMatrices[index], approximateBindMatrix);
-                    subRootBoneCount++;
-                } else {
-                    subRootBoneCount += this._computeApproximateBindMatrix(jointEntities, inverseBindMatrices, rootChild, approximateBindMatrix);
-                }
+                var inverseRootBoneWorld = new Matrix();
+                Matrix.invert(rootBone.transform.worldMatrix, inverseRootBoneWorld);
+                BoundingBox.transform(mesh.bounds, inverseRootBoneWorld, skinnedMeshRenderer.localBounds);
             }
-            return subRootBoneCount;
         };
         return GLTFSceneParser;
     }(GLTFParser);
@@ -53926,8 +53909,7 @@
                     var rootBone = entities[skeleton];
                     skin.rootBone = rootBone;
                 } else {
-                    var _this__findSceneRootBone;
-                    var rootBone1 = (_this__findSceneRootBone = _this._findSceneRootBone(context, joints, entities)) != null ? _this__findSceneRootBone : _this._findSkeletonRootBone(joints, entities);
+                    var rootBone1 = _this._findSkinRootBoneByLCA(index, joints, entities, glTF.nodes);
                     if (rootBone1) {
                         skin.rootBone = rootBone1;
                     } else {
@@ -53938,46 +53920,20 @@
             });
             return AssetPromise.resolve(skinPromise);
         };
-        _proto._findSceneRootBone = function _findSceneRootBone(context, joints, entities) {
-            var glTF = context.glTF, glTFResource = context.glTFResource;
-            var scenes = glTF.scenes;
-            var sceneRoots = glTFResource._sceneRoots;
-            if (!(scenes == null ? void 0 : scenes.length) || !(sceneRoots == null ? void 0 : sceneRoots.length)) {
-                return null;
-            }
-            for(var i = 0, n = scenes.length; i < n; i++){
-                var _scenes_i_nodes;
-                var sceneNodes = (_scenes_i_nodes = scenes[i].nodes) != null ? _scenes_i_nodes : [];
-                if (sceneNodes.length <= 1) {
-                    continue;
-                }
-                var sceneRoot = sceneRoots[i];
-                if (!sceneRoot) {
-                    continue;
-                }
-                var sceneRootChildren = new Set(sceneNodes.map(function(nodeIndex) {
-                    return entities[nodeIndex];
-                }));
-                var allJointsUnderSceneRoot = true;
-                for(var j = 0, m = joints.length; j < m; j++){
-                    var entity = entities[joints[j]];
-                    while(entity == null ? void 0 : entity.parent){
-                        entity = entity.parent;
-                    }
-                    if (!sceneRootChildren.has(entity)) {
-                        allJointsUnderSceneRoot = false;
-                        break;
-                    }
-                }
-                if (allJointsUnderSceneRoot) {
-                    return sceneRoot;
+        _proto._findSkinRootBoneByLCA = function _findSkinRootBoneByLCA(skinIndex, joints, entities, nodes) {
+            if (nodes === void 0) nodes = [];
+            var nodeIndices = joints.slice();
+            for(var i = 0, n = nodes.length; i < n; i++){
+                var _nodes_i;
+                if (((_nodes_i = nodes[i]) == null ? void 0 : _nodes_i.skin) === skinIndex) {
+                    nodeIndices.push(i);
                 }
             }
-            return null;
+            return this._findRootBoneByLCA(nodeIndices, entities);
         };
-        _proto._findSkeletonRootBone = function _findSkeletonRootBone(joints, entities) {
-            var paths = {};
-            for(var _iterator = _create_for_of_iterator_helper_loose(joints), _step; !(_step = _iterator()).done;){
+        _proto._findRootBoneByLCA = function _findRootBoneByLCA(nodeIndices, entities) {
+            var paths = [];
+            for(var _iterator = _create_for_of_iterator_helper_loose(nodeIndices), _step; !(_step = _iterator()).done;){
                 var index = _step.value;
                 var path = new Array();
                 var entity = entities[index];
@@ -53985,17 +53941,22 @@
                     path.unshift(entity);
                     entity = entity.parent;
                 }
-                paths[index] = path;
+                if (path.length) {
+                    paths.push(path);
+                }
+            }
+            if (!paths.length) {
+                return null;
             }
             var rootNode = null;
             for(var i = 0;; i++){
-                var path1 = paths[joints[0]];
+                var path1 = paths[0];
                 if (i >= path1.length) {
                     return rootNode;
                 }
                 var entity1 = path1[i];
-                for(var j = 1, m = joints.length; j < m; j++){
-                    path1 = paths[joints[j]];
+                for(var j = 1, m = paths.length; j < m; j++){
+                    path1 = paths[j];
                     if (i >= path1.length || entity1 !== path1[i]) {
                         return rootNode;
                     }
@@ -55540,7 +55501,10 @@
             "mp3",
             "ogg",
             "wav",
-            "audio"
+            "audio",
+            "m4a",
+            "aac",
+            "flac"
         ])
     ], AudioLoader);
     var ShaderChunkLoader = /*#__PURE__*/ function(Loader) {
@@ -56330,7 +56294,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "0.0.0-experimental-2.0-game.12";
+    var version = "0.0.0-experimental-2.0-game.13";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);