@galacean/engine-loader 2.0.0-alpha.33 → 2.0.0-alpha.35

package/dist/main.js

@@ -3318,13 +3318,13 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
             _this.needAnimatorController = !!(json.skins || json.animations);
             return engineCore.AssetPromise.all([
                 _this.get(1),
+                _this.get(2),
                 _this.get(5),
                 _this.get(6),
                 _this.get(7),
                 _this.get(9),
                 _this.get(10),
-                _this.get(11),
-                _this.get(2)
+                _this.get(11)
             ]).then(function() {
                 var glTFResource = _this.glTFResource;
                 var animatorController = glTFResource.animatorController;
@@ -4974,35 +4974,15 @@ 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);
-            }
+            // rootBone can be outside skin.joints, so it has no inverse bind matrix
+            var inverseRootBoneWorld = GLTFSceneParser._tempMatrix;
+            engineMath.Matrix.invert(rootBone.transform.worldMatrix, inverseRootBoneWorld);
+            engineMath.BoundingBox.transform(mesh.bounds, inverseRootBoneWorld, skinnedMeshRenderer.localBounds);
         }
-        return subRootBoneCount;
     };
     return GLTFSceneParser;
 }(GLTFParser);
+exports.GLTFSceneParser._tempMatrix = new engineMath.Matrix();
 exports.GLTFSceneParser = __decorate([
     registerGLTFParser(GLTFParserType.Scene)
 ], exports.GLTFSceneParser);
@@ -5037,23 +5017,29 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser) {
                 skin.joints[i] = bone.name;
             }
             skin.bones = bones;
-            // Get skeleton
+            // Get skeleton — when `skin.skeleton` is absent, resolve via joints' LCA
+            // LCA falls back to the GLTF_ROOT wrapper only when joints span multiple top-level scene nodes
             if (skeleton !== undefined) {
                 var rootBone = entities[skeleton];
+                if (!rootBone) {
+                    throw "Skin skeleton index " + skeleton + " is out of range.";
+                }
                 skin.rootBone = rootBone;
             } else {
                 var rootBone1 = _this._findSkeletonRootBone(joints, entities);
-                if (rootBone1) {
-                    skin.rootBone = rootBone1;
-                } else {
+                if (!rootBone1) {
                     throw "Failed to find skeleton root bone.";
                 }
+                skin.rootBone = rootBone1;
             }
             return skin;
         });
         return engineCore.AssetPromise.resolve(skinPromise);
     };
-    _proto._findSkeletonRootBone = function _findSkeletonRootBone(joints, entities) {
+    /**
+   * Resolve the skeleton rootBone as the lowest common ancestor of the joints' parent chains.
+   * Returns null when joints share no common ancestor.
+   */ _proto._findSkeletonRootBone = function _findSkeletonRootBone(joints, entities) {
         var paths = {};
         for(var _iterator = _create_for_of_iterator_helper_loose(joints), _step; !(_step = _iterator()).done;){
             var index = _step.value;
@@ -6325,7 +6311,10 @@ AudioLoader = __decorate([
     engineCore.resourceLoader(engineCore.AssetType.Audio, [
         "mp3",
         "ogg",
-        "wav"
+        "wav",
+        "m4a",
+        "aac",
+        "flac"
     ])
 ], AudioLoader);
 
@@ -6336,7 +6325,6 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
     }
     var _proto = ShaderLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         var url = item.url;
         if (url.endsWith(".shaderc")) {
             // @ts-ignore
@@ -6351,20 +6339,11 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
         return resourceManager._request(url, _extends({}, item, {
             type: "text"
         })).then(function(code) {
-            var builtinShader = _this._getBuiltinShader(code);
-            if (builtinShader) {
-                return engineCore.Shader.find(builtinShader);
-            }
             return engineCore.Shader.create(code, undefined, url);
         });
     };
-    _proto._getBuiltinShader = function _getBuiltinShader(code) {
-        var match = code.match(ShaderLoader._builtinRegex);
-        if (match && match[1]) return match[1];
-    };
     return ShaderLoader;
 }(engineCore.Loader);
-ShaderLoader._builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/;
 ShaderLoader = __decorate([
     engineCore.resourceLoader(engineCore.AssetType.Shader, [
         "shader",