@galacean/engine-loader 1.0.0-beta.17 → 1.0.0-beta.19

package/dist/main.js

@@ -40,56 +40,61 @@ function _inherits(subClass, superClass) {
     if (superClass) _set_prototype_of(subClass, superClass);
 }
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __generator(thisArg, body) {
+  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+  function verb(n) { return function (v) { return step([n, v]); }; }
+  function step(op) {
+      if (f) throw new TypeError("Generator is already executing.");
+      while (g && (g = 0, op[0] && (_ = 0)), _) try {
+          if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+          if (y = 0, t) op = [op[0] & 2, t.value];
+          switch (op[0]) {
+              case 0: case 1: t = op; break;
+              case 4: _.label++; return { value: op[1], done: false };
+              case 5: _.label++; y = op[1]; op = [0]; continue;
+              case 7: op = _.ops.pop(); _.trys.pop(); continue;
+              default:
+                  if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                  if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                  if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                  if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                  if (t[2]) _.ops.pop();
+                  _.trys.pop(); continue;
+          }
+          op = body.call(thisArg, _);
+      } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+      if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+  }
 }
 
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
 var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(AnimatorControllerLoader, Loader1);
     function AnimatorControllerLoader() {
@@ -443,15 +448,18 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
                         for(var _iterator2 = _create_for_of_iterator_helper_loose(meshInfo.blendShapes), _step2; !(_step2 = _iterator2()).done;){
                             var restoreInfo = _step2.value;
                             var frame = restoreInfo.blendShape.frames[0];
-                            var positionData = _this._getBufferData(buffers, restoreInfo.position);
-                            frame.deltaPositions = GLTFUtils.floatBufferToVector3Array(positionData);
+                            var position = restoreInfo.position;
+                            var positionData = _this._getBufferData(buffers, position.buffer);
+                            frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.stride, position.byteOffset, position.count);
                             if (restoreInfo.normal) {
-                                var normalData = _this._getBufferData(buffers, restoreInfo.normal);
-                                frame.deltaNormals = GLTFUtils.floatBufferToVector3Array(normalData);
+                                var normal = restoreInfo.normal;
+                                var normalData = _this._getBufferData(buffers, normal.buffer);
+                                frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.stride, normal.byteOffset, normal.count);
                             }
                             if (restoreInfo.tangent) {
-                                var tangentData = _this._getBufferData(buffers, restoreInfo.tangent);
-                                frame.deltaTangents = GLTFUtils.floatBufferToVector3Array(tangentData);
+                                var tangent = restoreInfo.tangent;
+                                var tangentData = _this._getBufferData(buffers, tangent.buffer);
+                                frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.stride, tangent.byteOffset, tangent.count);
                             }
                         }
                         mesh.uploadData(true);
@@ -535,6 +543,14 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     this.normal = normal;
     this.tangent = tangent;
 };
