@galacean/engine-loader 1.2.0-beta.3 → 1.2.0-beta.5

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright © 2020-2023 Galacean authors
+Copyright (c) 2020 - present Ant Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

package/dist/main.js

@@ -1886,6 +1886,7 @@ var TextureWrapMode;
         this.resourceManager = resourceManager;
         this.params = params;
         this.accessorBufferCache = {};
+        this.needAnimatorController = false;
         this._resourceCache = new Map();
         this._progress = {
             taskDetail: {},
@@ -1913,16 +1914,15 @@ var TextureWrapMode;
             return Promise.resolve(null);
         }
         var cache = this._resourceCache;
-        var isOnlyOne = type === 0 || type === 1;
-        var cacheKey = isOnlyOne || index === undefined ? "" + type : type + ":" + index;
+        var cacheKey = index === undefined ? "" + type : type + ":" + index;
         var resource = cache.get(cacheKey);
         if (resource) {
             return resource;
         }
-        if (isOnlyOne) {
-            resource = parser.parse(this);
-        } else {
-            var glTFItems = this.glTF[glTFSchemaMap[type]];
+        var glTFSchemaKey = glTFSchemaMap[type];
+        var isSubAsset = !!glTFResourceMap[type];
+        if (glTFSchemaKey) {
+            var glTFItems = this.glTF[glTFSchemaKey];
             if (glTFItems && (index === undefined || glTFItems[index])) {
                 if (index === undefined) {
                     resource = type === 8 ? glTFItems.map(function(_, index) {
@@ -1932,11 +1932,14 @@ var TextureWrapMode;
                     }));
                 } else {
                     resource = parser.parse(this, index);
-                    this._handleSubAsset(resource, type, index);
+                    isSubAsset && this._handleSubAsset(resource, type, index);
                 }
             } else {
                 resource = Promise.resolve(null);
             }
+        } else {
+            resource = parser.parse(this, index);
+            isSubAsset && this._handleSubAsset(resource, type, index);
         }
         cache.set(cacheKey, resource);
         return resource;
