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

package/dist/main.js

@@ -4907,32 +4907,10 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         if (rootBoneIndex !== -1) {
             engineMath.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 engineMath.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) {
-                engineMath.Matrix.multiplyScalar(approximateBindMatrix, 1.0 / subRootBoneCount, approximateBindMatrix);
-                engineMath.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) {
-                engineMath.Matrix.add(approximateBindMatrix, inverseBindMatrices[index], approximateBindMatrix);
-                subRootBoneCount++;
-            } else {
-                subRootBoneCount += this._computeApproximateBindMatrix(jointEntities, inverseBindMatrices, rootChild, approximateBindMatrix);
-            }
+            var inverseRootBoneWorld = new engineMath.Matrix();
+            engineMath.Matrix.invert(rootBone.transform.worldMatrix, inverseRootBoneWorld);
+            engineMath.BoundingBox.transform(mesh.bounds, inverseRootBoneWorld, skinnedMeshRenderer.localBounds);
         }
-        return subRootBoneCount;
     };
     return GLTFSceneParser;
 }(GLTFParser);
@@ -4975,8 +4953,7 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser) {
                 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 {
@@ -4987,46 +4964,20 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser) {
         });
         return engineCore.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];
@@ -5034,17 +4985,22 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser) {
                 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;
                 }
@@ -6615,7 +6571,10 @@ AudioLoader = __decorate([
         "mp3",
         "ogg",
         "wav",
-        "audio"
+        "audio",
+        "m4a",
+        "aac",
+        "flac"
     ])
 ], AudioLoader);
 
@@ -6886,6 +6845,14 @@ var SceneLoader = /*#__PURE__*/ function(Loader) {
                         if (fog.fogDensity != undefined) scene.fogDensity = fog.fogDensity;
                         if (fog.fogColor != undefined) scene.fogColor.copyFrom(fog.fogColor);
                     }
+                    // parse physics
+                    var physics = data.scene.physics;
+                    // PhysicsScene has a native backing only when the engine was created with a physics backend.
+                    // Keep scene files loadable for render-only engines by ignoring serialized physics settings there.
+                    if (physics && engine._physicsInitialized) {
+                        if (physics.gravity != undefined) scene.physics.gravity.copyFrom(physics.gravity);
+                        if (physics.fixedTimeStep != undefined) scene.physics.fixedTimeStep = physics.fixedTimeStep;
+                    }
                     // Post Process
                     var postProcessData = data.scene.postProcess;
                     if (postProcessData) {