@galacean/engine-loader 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/main.js

@@ -502,12 +502,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     this.vertexBuffers = [];
     this.blendShapes = [];
 };
-/**
- * @internal
- */ var BufferRestoreInfo = function BufferRestoreInfo(buffer, data) {
-    this.buffer = buffer;
-    this.data = data;
-};
 /**
  * @internal
  */ var BufferDataRestoreInfo = function BufferDataRestoreInfo(main, typeSize, sparseCount, sparseIndices, sparseValues) {
@@ -1823,21 +1817,31 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
         var vertexCount;
         var bufferBindIndex = 0;
         var positions;
-        keepMeshData && (positions = new Array(vertexCount));
+        var boneIndices;
+        var boneWeights;
+        if (keepMeshData) {
+            positions = new Array(vertexCount);
+            boneIndices = new Array(vertexCount);
+            boneWeights = new Array(vertexCount);
+        }
         for(var attribute in attributes){
             var accessor = accessors[attributes[attribute]];
             var accessorBuffer = GLTFUtils.getAccessorBuffer(context, gltf.bufferViews, accessor);
             var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
-            var attributeCount = accessor.count;
+            var accessorCount = accessor.count;
             var vertices = accessorBuffer.data;
             var vertexElement = void 0;
             var meshId = mesh.instanceId;
             var vertexBindingInfos = accessorBuffer.vertexBindingInfos;
-            var elementFormat = GLTFUtils.getElementFormat(accessor.componentType, dataElementSize, accessor.normalized);
+            var elementNormalized = accessor.normalized;
+            var elementFormat = GLTFUtils.getElementFormat(accessor.componentType, dataElementSize, elementNormalized);
+            var scaleFactor = void 0;
+            elementNormalized && (scaleFactor = GLTFUtils.getNormalizedComponentScale(accessor.componentType));
+            var elementOffset = void 0;
             if (accessorBuffer.interleaved) {
                 var byteOffset = accessor.byteOffset || 0;
                 var stride = accessorBuffer.stride;
-                var elementOffset = byteOffset % stride;
+                elementOffset = byteOffset % stride;
                 if (vertexBindingInfos[meshId] === undefined) {
                     vertexElement = new engineCore.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
                     var vertexBuffer = accessorBuffer.vertexBuffer;
@@ -1845,7 +1849,6 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
                         vertexBuffer = new engineCore.Buffer(engine, engineCore.BufferBindFlag.VertexBuffer, vertices.byteLength, engineCore.BufferUsage.Static);
                         vertexBuffer.setData(vertices);
                         accessorBuffer.vertexBuffer = vertexBuffer;
-                        meshRestoreInfo.vertexBuffers.push(new BufferRestoreInfo(vertexBuffer, accessorBuffer.restoreInfo));
                     }
                     mesh.setVertexBufferBinding(vertexBuffer, stride, bufferBindIndex);
                     vertexBindingInfos[meshId] = bufferBindIndex++;
@@ -1853,44 +1856,70 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
                     vertexElement = new engineCore.VertexElement(attribute, elementOffset, elementFormat, vertexBindingInfos[meshId]);
                 }
             } else {
-                vertexElement = new engineCore.VertexElement(attribute, 0, elementFormat, bufferBindIndex);
+                elementOffset = 0;
+                vertexElement = new engineCore.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
                 var vertexBuffer1 = new engineCore.Buffer(engine, engineCore.BufferBindFlag.VertexBuffer, vertices.byteLength, engineCore.BufferUsage.Static);
                 vertexBuffer1.setData(vertices);
-                meshRestoreInfo.vertexBuffers.push(new BufferRestoreInfo(vertexBuffer1, accessorBuffer.restoreInfo));
                 mesh.setVertexBufferBinding(vertexBuffer1, accessorBuffer.stride, bufferBindIndex);
                 vertexBindingInfos[meshId] = bufferBindIndex++;
             }
             vertexElements.push(vertexElement);
             if (attribute === "POSITION") {
-                vertexCount = attributeCount;
+                vertexCount = accessorCount;
                 var _mesh_bounds = mesh.bounds, min = _mesh_bounds.min, max = _mesh_bounds.max;
                 if (accessor.min && accessor.max) {
                     min.copyFromArray(accessor.min);
                     max.copyFromArray(accessor.max);
                     if (keepMeshData) {
-                        var stride1 = vertices.length / attributeCount;
-                        for(var j = 0; j < attributeCount; j++){
-                            var offset = j * stride1;
-                            positions[j] = new engineMath.Vector3(vertices[offset], vertices[offset + 1], vertices[offset + 2]);
+                        var baseOffset = elementOffset / vertices.BYTES_PER_ELEMENT;
+                        var stride1 = vertices.length / accessorCount;
+                        for(var j = 0; j < accessorCount; j++){
+                            var offset = baseOffset + j * stride1;
+                            var position = new engineMath.Vector3(vertices[offset], vertices[offset + 1], vertices[offset + 2]);
+                            elementNormalized && position.scale(scaleFactor);
+                            positions[j] = position;
                         }
                     }
                 } else {
-                    var position = GLTFMeshParser._tempVector3;
+                    var position1 = GLTFMeshParser._tempVector3;
                     min.set(Number.MAX_VALUE, Number.MAX_VALUE, Number.MAX_VALUE);
                     max.set(-Number.MAX_VALUE, -Number.MAX_VALUE, -Number.MAX_VALUE);
-                    var stride2 = vertices.length / attributeCount;
-                    for(var j1 = 0; j1 < attributeCount; j1++){
-                        var offset1 = j1 * stride2;
-                        position.copyFromArray(vertices, offset1);
-                        engineMath.Vector3.min(min, position, min);
-                        engineMath.Vector3.max(max, position, max);
+                    var baseOffset1 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                    var stride2 = vertices.length / accessorCount;
+                    for(var j1 = 0; j1 < accessorCount; j1++){
+                        var offset1 = baseOffset1 + j1 * stride2;
+                        position1.copyFromArray(vertices, offset1);
+                        engineMath.Vector3.min(min, position1, min);
+                        engineMath.Vector3.max(max, position1, max);
+                        if (keepMeshData) {
+                            var clonePosition = position1.clone();
+                            elementNormalized && clonePosition.scale(scaleFactor);
+                            positions[j1] = clonePosition;
+                        }
                     }
                 }
-                if (accessor.normalized) {
-                    var scaleFactor = GLTFUtils.getNormalizedComponentScale(accessor.componentType);
+                if (elementNormalized) {
                     min.scale(scaleFactor);
                     max.scale(scaleFactor);
                 }
+            } else if (attribute === "JOINTS_0" && keepMeshData) {
+                var baseOffset2 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                var stride3 = vertices.length / accessorCount;
+                for(var j2 = 0; j2 < accessorCount; j2++){
+                    var offset2 = baseOffset2 + j2 * stride3;
+                    var boneIndex = new engineMath.Vector4(vertices[offset2], vertices[offset2 + 1], vertices[offset2 + 2], vertices[offset2 + 3]);
+                    elementNormalized && boneIndex.scale(scaleFactor);
+                    boneIndices[j2] = boneIndex;
+                }
+            } else if (attribute === "WEIGHTS_0" && keepMeshData) {
+                var baseOffset3 = elementOffset / vertices.BYTES_PER_ELEMENT;
+                var stride4 = vertices.length / accessorCount;
+                for(var j3 = 0; j3 < accessorCount; j3++){
+                    var offset3 = baseOffset3 + j3 * stride4;
+                    var boneWeight = new engineMath.Vector4(vertices[offset3], vertices[offset3 + 1], vertices[offset3 + 2], vertices[offset3 + 3]);
+                    elementNormalized && boneWeight.scale(scaleFactor);
+                    boneWeights[j3] = boneWeight;
+                }
             }
         }
         mesh.setVertexElements(vertexElements);
@@ -1909,6 +1938,10 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
         mesh.uploadData(!keepMeshData);
         //@ts-ignore
         mesh._positions = positions;
+        //@ts-ignore
+        mesh._boneIndices = boneIndices;
+        //@ts-ignore
+        mesh._boneWeights = boneWeights;
         return Promise.resolve(mesh);
     };
     /**