@galacean/engine-loader 1.2.0-beta.0 → 1.2.0-beta.1

package/dist/miniprogram.js

@@ -2165,114 +2165,68 @@ function registerGLTFParser(pipeline) {
     };
     GLTFUtils.getAccessorBuffer = function getAccessorBuffer(context, bufferViews, accessor) {
         var componentType = accessor.componentType;
-        var _accessor_bufferView;
-        var bufferViewIndex = (_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0;
-        var bufferView = bufferViews[bufferViewIndex];
-        return context.get(exports.GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
-            var bufferIndex = bufferView.buffer;
-            var _bufferViewData_byteOffset;
-            var bufferByteOffset = (_bufferViewData_byteOffset = bufferViewData.byteOffset) != null ? _bufferViewData_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;
-            var elementStride = dataElementSize * dataElementBytes;
-            var accessorCount = accessor.count;
-            var bufferStride = bufferView.byteStride;
-            var bufferInfo;
-            // According to the glTF official documentation only byteStride not undefined is allowed
-            if (bufferStride !== undefined && bufferStride !== elementStride) {
-                var bufferSlice = Math.floor(byteOffset / bufferStride);
-                var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
-                var accessorBufferCache = context.accessorBufferCache;
-                bufferInfo = accessorBufferCache[bufferCacheKey];
-                if (!bufferInfo) {
-                    var offset = bufferByteOffset + bufferSlice * bufferStride;
-                    var count = accessorCount * (bufferStride / dataElementBytes);
-                    var data = new TypedArray(bufferViewData.buffer, offset, count);
-                    accessorBufferCache[bufferCacheKey] = bufferInfo = new BufferInfo(data, true, bufferStride);
-                    bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset, count));
+        var TypedArray = GLTFUtils.getComponentType(componentType);
+        var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
+        var dataElementBytes = TypedArray.BYTES_PER_ELEMENT;
+        var elementStride = dataElementSize * dataElementBytes;
+        var accessorCount = accessor.count;
+        var promise;
+        if (accessor.bufferView !== undefined) {
+            var bufferViewIndex = accessor.bufferView;
+            var bufferView = bufferViews[bufferViewIndex];
+            promise = context.get(exports.GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
+                var bufferIndex = bufferView.buffer;
+                var _bufferViewData_byteOffset;
+                var bufferByteOffset = (_bufferViewData_byteOffset = bufferViewData.byteOffset) != null ? _bufferViewData_byteOffset : 0;
+                var _accessor_byteOffset;
+                var byteOffset = (_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0;
+                var bufferStride = bufferView.byteStride;
+                var bufferInfo;
+                // According to the glTF official documentation only byteStride not undefined is allowed
+                if (bufferStride !== undefined && bufferStride !== elementStride) {
+                    var bufferSlice = Math.floor(byteOffset / bufferStride);
+                    var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
+                    var accessorBufferCache = context.accessorBufferCache;
+                    bufferInfo = accessorBufferCache[bufferCacheKey];
+                    if (!bufferInfo) {
+                        var offset = bufferByteOffset + bufferSlice * bufferStride;
+                        var count = accessorCount * (bufferStride / dataElementBytes);
+                        var data = new TypedArray(bufferViewData.buffer, offset, count);
+                        accessorBufferCache[bufferCacheKey] = bufferInfo = new BufferInfo(data, true, bufferStride);
+                        bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset, count));
+                    }
+                } else {
+                    var offset1 = bufferByteOffset + byteOffset;
+                    var count1 = accessorCount * dataElementSize;
+                    var data1 = new TypedArray(bufferViewData.buffer, offset1, count1);
+                    bufferInfo = new BufferInfo(data1, false, elementStride);
+                    bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset1, count1));
                 }
-            } else {
-                var offset1 = bufferByteOffset + byteOffset;
-                var count1 = accessorCount * dataElementSize;
-                var data1 = new TypedArray(bufferViewData.buffer, offset1, count1);
-                bufferInfo = new BufferInfo(data1, false, elementStride);
-                bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(bufferIndex, TypedArray, offset1, count1));
-            }
-            if (accessor.sparse) {
-                return GLTFUtils.processingSparseData(context, accessor, bufferInfo).then(function() {
-                    return bufferInfo;
-                });
-            }
-            return bufferInfo;
-        });
+                return bufferInfo;
+            });
+        } else {
+            var count = accessorCount * dataElementSize;
+            var data = new TypedArray(count);
+            var bufferInfo = new BufferInfo(data, false, elementStride);
+            bufferInfo.restoreInfo = new BufferDataRestoreInfo(new RestoreDataAccessor(undefined, TypedArray, undefined, count));
+            promise = Promise.resolve(bufferInfo);
+        }
+        return accessor.sparse ? promise.then(function(bufferInfo) {
+            return GLTFUtils.processingSparseData(context, accessor, bufferInfo).then(function() {
+                return bufferInfo;
+            });
+        }) : promise;
     };
