@threepipe/plugin-blend-importer 0.0.6 → 0.0.7

package/dist/index.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @threepipe/plugin-blend-importer v0.0.6
+ * @threepipe/plugin-blend-importer v0.0.7
  * Copyright 2022-2025 repalash <palash@shaders.app>
  * Apache-2.0 License
  * See ./dependencies.txt for any bundled third-party dependencies and licenses.
@@ -412,6 +412,15 @@ function worker_code() {
   function toString(buffer, _in, _out) {
     return String.fromCharCode.apply(String, new Uint8Array(buffer, _in, _out - _in));
   }
+  function seekCheck(buffer, _in, str) {
+    const length = str.length;
+    for (let i = 0; i < length; i++) {
+      if (buffer.getUint8(_in + i) !== str.charCodeAt(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
   function readFile() {
     let count = 0;
     let offset2 = 0;
@@ -462,14 +471,13 @@ function worker_code() {
             offset2++;
             curr_count++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "TYPE") {
-            for (let j = 0; j < 8; j++) {
-              if (toString(_data, offset2, offset2 + 4) === "TYPE") break;
-              offset2++;
-            }
+          for (let j = 0; j < 8; j++) {
+            if (seekCheck(data, offset2, "TYPE")) break;
+            offset2++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "TYPE") {
-            debugger;
+          if (!seekCheck(data, offset2, "TYPE")) {
+            ERROR = "Unexpected alignment error in SDNA parsing";
+            break;
           }
           offset2 += 4;
           count = data.getUint32(offset2, true);
@@ -485,14 +493,13 @@ function worker_code() {
             offset2++;
             curr_count++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "TLEN") {
-            for (let j = 0; j < 8; j++) {
-              if (toString(_data, offset2, offset2 + 4) === "TLEN") break;
-              offset2++;
-            }
+          for (let j = 0; j < 8; j++) {
+            if (seekCheck(data, offset2, "TLEN")) break;
+            offset2++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "TLEN") {
-            debugger;
+          if (!seekCheck(data, offset2, "TLEN")) {
+            ERROR = "Unexpected alignment error in SDNA parsing";
+            break;
           }
           offset2 += 4;
           curr_count = 0;
@@ -501,14 +508,13 @@ function worker_code() {
             offset2 += 2;
             curr_count++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "STRC") {
-            for (let j = 0; j < 8; j++) {
-              if (toString(_data, offset2, offset2 + 4) === "STRC") break;
-              offset2++;
-            }
+          for (let j = 0; j < 8; j++) {
+            if (seekCheck(data, offset2, "STRC")) break;
+            offset2++;
           }
-          if (toString(_data, offset2, offset2 + 4) !== "STRC") {
-            debugger;
+          if (!seekCheck(data, offset2, "STRC")) {
+            ERROR = "Unexpected alignment error in SDNA parsing";
+            break;
           }
           offset2 += 4;
           const structure_count = data.getInt32(offset2, BIG_ENDIAN);
@@ -712,12 +718,13 @@ function getLayer(layers, i) {
   return layers[i];
 }
 function createBufferGeometry(meshData, ctx) {
-  var _a;
   if (meshData.mpoly) return createBufferGeometryOld(meshData, ctx);
   const geometry = new ctx.BufferGeometry();
   geometry.name = meshData.aname || "";
   let vertices;
+  let verticesData;
   let indices;
+  let indicesData;
   if (meshData.vdata && meshData.vdata.layers && meshData.vdata.totlayer > 0) {
     for (let i = 0; i < meshData.vdata.totlayer; i++) {
       const layer = getLayer(meshData.vdata.layers, i);
@@ -727,6 +734,7 @@ function createBufferGeometry(meshData, ctx) {
           continue;
         }
         vertices = layer;
+        verticesData = data;
       }
     }
   }
@@ -739,6 +747,7 @@ function createBufferGeometry(meshData, ctx) {
           continue;
         }
         indices = layer;
+        indicesData = data;
       }
     }
   }
@@ -746,26 +755,26 @@ function createBufferGeometry(meshData, ctx) {
   if (meshData.poly_offset_indices && meshData.totpoly > 0) {
     faceIndices = [...new Int32Array(meshData.poly_offset_indices.__blender_file__.AB, meshData.poly_offset_indices.__data_address__, meshData.totpoly + 1)];
   }
-  if ((vertices == null ? void 0 : vertices.data) && vertices.data.length > 0) {
-    const positions = new Float32Array(vertices.data.length * 3);
-    for (let j = 0; j < vertices.data.length; j++) {
-      const vertex = vertices.data[j];
-      if (vertex.x !== void 0) {
-        positions[j * 3] = vertex.x;
-        positions[j * 3 + 1] = vertex.z;
-        positions[j * 3 + 2] = -vertex.y;
-      } else if (vertex.co !== void 0) {
-        positions[j * 3] = vertex.co[0];
-        positions[j * 3 + 1] = vertex.co[2];
-        positions[j * 3 + 2] = -vertex.co[1];
+  if (verticesData && verticesData.length > 0) {
+    const positions = new Float32Array(verticesData.length * 3);
+    for (let j = 0; j < verticesData.length; j++) {
+      const { x, y, z, co } = verticesData[j] || {};
+      if (x !== void 0) {
+        positions[j * 3] = x;
+        positions[j * 3 + 1] = z;
+        positions[j * 3 + 2] = -y;
+      } else if (co !== void 0) {
+        positions[j * 3] = co[0];
+        positions[j * 3 + 1] = co[2];
+        positions[j * 3 + 2] = -co[1];
       } else {
-        console.error("BlendLoader - unknown vertex", vertex);
+        console.error("BlendLoader - unknown vertex", verticesData[j]);
         break;
       }
     }
     geometry.setAttribute("position", new ctx.BufferAttribute(positions, 3));
   }
-  if ((indices == null ? void 0 : indices.data) && indices.data.length > 0 && ((_a = vertices == null ? void 0 : vertices.data) == null ? void 0 : _a.length)) {
+  if (indicesData && indicesData.length > 0 && (verticesData == null ? void 0 : verticesData.length)) {
     const faceSize = meshData.totloop / meshData.totpoly;
     if (faceIndices.length > 0) {
       let totalTriangles = 0;
@@ -780,11 +789,11 @@ function createBufferGeometry(meshData, ctx) {
         const faceEnd = faceIndices[i + 1];
         const faceVertCount = faceEnd - faceStart;
         if (faceVertCount >= 3) {
-          const firstVert = indices.data[faceStart].i;
+          const firstVert = indicesData[faceStart].i;
           for (let k = 1; k < faceVertCount - 1; k++) {
             indexes[t++] = firstVert;
-            indexes[t++] = indices.data[faceStart + k].i;
-            indexes[t++] = indices.data[faceStart + k + 1].i;
+            indexes[t++] = indicesData[faceStart + k].i;
+            indexes[t++] = indicesData[faceStart + k + 1].i;
           }
         }
       }
@@ -839,21 +848,24 @@ function createBufferGeometryOld(mesh, ctx) {
         if (indexi - 1 + l < len)
           index += indexi - 1 + l;
         const loop = loops[index];
-        const vert = vertices[loop.v];
+        const { co, no } = vertices[loop.v] || {};
         indices[currentIndex] = currentIndex;
-        positions[currentIndex * 3 + 0] = vert.co[0];
-        positions[currentIndex * 3 + 1] = vert.co[2];
-        positions[currentIndex * 3 + 2] = -vert.co[1];
-        if (vert.no) {
-          normals[currentIndex * 3 + 0] = vert.no[0];
-          normals[currentIndex * 3 + 1] = vert.no[2];
-          normals[currentIndex * 3 + 2] = -vert.no[1];
+        if (co) {
+          positions[currentIndex * 3 + 0] = co[0];
+          positions[currentIndex * 3 + 1] = co[2];
+          positions[currentIndex * 3 + 2] = -co[1];
+        }
+        if (no) {
+          normals[currentIndex * 3 + 0] = no[0];
+          normals[currentIndex * 3 + 1] = no[2];
+          normals[currentIndex * 3 + 2] = -no[1];
         } else {
           computeNormals = true;
         }
         if (uv) {
-          uvs[currentIndex * 2 + 0] = uv[index].uv[0];
-          uvs[currentIndex * 2 + 1] = uv[index].uv[1];
+          const uv1 = uv[index].uv;
+          uvs[currentIndex * 2 + 0] = uv1[0];
+          uvs[currentIndex * 2 + 1] = uv1[1];
         }
         currentIndex++;
       }
@@ -2766,8 +2778,6 @@ const _BlendLoadPlugin = class _BlendLoadPlugin extends BaseImporterPlugin {
         const objects = await createObjects(blend, ctx);
         const root = new Object3D();
         root.add(...objects);
-        root.userData.autoScaled = true;
-        root.userData.autoCentered = true;
         blend.scene = root;
         return blend;
       }