@galacean/engine-loader 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/main.js

@@ -502,6 +502,12 @@ 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) {
@@ -1849,6 +1855,7 @@ 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++;
@@ -1860,6 +1867,7 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
                 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++;
             }
@@ -2032,14 +2040,7 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         camera.enabled = false;
     };
     _proto._createRenderer = function _createRenderer(context, glTFNode, entity) {
-        var glTFResource = context.glTFResource, glTF = context.glTF;
-        var glTFMeshes = glTF.meshes;
-        var engine = glTFResource.engine, meshes = glTFResource.meshes, materials = glTFResource.materials, skins = glTFResource.skins;
-        var meshID = glTFNode.mesh, skinID = glTFNode.skin;
-        var glTFMesh = glTFMeshes[meshID];
-        var glTFMeshPrimitives = glTFMesh.primitives;
-        var blendShapeWeights = glTFNode.weights || glTFMesh.weights;
-        for(var i = 0; i < glTFMeshPrimitives.length; i++){
+        var _loop = function(i) {
             var gltfPrimitive = glTFMeshPrimitives[i];
             var mesh = meshes[meshID][i];
             var renderer = void 0;
@@ -2061,8 +2062,22 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
             var materialIndex = gltfPrimitive.material;
             var material = (materials == null ? void 0 : materials[materialIndex]) || GLTFSceneParser._getDefaultMaterial(engine);
             renderer.setMaterial(material);
+            // Enable vertex color if mesh has COLOR_0 vertex element
+            mesh.vertexElements.forEach(function(element) {
+                if (element.semantic === "COLOR_0") {
+                    renderer.enableVertexColor = true;
+                }
+            });
             GLTFParser.executeExtensionsAdditiveAndParse(gltfPrimitive.extensions, context, renderer, gltfPrimitive);
-        }
+        };
+        var glTFResource = context.glTFResource, glTF = context.glTF;
+        var glTFMeshes = glTF.meshes;
+        var engine = glTFResource.engine, meshes = glTFResource.meshes, materials = glTFResource.materials, skins = glTFResource.skins;
+        var meshID = glTFNode.mesh, skinID = glTFNode.skin;
+        var glTFMesh = glTFMeshes[meshID];
+        var glTFMeshPrimitives = glTFMesh.primitives;
+        var blendShapeWeights = glTFNode.weights || glTFMesh.weights;
+        for(var i = 0; i < glTFMeshPrimitives.length; i++)_loop(i);
     };
     _proto._createAnimator = function _createAnimator(context) {
         if (!context.hasSkinned && !context.glTFResource.animations) {
@@ -4121,7 +4136,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader) {
                     var atlasItem = atlasItems[i];
                     if (atlasItem.img) {
                         chainPromises.push(resourceManager.load({
-                            url: atlasItem.img,
+                            url: engineCore.Utils.resolveAbsoluteUrl(item.url, atlasItem.img),
                             type: engineCore.AssetType.Texture2D,
                             params: {
                                 format: format,