-    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);
+    GLTFUtils.bufferToVector3Array = function bufferToVector3Array(buffer, byteOffset, count, normalized, componentType) {
+        var baseOffset = byteOffset / buffer.BYTES_PER_ELEMENT;
+        var stride = buffer.length / count;
+        var vertices = new Array(count);
+        var factor = normalized ? GLTFUtils.getNormalizedComponentScale(componentType) : 1;
         for(var i = 0; i < count; i++){
-            var index = offset + i * stride;
-            vector3s[i] = new miniprogram$1.Vector3(data[index], data[index + 1], data[index + 2]);
+            var index = baseOffset + i * stride;
+            vertices[i] = new miniprogram$1.Vector3(buffer[index] * factor, buffer[index + 1] * factor, buffer[index + 2] * factor);
         }
-        return vector3s;
-    };
-    /**
-   * @deprecated
-   * Get accessor data.
-   */ GLTFUtils.getAccessorData = function getAccessorData(glTF, accessor, buffers) {
-        var bufferViews = glTF.bufferViews;
-        var _accessor_bufferView;
-        var bufferView = bufferViews[(_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0];
-        var arrayBuffer = buffers[bufferView.buffer];
-        var accessorByteOffset = accessor.hasOwnProperty("byteOffset") ? accessor.byteOffset : 0;
-        var bufferViewByteOffset = bufferView.hasOwnProperty("byteOffset") ? bufferView.byteOffset : 0;
-        var byteOffset = accessorByteOffset + bufferViewByteOffset;
-        var accessorTypeSize = GLTFUtils.getAccessorTypeSize(accessor.type);
-        var length = accessorTypeSize * accessor.count;
-        var _bufferView_byteStride;
-        var byteStride = (_bufferView_byteStride = bufferView.byteStride) != null ? _bufferView_byteStride : 0;
-        var arrayType = GLTFUtils.getComponentType(accessor.componentType);
-        var uint8Array;
-        if (byteStride) {
-            var accessorByteSize = accessorTypeSize * arrayType.BYTES_PER_ELEMENT;
-            uint8Array = new Uint8Array(accessor.count * accessorByteSize);
-            var originalBufferView = new Uint8Array(arrayBuffer, bufferViewByteOffset, bufferView.byteLength);
-            for(var i = 0; i < accessor.count; i++){
-                for(var j = 0; j < accessorByteSize; j++){
-                    uint8Array[i * accessorByteSize + j] = originalBufferView[i * byteStride + accessorByteOffset + j];
-                }
-            }
-        } else {
-            uint8Array = new Uint8Array(arrayBuffer.slice(byteOffset, byteOffset + length * arrayType.BYTES_PER_ELEMENT));
-        }
-        var typedArray = new arrayType(uint8Array.buffer);
-        if (accessor.sparse) {
-            var _accessor_sparse = accessor.sparse, count = _accessor_sparse.count, indices = _accessor_sparse.indices, values = _accessor_sparse.values;
-            var indicesBufferView = bufferViews[indices.bufferView];
-            var valuesBufferView = bufferViews[values.bufferView];
-            var indicesArrayBuffer = buffers[indicesBufferView.buffer];
-            var valuesArrayBuffer = buffers[valuesBufferView.buffer];
-            var _indices_byteOffset, _indicesBufferView_byteOffset;
-            var indicesByteOffset = ((_indices_byteOffset = indices.byteOffset) != null ? _indices_byteOffset : 0) + ((_indicesBufferView_byteOffset = indicesBufferView.byteOffset) != null ? _indicesBufferView_byteOffset : 0);
-            var indicesByteLength = indicesBufferView.byteLength;
-            var _values_byteOffset, _valuesBufferView_byteOffset;
-            var valuesByteOffset = ((_values_byteOffset = values.byteOffset) != null ? _values_byteOffset : 0) + ((_valuesBufferView_byteOffset = valuesBufferView.byteOffset) != null ? _valuesBufferView_byteOffset : 0);
-            var valuesByteLength = valuesBufferView.byteLength;
-            var indicesType = GLTFUtils.getComponentType(indices.componentType);
-            var indicesArray = new indicesType(indicesArrayBuffer, indicesByteOffset, indicesByteLength / indicesType.BYTES_PER_ELEMENT);
-            var valuesArray = new arrayType(valuesArrayBuffer, valuesByteOffset, valuesByteLength / arrayType.BYTES_PER_ELEMENT);
-            for(var i1 = 0; i1 < count; i1++){
-                var replaceIndex = indicesArray[i1];
-                for(var j1 = 0; j1 < accessorTypeSize; j1++){
-                    typedArray[replaceIndex * accessorTypeSize + j1] = valuesArray[i1 * accessorTypeSize + j1];
-                }
-            }
-        }
-        return typedArray;
+        return vertices;
     };
     GLTFUtils.getBufferViewData = function getBufferViewData(bufferView, buffers) {
         var _bufferView_byteOffset = bufferView.byteOffset, byteOffset = _bufferView_byteOffset === void 0 ? 0 : _bufferView_byteOffset;
@@ -3587,16 +3541,16 @@ exports.KTX2Transcoder = void 0;
                             var frame = restoreInfo.blendShape.frames[0];
                             var position = restoreInfo.position;
                             var positionData = _this._getBufferData(buffers, position.buffer);
-                            frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.stride, position.byteOffset, position.count);
+                            frame.deltaPositions = GLTFUtils.bufferToVector3Array(positionData, position.byteOffset, position.count, position.normalized, position.componentType);
                             if (restoreInfo.normal) {
                                 var normal = restoreInfo.normal;
                                 var normalData = _this._getBufferData(buffers, normal.buffer);
-                                frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.stride, normal.byteOffset, normal.count);
+                                frame.deltaNormals = GLTFUtils.bufferToVector3Array(normalData, normal.byteOffset, normal.count, normal.normalized, normal.componentType);
                             }
                             if (restoreInfo.tangent) {
                                 var tangent = restoreInfo.tangent;
                                 var tangentData = _this._getBufferData(buffers, tangent.buffer);
-                                frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.stride, tangent.byteOffset, tangent.count);
+                                frame.deltaTangents = GLTFUtils.bufferToVector3Array(tangentData, tangent.byteOffset, tangent.count, tangent.normalized, tangent.componentType);
                             }
                         }
                         mesh.uploadData(true);