+/**
+ * @internal
+ */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, stride, byteOffset, count) {
+    this.buffer = buffer;
+    this.stride = stride;
+    this.byteOffset = byteOffset;
+    this.count = count;
+};
 
 /**
  * Module for glTF 2.0 Interface
@@ -837,8 +853,10 @@ var TextureWrapMode;
         return context.getBuffers().then(function(buffers) {
             var bufferIndex = bufferView.buffer;
             var buffer = buffers[bufferIndex];
-            var bufferByteOffset = bufferView.byteOffset || 0;
-            var byteOffset = accessor.byteOffset || 0;
+            var _bufferView_byteOffset;
+            var bufferByteOffset = (_bufferView_byteOffset = bufferView.byteOffset) != null ? _bufferView_byteOffset : 0;
+            var _accessor_byteOffset;
+            var byteOffset = (_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0;
             var TypedArray = GLTFUtils.getComponentType(componentType);
             var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
             var dataElementBytes = TypedArray.BYTES_PER_ELEMENT;
@@ -872,6 +890,17 @@ var TextureWrapMode;
             return bufferInfo;
         });
     };
+    GLTFUtils.bufferToVector3Array = function bufferToVector3Array(data, byteStride, accessorByteOffset, count) {
+        var bytesPerElement = data.BYTES_PER_ELEMENT;
+        var offset = accessorByteOffset % byteStride / bytesPerElement;
+        var stride = byteStride / bytesPerElement;
+        var vector3s = new Array(count);
+        for(var i = 0; i < count; i++){
+            var index = offset + i * stride;
+            vector3s[i] = new engineMath.Vector3(data[index], data[index + 1], data[index + 2]);
+        }
+        return vector3s;
+    };
     /**
    * @deprecated
    * Get accessor data.
@@ -1975,7 +2004,7 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
             }
             // BlendShapes
             if (targets) {
-                promises.push(GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, targets, getBlendShapeData));
+                promises.push(GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, accessors, targets, getBlendShapeData));
             }
             return Promise.all(promises).then(function() {
                 mesh.uploadData(!keepMeshData);
@@ -1991,7 +2020,7 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
     };
     /**
    * @internal
-   */ GLTFMeshParser._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, glTFTargets, getBlendShapeData) {
+   */ GLTFMeshParser._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, accessors, glTFTargets, getBlendShapeData) {
         var _loop = function(i, n) {
             var name = blendShapeNames ? blendShapeNames[i] : "blendShape" + i;
             var promise = Promise.all([
@@ -1999,16 +2028,36 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
                 getBlendShapeData("NORMAL", i),
                 getBlendShapeData("TANGENT", i)
             ]).then(function(infos) {
-                var deltaPosBufferInfo = infos[0];
-                var deltaNorBufferInfo = infos[1];
-                var deltaTanBufferInfo = infos[2];
-                var deltaPositions = deltaPosBufferInfo.data ? GLTFUtils.floatBufferToVector3Array(deltaPosBufferInfo.data) : null;
-                var deltaNormals = (deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.data) ? GLTFUtils.floatBufferToVector3Array(deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.data) : null;
-                var deltaTangents = (deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.data) ? GLTFUtils.floatBufferToVector3Array(deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.data) : null;
+                var posBufferInfo = infos[0];
+                var norBufferInfo = infos[1];
+                var tanBufferInfo = infos[2];
+                var target = glTFTargets[i];
+                var posAccessor;
+                var norAccessor;
+                var tanAccessor;
+                var positions = null;
+                if (posBufferInfo) {
+                    posAccessor = accessors[target["POSITION"]];
+                    var _posAccessor_byteOffset;
+                    positions = GLTFUtils.bufferToVector3Array(posBufferInfo.data, posBufferInfo.stride, (_posAccessor_byteOffset = posAccessor.byteOffset) != null ? _posAccessor_byteOffset : 0, posAccessor.count);
+                }
+                var normals = null;
+                if (norBufferInfo) {
+                    norAccessor = accessors[target["NORMAL"]];
+                    var _norAccessor_byteOffset;
+                    normals = GLTFUtils.bufferToVector3Array(norBufferInfo.data, norBufferInfo.stride, (_norAccessor_byteOffset = norAccessor.byteOffset) != null ? _norAccessor_byteOffset : 0, norAccessor.count);
+                }
+                var tangents = null;
+                if (tanBufferInfo) {
+                    tanAccessor = accessors[target["NORMAL"]];
+                    var _tanAccessor_byteOffset;
+                    tangents = GLTFUtils.bufferToVector3Array(tanBufferInfo.data, tanBufferInfo.stride, (_tanAccessor_byteOffset = tanAccessor.byteOffset) != null ? _tanAccessor_byteOffset : 0, tanAccessor.count);
+                }
                 var blendShape = new engineCore.BlendShape(name);
-                blendShape.addFrame(1.0, deltaPositions, deltaNormals, deltaTangents);
+                blendShape.addFrame(1.0, positions, normals, tangents);
                 mesh.addBlendShape(blendShape);
-                meshRestoreInfo.blendShapes.push(new BlendShapeRestoreInfo(blendShape, deltaPosBufferInfo.restoreInfo, deltaNorBufferInfo == null ? void 0 : deltaNorBufferInfo.restoreInfo, deltaTanBufferInfo == null ? void 0 : deltaTanBufferInfo.restoreInfo));
+                var _posAccessor_byteOffset1, _norAccessor_byteOffset1, _tanAccessor_byteOffset1;
+                meshRestoreInfo.blendShapes.push(new BlendShapeRestoreInfo(blendShape, new BlendShapeDataRestoreInfo(posBufferInfo.restoreInfo, posBufferInfo.stride, (_posAccessor_byteOffset1 = posAccessor.byteOffset) != null ? _posAccessor_byteOffset1 : 0, posAccessor.count), norBufferInfo ? new BlendShapeDataRestoreInfo(norBufferInfo.restoreInfo, norBufferInfo.stride, (_norAccessor_byteOffset1 = norAccessor.byteOffset) != null ? _norAccessor_byteOffset1 : 0, norAccessor.count) : null, tanBufferInfo ? new BlendShapeDataRestoreInfo(tanBufferInfo.restoreInfo, tanBufferInfo.stride, (_tanAccessor_byteOffset1 = tanAccessor.byteOffset) != null ? _tanAccessor_byteOffset1 : 0, tanAccessor.count) : null));
             });
             promises.push(promise);
         };
@@ -2338,13 +2387,13 @@ var GLTFTextureParser = /*#__PURE__*/ function(GLTFParser) {
     };
     _proto._parseSampler = function _parseSampler(texture, samplerInfo) {
         var filterMode = samplerInfo.filterMode, wrapModeU = samplerInfo.wrapModeU, wrapModeV = samplerInfo.wrapModeV;
-        if (filterMode) {
+        if (filterMode !== undefined) {
             texture.filterMode = filterMode;
         }
-        if (wrapModeU) {
+        if (wrapModeU !== undefined) {
             texture.wrapModeU = wrapModeU;
         }
-        if (wrapModeV) {
+        if (wrapModeV !== undefined) {
             texture.wrapModeV = wrapModeV;
         }
     };
@@ -2482,7 +2531,7 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
             resourceManager.addContentRestorer(restorer);
             masterPromiseInfo.resolve(glTFResource);
         }).catch(function(e) {
-            var msg = "Error loading glTF model from " + url + " .";
+            var msg = "Error loading glTF model from " + url + " : " + e;
             engineCore.Logger.error(msg);
             masterPromiseInfo.reject(msg);
             context.defaultSceneRootPromiseInfo.reject(e);
@@ -4720,7 +4769,7 @@ var KHR_draco_mesh_compression = (_KHR_draco_mesh_compression = /*#__PURE__*/ fu
             mesh.addSubMesh(0, vertexCount, mode);
         }
         // BlendShapes
-        targets && GLTFMeshParser._createBlendShape(mesh, null, gltfMesh, targets, getBlendShapeData);
+        targets && GLTFMeshParser._createBlendShape(mesh, null, gltfMesh, accessors, targets, getBlendShapeData);
         mesh.uploadData(!keepMeshData);
         return Promise.resolve(mesh);
     };