@@ -1945,6 +1948,7 @@ var TextureWrapMode;
         var _this = this;
         var promise = this.get(0).then(function(json) {
             _this.glTF = json;
+            _this.needAnimatorController = !!(json.skins || json.animations);
             return Promise.all([
                 _this.get(1),
                 _this.get(5),
@@ -1952,11 +1956,14 @@ var TextureWrapMode;
                 _this.get(7),
                 _this.get(9),
                 _this.get(10),
+                _this.get(11),
                 _this.get(2)
             ]).then(function() {
                 var glTFResource = _this.glTFResource;
-                if (glTFResource.skins || glTFResource.animations) {
-                    _this._createAnimator(_this, glTFResource.animations);
+                var animatorController = glTFResource.animatorController;
+                if (animatorController) {
+                    var animator = glTFResource._defaultSceneRoot.addComponent(engineCore.Animator);
+                    animator.animatorController = animatorController;
                 }
                 _this.resourceManager.addContentRestorer(_this.contentRestorer);
                 return glTFResource;
@@ -1975,40 +1982,21 @@ var TextureWrapMode;
             _this._setTaskCompleteProgress(++task.loaded, task.total);
         });
     };
-    _proto._createAnimator = function _createAnimator(context, animations) {
-        var defaultSceneRoot = context.glTFResource.defaultSceneRoot;
-        var animator = defaultSceneRoot.addComponent(engineCore.Animator);
-        var animatorController = new engineCore.AnimatorController();
-        var layer = new engineCore.AnimatorControllerLayer("layer");
-        var animatorStateMachine = new engineCore.AnimatorStateMachine();
-        animatorController.addLayer(layer);
-        animator.animatorController = animatorController;
-        layer.stateMachine = animatorStateMachine;
-        if (animations) {
-            for(var i = 0; i < animations.length; i++){
-                var animationClip = animations[i];
-                var name = animationClip.name;
-                var uniqueName = animatorStateMachine.makeUniqueStateName(name);
-                if (uniqueName !== name) {
-                    console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
-                }
-                var animatorState = animatorStateMachine.addState(uniqueName);
-                animatorState.clip = animationClip;
-            }
-        }
-    };
     _proto._handleSubAsset = function _handleSubAsset(resource, type, index) {
         var _this = this;
         var glTFResourceKey = glTFResourceMap[type];
-        if (!glTFResourceKey) return;
         if (type === 8) {
             var _this_glTFResource, _glTFResourceKey;
             ((_this_glTFResource = this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = resource;
         } else {
             var url = this.glTFResource.url;
             resource.then(function(item) {
-                var _this_glTFResource, _glTFResourceKey;
-                ((_this_glTFResource = _this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = item;
+                if (index == undefined) {
+                    _this.glTFResource[glTFResourceKey] = item;
+                } else {
+                    var _this_glTFResource, _glTFResourceKey;
+                    ((_this_glTFResource = _this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = item;
+                }
                 if (type === 7) {
                     for(var i = 0, length = item.length; i < length; i++){
                         var mesh = item[i];
@@ -2056,11 +2044,12 @@ exports.GLTFParserType = void 0;
     GLTFParserType[GLTFParserType["Entity"] = 8] = "Entity";
     GLTFParserType[GLTFParserType["Skin"] = 9] = "Skin";
     GLTFParserType[GLTFParserType["Animation"] = 10] = "Animation";
+    GLTFParserType[GLTFParserType["AnimatorController"] = 11] = "AnimatorController";
 })(exports.GLTFParserType || (exports.GLTFParserType = {}));
 var _obj;
 var glTFSchemaMap = (_obj = {}, _obj[2] = "scenes", _obj[3] = "buffers", _obj[5] = "textures", _obj[6] = "materials", _obj[7] = "meshes", _obj[8] = "nodes", _obj[9] = "skins", _obj[10] = "animations", _obj[4] = "bufferViews", _obj);
 var _obj1;
-var glTFResourceMap = (_obj1 = {}, _obj1[2] = "_sceneRoots", _obj1[5] = "textures", _obj1[6] = "materials", _obj1[7] = "meshes", _obj1[8] = "entities", _obj1[9] = "skins", _obj1[10] = "animations", _obj1);
+var glTFResourceMap = (_obj1 = {}, _obj1[2] = "_sceneRoots", _obj1[5] = "textures", _obj1[6] = "materials", _obj1[7] = "meshes", _obj1[8] = "entities", _obj1[9] = "skins", _obj1[10] = "animations", _obj1[11] = "animatorController", _obj1);
 function registerGLTFParser(pipeline) {
     return function(Parser) {
         var parser = new Parser();
@@ -4545,25 +4534,31 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         camera.enabled = false;
     };
     _proto._createRenderer = function _createRenderer(context, entityInfo, entity) {
-        var _loop = function(i) {
-            var glTFPrimitive = glTFMeshPrimitives[i];
-            var materialIndex = glTFPrimitive.material;
-            promises.push(Promise.all([
-                context.get(exports.GLTFParserType.Mesh, meshID),
-                skinID !== undefined && context.get(exports.GLTFParserType.Skin, skinID),
-                materialIndex !== undefined && context.get(exports.GLTFParserType.Material, materialIndex)
-            ]).then(function(param) {
-                var meshes = param[0], skin = param[1], material = param[2];
+        var _this = this;
+        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
+        var glTFMesh = context.glTF.meshes[meshID];
+        var glTFMeshPrimitives = glTFMesh.primitives;
+        var rendererCount = glTFMeshPrimitives.length;
+        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
+        var materialPromises = new Array(rendererCount);
+        for(var i = 0; i < rendererCount; i++){
+            materialPromises[i] = context.get(exports.GLTFParserType.Material, glTFMeshPrimitives[i].material);
+        }
+        return Promise.all([
+            context.get(exports.GLTFParserType.Mesh, meshID),
+            skinID !== undefined && context.get(exports.GLTFParserType.Skin, skinID),
+            Promise.all(materialPromises)
+        ]).then(function(param) {
+            var _loop = function(i) {
+                var material = materials[i] || exports.GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine);
+                var glTFPrimitive = glTFMeshPrimitives[i];
                 var mesh = meshes[i];
-                var renderer;
-                material || (material = exports.GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine));
+                var renderer = void 0;
                 if (skin || blendShapeWeights) {
                     var skinRenderer = entity.addComponent(engineCore.SkinnedMeshRenderer);
                     skinRenderer.mesh = mesh;
                     if (skin) {
-                        skinRenderer.rootBone = skin._rootBone;
-                        skinRenderer.bones = skin._bones;
-                        _this._computeLocalBounds(skinRenderer, mesh, skin._bones, skin._rootBone, skin.inverseBindMatrices);
+                        _this._computeLocalBounds(skinRenderer, mesh, skin.bones, skin.rootBone, skin.inverseBindMatrices);
                         skinRenderer.skin = skin;
                     }
                     if (blendShapeWeights) {
@@ -4582,17 +4577,10 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
                     }
                 });
                 GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
-            }));
-        };
-        var _this = this;
-        var glTFMeshes = context.glTF.meshes;
-        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
-        var glTFMesh = glTFMeshes[meshID];
-        var glTFMeshPrimitives = glTFMesh.primitives;
-        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
-        var promises = new Array();
-        for(var i = 0; i < glTFMeshPrimitives.length; i++)_loop(i);
-        return Promise.all(promises);
+            };
+            var meshes = param[0], skin = param[1], materials = param[2];
+            for(var i = 0; i < rendererCount; i++)_loop(i);
+        });
     };
     _proto._computeLocalBounds = function _computeLocalBounds(skinnedMeshRenderer, mesh, bones, rootBone, inverseBindMatrices) {
         var rootBoneIndex = bones.indexOf(rootBone);
@@ -4646,7 +4634,7 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
         var jointCount = joints.length;
         var skin = new engineCore.Skin(name);
         skin.inverseBindMatrices.length = jointCount;
-        skin._bones.length = jointCount;
+        var bones = new Array(jointCount);
         // parse IBM
         var accessor = glTF.accessors[inverseBindMatrices];
         var skinPromise = GLTFUtils.getAccessorBuffer(context, glTF.bufferViews, accessor).then(function(bufferInfo) {
@@ -4658,21 +4646,20 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
                 skin.inverseBindMatrices[i] = inverseBindMatrix;
                 // Get bones
                 var bone = entities[joints[i]];
-                skin._bones[i] = bone;
+                bones[i] = bone;
                 skin.joints[i] = bone.name;
-                // Get skeleton
-                if (skeleton !== undefined) {
-                    var rootBone = entities[skeleton];
-                    skin._rootBone = rootBone;
-                    skin.skeleton = rootBone.name;
+            }
+            skin.bones = bones;
+            // Get skeleton
+            if (skeleton !== undefined) {
+                var rootBone = entities[skeleton];
+                skin.rootBone = rootBone;
+            } else {
+                var rootBone1 = _this._findSkeletonRootBone(joints, entities);
+                if (rootBone1) {
+                    skin.rootBone = rootBone1;
                 } else {
-                    var rootBone1 = _this._findSkeletonRootBone(joints, entities);
-                    if (rootBone1) {
-                        skin._rootBone = rootBone1;
-                        skin.skeleton = rootBone1.name;
-                    } else {
-                        throw "Failed to find skeleton root bone.";
-                    }
+                    throw "Failed to find skeleton root bone.";
                 }
             }
             return skin;
@@ -4840,6 +4827,48 @@ exports.GLTFBufferViewParser = __decorate([
     registerGLTFParser(exports.GLTFParserType.BufferView)
 ], exports.GLTFBufferViewParser);
 
+exports.GLTFAnimatorControllerParser = /*#__PURE__*/ function(GLTFParser1) {
+    _inherits(GLTFAnimatorControllerParser, GLTFParser1);
+    function GLTFAnimatorControllerParser() {
+        return GLTFParser1.apply(this, arguments);
+    }
+    var _proto = GLTFAnimatorControllerParser.prototype;
+    _proto.parse = function parse(context) {
+        var _this = this;
+        if (!context.needAnimatorController) {
+            return Promise.resolve(null);
+        }
+        return context.get(exports.GLTFParserType.Animation).then(function(animations) {
+            var animatorController = _this._createAnimatorController(animations);
+            return Promise.resolve(animatorController);
+        });
+    };
+    _proto._createAnimatorController = function _createAnimatorController(animations) {
+        var animatorController = new engineCore.AnimatorController();
+        var layer = new engineCore.AnimatorControllerLayer("layer");
+        var animatorStateMachine = new engineCore.AnimatorStateMachine();
+        animatorController.addLayer(layer);
+        layer.stateMachine = animatorStateMachine;
+        if (animations) {
+            for(var i = 0; i < animations.length; i++){
+                var animationClip = animations[i];
+                var name = animationClip.name;
+                var uniqueName = animatorStateMachine.makeUniqueStateName(name);
+                if (uniqueName !== name) {
+                    console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
+                }
+                var animatorState = animatorStateMachine.addState(uniqueName);
+                animatorState.clip = animationClip;
+            }
+        }
+        return animatorController;
+    };
+    return GLTFAnimatorControllerParser;
+}(GLTFParser);
+exports.GLTFAnimatorControllerParser = __decorate([
+    registerGLTFParser(exports.GLTFParserType.AnimatorController)
+], exports.GLTFAnimatorControllerParser);
+
 // Source: https://github.com/zeux/meshoptimizer/blob/master/js/meshopt_decoder.js
 var MeshoptDecoder = function() {
     var unpack = function unpack(data) {
@@ -5077,7 +5106,8 @@ exports.GLTFLoader = __decorate([
 
 var _HDRLoader;
 var PI = Math.PI;
-var HDRLoader = (_HDRLoader = /*#__PURE__*/ function(Loader1) {
+var HDRLoader = (_HDRLoader = // referenece: https://www.flipcode.com/archives/HDR_Image_Reader.shtml
+/*#__PURE__*/ function(Loader1) {
     _inherits(HDRLoader1, Loader1);
     function HDRLoader1() {
         return Loader1.apply(this, arguments);
@@ -5247,15 +5277,20 @@ var HDRLoader = (_HDRLoader = /*#__PURE__*/ function(Loader1) {
         var dataRGBA = new Uint8Array(4 * width * height);
         var offset = 0, pos = 0;
         var ptrEnd = 4 * scanLineWidth;
-        var rgbeStart = new Uint8Array(4);
         var scanLineBuffer = new Uint8Array(ptrEnd);
         var numScanLines = height; // read in each successive scanLine
         while(numScanLines > 0 && pos < byteLength){
-            rgbeStart[0] = buffer[pos++];
-            rgbeStart[1] = buffer[pos++];
-            rgbeStart[2] = buffer[pos++];
-            rgbeStart[3] = buffer[pos++];
-            if (2 != rgbeStart[0] || 2 != rgbeStart[1] || (rgbeStart[2] << 8 | rgbeStart[3]) != scanLineWidth) {
+            var a = buffer[pos++];
+            var b = buffer[pos++];
+            var c = buffer[pos++];
+            var d = buffer[pos++];
+            if (a != 2 || b != 2 || c & 0x80 || width < 8 || width > 32767) {
+                // this file is not run length encoded
+                // read values sequentially
+                return buffer;
+            }
+            if ((c << 8 | d) != scanLineWidth) {
+                // eslint-disable-next-line no-throw-literal
                 throw "HDR Bad header format, wrong scan line width";
             }
             // read each of the four channels for the scanline into the buffer