@@ -3608,8 +3562,13 @@ exports.KTX2Transcoder = void 0;
     };
     _proto._getBufferData = function _getBufferData(buffers, restoreInfo) {
         var main = restoreInfo.main;
-        var buffer = buffers[main.bufferIndex];
-        var data = new main.TypedArray(buffer, main.byteOffset, main.length);
+        var data;
+        if (main) {
+            var buffer = buffers[main.bufferIndex];
+            data = new main.TypedArray(buffer, main.byteOffset, main.length);
+        } else {
+            data = new main.TypedArray(main.length);
+        }
         var sparseCount = restoreInfo.sparseCount;
         if (sparseCount) {
             var sparseIndex = restoreInfo.sparseIndices;
@@ -3682,11 +3641,12 @@ exports.KTX2Transcoder = void 0;
 };
 /**
  * @internal
- */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, stride, byteOffset, count) {
+ */ var BlendShapeDataRestoreInfo = function BlendShapeDataRestoreInfo(buffer, byteOffset, count, normalized, componentType) {
     this.buffer = buffer;
-    this.stride = stride;
     this.byteOffset = byteOffset;
     this.count = count;
+    this.normalized = normalized;
+    this.componentType = componentType;
 };
 
 /**
@@ -4312,23 +4272,7 @@ exports.GLTFMeshParser = (_GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1)
                     var meshRestoreInfo = new ModelMeshRestoreInfo();
                     meshRestoreInfo.mesh = mesh1;
                     context.contentRestorer.meshes.push(meshRestoreInfo);
-                    exports.GLTFMeshParser._parseMeshFromGLTFPrimitive(context, mesh1, meshRestoreInfo, meshInfo, gltfPrimitive, glTF, function(attributeSemantic) {
-                        return null;
-                    }, function(attributeName, shapeIndex) {
-                        var shapeAccessorIdx = gltfPrimitive.targets[shapeIndex];
-                        var attributeAccessorIdx = shapeAccessorIdx[attributeName];
-                        if (attributeAccessorIdx) {
-                            var accessor = glTF.accessors[attributeAccessorIdx];
-                            return GLTFUtils.getAccessorBuffer(context, context.glTF.bufferViews, accessor);
-                        } else {
-                            return null;
-                        }
-                    }, function() {
-                        var indexAccessor = glTF.accessors[gltfPrimitive.indices];
-                        return context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
-                            return GLTFUtils.getAccessorData(glTF, indexAccessor, buffers);
-                        });
-                    }, context.params.keepMeshData).then(resolve);
+                    exports.GLTFMeshParser._parseMeshFromGLTFPrimitive(context, mesh1, meshRestoreInfo, meshInfo, gltfPrimitive, glTF, context.params.keepMeshData).then(resolve);
                 }
             });
         };
@@ -4341,7 +4285,7 @@ exports.GLTFMeshParser = (_GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1)
     };
     /**
    * @internal
-   */ GLTFMeshParser1._parseMeshFromGLTFPrimitive = function _parseMeshFromGLTFPrimitive(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, gltf, getVertexBufferData, getBlendShapeData, getIndexBufferData, keepMeshData) {
+   */ GLTFMeshParser1._parseMeshFromGLTFPrimitive = function _parseMeshFromGLTFPrimitive(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, gltf, keepMeshData) {
         var _loop = function(attribute) {
             var accessor = accessors[attributes[attribute]];
             var promise = GLTFUtils.getAccessorBuffer(context, gltf.bufferViews, accessor).then(function(accessorBuffer) {
@@ -4436,61 +4380,68 @@ exports.GLTFMeshParser = (_GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1)
             }
             // BlendShapes
             if (targets) {
-                promises.push(exports.GLTFMeshParser._createBlendShape(mesh, meshRestoreInfo, gltfMesh, accessors, targets, getBlendShapeData));
+                promises.push(exports.GLTFMeshParser._createBlendShape(context, mesh, meshRestoreInfo, gltfMesh, gltfPrimitive, targets));
             }
             return Promise.all(promises).then(function() {
                 mesh.uploadData(!keepMeshData);
-                return Promise.resolve(mesh);
+                return mesh;
             });
         });
     };
+    GLTFMeshParser1._getBlendShapeData = function _getBlendShapeData(context, glTF, accessor) {
+        return GLTFUtils.getAccessorBuffer(context, glTF.bufferViews, accessor).then(function(bufferInfo) {
+            var buffer = bufferInfo.data;
+            var _accessor_byteOffset;
+            var byteOffset = bufferInfo.interleaved ? ((_accessor_byteOffset = accessor.byteOffset) != null ? _accessor_byteOffset : 0) % bufferInfo.stride : 0;
+            var count = accessor.count, normalized = accessor.normalized, componentType = accessor.componentType;
+            var vertices = GLTFUtils.bufferToVector3Array(buffer, byteOffset, count, normalized, componentType);
+            var restoreInfo = new BlendShapeDataRestoreInfo(bufferInfo.restoreInfo, byteOffset, count, normalized, componentType);
+            return {
+                vertices: vertices,
+                restoreInfo: restoreInfo
+            };
+        });
+    };
     /**
    * @internal
-   */ GLTFMeshParser1._createBlendShape = function _createBlendShape(mesh, meshRestoreInfo, glTFMesh, accessors, glTFTargets, getBlendShapeData) {
-        var _loop = function(i, n) {
+   */ GLTFMeshParser1._createBlendShape = function _createBlendShape(context, mesh, meshRestoreInfo, glTFMesh, gltfPrimitive, glTFTargets) {
+        var _this = this, _loop = function(i) {
+            var blendShapeData = {};
+            blendShapeCollection[i] = blendShapeData;
             var name = blendShapeNames ? blendShapeNames[i] : "blendShape" + i;
+            var targets = gltfPrimitive.targets[i];
+            var normalTarget = targets["NORMAL"];
+            var tangentTarget = targets["TANGENT"];
+            var hasNormal = normalTarget !== undefined;
+            var hasTangent = tangentTarget !== undefined;
             var promise = Promise.all([
-                getBlendShapeData("POSITION", i),
-                getBlendShapeData("NORMAL", i),
-                getBlendShapeData("TANGENT", i)
-            ]).then(function(infos) {
-                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);
-                }
+                _this._getBlendShapeData(context, glTF, accessors[targets["POSITION"]]),
+                hasNormal ? _this._getBlendShapeData(context, glTF, accessors[normalTarget]) : null,
+                hasTangent ? _this._getBlendShapeData(context, glTF, accessors[tangentTarget]) : null
+            ]).then(function(vertices) {
+                var _tangentData;
+                var positionData = vertices[0], normalData = vertices[1], tangentData = vertices[2];
                 var blendShape = new miniprogram.BlendShape(name);
-                blendShape.addFrame(1.0, positions, normals, tangents);
-                mesh.addBlendShape(blendShape);
-                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));
+                blendShape.addFrame(1.0, positionData.vertices, hasNormal ? normalData.vertices : null, hasTangent ? tangentData.vertices : null);
+                blendShapeData.blendShape = blendShape;
+                blendShapeData.restoreInfo = new BlendShapeRestoreInfo(blendShape, positionData.restoreInfo, hasNormal ? normalData.restoreInfo : null, hasTangent ? (_tangentData = tangentData) == null ? void 0 : _tangentData.restoreInfo : null);
             });
             promises.push(promise);
         };
+        var glTF = context.glTF;
+        var accessors = glTF.accessors;
         var blendShapeNames = glTFMesh.extras ? glTFMesh.extras.targetNames : null;
         var promises = new Array();
-        for(var i = 0, n = glTFTargets.length; i < n; i++)_loop(i);
-        return Promise.all(promises);
+        var blendShapeCount = glTFTargets.length;
+        var blendShapeCollection = new Array(blendShapeCount);
+        for(var i = 0; i < blendShapeCount; i++)_loop(i);
+        return Promise.all(promises).then(function() {
+            for(var _iterator = _create_for_of_iterator_helper_loose(blendShapeCollection), _step; !(_step = _iterator()).done;){
+                var blendShape = _step.value;
+                mesh.addBlendShape(blendShape.blendShape);
+                meshRestoreInfo.blendShapes.push(blendShape.restoreInfo);
+            }
+        });
     };
     return GLTFMeshParser1;
 }(GLTFParser), function() {