@threepipe/plugin-blend-importer 0.0.6 → 0.0.7

package/dist/loader/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/loader/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAezB,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,kHAgM3D;AASD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,kHA0E1D"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/loader/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAezB,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,kHAoM3D;AASD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,kHA6E1D"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@threepipe/plugin-blend-importer",
   "description": "Basic importer for .blend file",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "dependencies": {},
   "exports": {
     ".": {

package/src/BlendLoadPlugin.ts

@@ -52,8 +52,8 @@ export 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
+            // root.userData.autoScaled = true
+            // root.userData.autoCentered = true
             // console.log(res, blend, root)
             blend.scene = root
             return blend

package/src/js-blend/parser/parser.js

@@ -583,6 +583,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;
+    }
 
     // Begin parsing blender __blender_file__
 
@@ -674,19 +683,16 @@ function worker_code () {
                         curr_count++;
                     }
 
-                    // todo fix seek logic
-                    // Adjust for 4byte alignment TYPE
-                    if (toString(_data, offset2, offset2 + 4) !== 'TYPE'
-                    ) {
-                        for (let j = 0; j < 8; j++) {
-                            if(toString(_data, offset2, offset2 + 4) === 'TYPE') break
-                            offset2++;
-                        }
-                        // offset2 = (4 - (offset2 % 4)) + offset2;
+                    // Adjust for alignment TYPE
+                    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;
 
                     // Number of struct types
@@ -706,18 +712,14 @@ function worker_code () {
                         curr_count++;
                     }
 
-                    // todo fix seek logic
-                    // Adjust for 4byte alignment
-                    if (toString(_data, offset2, offset2 + 4) !== 'TLEN'
-                    ) {
-                        for (let j = 0; j < 8; j++) {
-                            if(toString(_data, offset2, offset2 + 4) === 'TLEN') break
-                            offset2++;
-                        }
-                        // offset2 = (4 - (offset2 % 4)) + offset2;
+                    // Adjust for alignment
+                    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;
@@ -729,18 +731,14 @@ function worker_code () {
                         curr_count++;
                     }
 
-                    // todo fix seek logic
-                    // Adjust for 4byte alignment STRC
-                    if (toString(_data, offset2, offset2 + 4) !== 'STRC'
-                    ) {
-                        for (let j = 0; j < 8; j++) {
-                            if(toString(_data, offset2, offset2 + 4) === 'STRC') break
-                            offset2++;
-                        }
-                        // offset2 = (4 - (offset2 % 4)) + offset2;
+                    // Adjust for alignment
+                    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;
 

package/src/loader/geometry.ts

@@ -24,7 +24,9 @@ export function createBufferGeometry(meshData: any, ctx: Ctx) {
     // https://github.com/blender/blender/blob/05dcc0377b62d8e026e1901dfbecbd4b06fda0b5/scripts/addons_core/io_scene_gltf2/blender/exp/primitive_extract.py#L19
 
     let vertices
+    let verticesData
     let indices
+    let indicesData
 
     // Extract vertex positions from vdata layers
     if (meshData.vdata && meshData.vdata.layers && meshData.vdata.totlayer > 0) {
@@ -40,6 +42,7 @@ export function createBufferGeometry(meshData: any, ctx: Ctx) {
                     continue
                 }
                 vertices = layer
+                verticesData = data
             } else {
                 // console.log('unknown vdata', layer)
             }
@@ -61,6 +64,7 @@ export function createBufferGeometry(meshData: any, ctx: Ctx) {
                     continue
                 }
                 indices = layer
+                indicesData = data
             } else {
                 // console.log('unknown ldata', layer)
             }
@@ -106,30 +110,30 @@ export function createBufferGeometry(meshData: any, ctx: Ctx) {
     //     return geometry
     // }
 
-    if (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 !== undefined) {
-                positions[j * 3] = vertex.x
-                positions[j * 3 + 1] = vertex.z
-                positions[j * 3 + 2] = -vertex.y
-            } else if (vertex.co !== undefined) {
-                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 !== undefined) {
+                positions[j * 3] = x
+                positions[j * 3 + 1] = z
+                positions[j * 3 + 2] = -y
+            } else if (co !== undefined) {
+                positions[j * 3] = co[0]
+                positions[j * 3 + 1] = co[2]
+                positions[j * 3 + 2] = -co[1]
             } else {
                 // console.log(bakeGetters(meshData))
                 // const t = [...new Int32Array(vertex.__blender_file__.AB, vertex.__data_address__, 8)]
                 // debugger
-                console.error('BlendLoader - unknown vertex', vertex)
+                console.error('BlendLoader - unknown vertex', verticesData[j])
                 break
             }
         }
         geometry.setAttribute('position', new ctx.BufferAttribute(positions, 3))
     }
 
-    if (indices?.data && indices.data.length > 0 && vertices?.data?.length) {
+    if (indicesData && indicesData.length > 0 && verticesData?.length) {
         const faceSize = meshData.totloop / meshData.totpoly
         if (faceIndices.length > 0) {
             // Use face offset indices for variable-sized faces
@@ -149,11 +153,11 @@ export function createBufferGeometry(meshData: any, ctx: Ctx) {
 
                 if (faceVertCount >= 3) {
                     // todo better Triangulate the face using fan triangulation
-                    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
                     }
                 } else {
                     // debugger
@@ -251,24 +255,27 @@ export function createBufferGeometryOld(mesh: any, ctx: Ctx) {
                     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 (co) {
+                    positions[currentIndex * 3 + 0] = co[0]
+                    positions[currentIndex * 3 + 1] = co[2]
+                    positions[currentIndex * 3 + 2] = -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 (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++