@threepipe/plugin-blend-importer 0.0.4 → 0.0.6

package/dist/loader/bakeGetters.d.ts

@@ -0,0 +1,2 @@
+export declare function bakeGetters(obj: any): string;
+//# sourceMappingURL=bakeGetters.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bakeGetters.d.ts","sourceRoot":"","sources":["../../src/loader/bakeGetters.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CACvB,GAAG,EAAE,GAAG,GACT,MAAM,CAiDR"}

package/dist/loader/camera.d.ts

@@ -0,0 +1,4 @@
+import { Object3D } from 'threepipe';
+import { Ctx } from './ctx';
+export declare function createCamera(object: any, ctx: Ctx): Object3D | undefined;
+//# sourceMappingURL=camera.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../src/loader/camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAA;AAClC,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAEzB,wBAAgB,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,QAAQ,GAAG,SAAS,CAmDxE"}

package/dist/loader/ctx.d.ts

@@ -0,0 +1,16 @@
+import { AmbientLight, BufferAttribute, BufferGeometry, DirectionalLight, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, Object3D, OrthographicCamera, PerspectiveCamera, PointLight, SpotLight } from 'threepipe';
+export interface Ctx {
+    PointLight: typeof PointLight;
+    SpotLight: typeof SpotLight;
+    DirectionalLight: typeof DirectionalLight;
+    AmbientLight: typeof AmbientLight;
+    Object3D: typeof Object3D;
+    PerspectiveCamera: typeof PerspectiveCamera;
+    OrthographicCamera: typeof OrthographicCamera;
+    Mesh: typeof Mesh;
+    BufferGeometry: typeof BufferGeometry;
+    BufferAttribute: typeof BufferAttribute;
+    MeshPhysicalMaterial: typeof MeshPhysicalMaterial;
+    MeshBasicMaterial: typeof MeshBasicMaterial;
+}
+//# sourceMappingURL=ctx.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../src/loader/ctx.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,IAAI,EACJ,iBAAiB,EACjB,oBAAoB,EACpB,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,SAAS,EACZ,MAAM,WAAW,CAAA;AAElB,MAAM,WAAW,GAAG;IAChB,UAAU,EAAE,OAAO,UAAU,CAAA;IAC7B,SAAS,EAAE,OAAO,SAAS,CAAA;IAC3B,gBAAgB,EAAE,OAAO,gBAAgB,CAAA;IACzC,YAAY,EAAE,OAAO,YAAY,CAAA;IACjC,QAAQ,EAAE,OAAO,QAAQ,CAAA;IACzB,iBAAiB,EAAE,OAAO,iBAAiB,CAAA;IAC3C,kBAAkB,EAAE,OAAO,kBAAkB,CAAA;IAC7C,IAAI,EAAE,OAAO,IAAI,CAAA;IACjB,cAAc,EAAE,OAAO,cAAc,CAAA;IACrC,eAAe,EAAE,OAAO,eAAe,CAAA;IACvC,oBAAoB,EAAE,OAAO,oBAAoB,CAAA;IACjD,iBAAiB,EAAE,OAAO,iBAAiB,CAAA;CAC9C"}

package/dist/loader/geometry.d.ts

@@ -1,3 +1,4 @@
-import { BufferGeometry, Vector3Tuple } from 'threepipe';
-export declare function createBufferGeometry(mesh: any, origin: Vector3Tuple): BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>;
+import { Ctx } from './ctx';
+export declare function createBufferGeometry(meshData: any, ctx: Ctx): import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>;
+export declare function createBufferGeometryOld(mesh: any, ctx: Ctx): import('three').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>;
 //# sourceMappingURL=geometry.d.ts.map

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,EAAkB,cAAc,EAAE,YAAY,EAAC,MAAM,WAAW,CAAA;AAEvE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,kGAiEnE"}
+{"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"}

package/dist/loader/index.d.ts

@@ -1,3 +1,4 @@
 import { Object3D } from 'threepipe';
-export declare function createObjects(file: any): Promise<Object3D<import('three').Object3DEventMap>[]>;
+import { Ctx } from './ctx';
+export declare function createObjects(file: any, ctx: Ctx): Promise<Object3D<import('threepipe').Object3DEventMap>[]>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loader/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAA;AAOlC,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,yDAgB5C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loader/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,QAAQ,EAAC,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAYzB,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,6DAgEtD"}

package/dist/loader/light.d.ts

@@ -1,3 +1,4 @@
-import { PointLight } from 'threepipe';
-export declare function createLight(lamp: any): PointLight | null;
+import { Light } from 'threepipe';
+import { Ctx } from './ctx';
+export declare function createLight(lamp: any, ctx: Ctx): Light<import('three').LightShadow<import('threepipe').Camera<import('threepipe').Object3DEventMap>> | undefined, import('threepipe').Object3DEventMap> | undefined;
 //# sourceMappingURL=light.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/loader/light.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAUpC,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,qBA+BpC"}
+{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/loader/light.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAUzB,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,sKAmC9C"}

package/dist/loader/material.d.ts

@@ -1,3 +1,3 @@
-import { MeshPhysicalMaterial } from 'threepipe';
-export declare function createMaterial(mat: any): MeshPhysicalMaterial<import('three').MaterialEventMap>;
+import { Ctx } from './ctx';
+export declare function createMaterial(mat: any, ctx: Ctx): import('three').MeshPhysicalMaterial<import('three').MaterialEventMap>;
 //# sourceMappingURL=material.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/loader/material.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,WAAW,CAAA;AAG9C,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,0DAQtC"}
+{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/loader/material.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAEzB,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,0EAShD"}

package/dist/loader/mesh.d.ts

@@ -1,3 +1,3 @@
-import { Mesh } from 'threepipe';
-export declare function createMesh(object: any): Mesh<import('threepipe').BufferGeometry<import('three').NormalBufferAttributes, import('three').BufferGeometryEventMap>, import('threepipe').MeshPhysicalMaterial<import('three').MaterialEventMap>, import('three').Object3DEventMap> | null;
+import { Ctx } from './ctx';
+export declare function createMesh(object: any, loaded: WeakMap<any, any>, ctx: Ctx): import('three').Mesh<any, any, import('three').Object3DEventMap> | undefined;
 //# sourceMappingURL=mesh.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mesh.d.ts","sourceRoot":"","sources":["../../src/loader/mesh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAI9B,wBAAgB,UAAU,CAAC,MAAM,EAAE,GAAG,iPAqBrC"}
+{"version":3,"file":"mesh.d.ts","sourceRoot":"","sources":["../../src/loader/mesh.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAA;AAEzB,wBAAgB,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,gFAsB1E"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@threepipe/plugin-blend-importer",
   "description": "Basic importer for .blend file",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "dependencies": {},
   "exports": {
     ".": {
@@ -42,6 +42,6 @@
     "directory": "plugins/blend-importer"
   },
   "peerDependencies": {
-    "threepipe": "^0.0.13"
+    "threepipe": "^0.0.54"
   }
 }

package/src/BlendLoadPlugin.ts

@@ -1,4 +1,23 @@
-import {AnyOptions, BaseImporterPlugin, FileLoader, ILoader, Importer, Object3D, Scene} from 'threepipe'
+import {
+    AmbientLight2,
+    AnyOptions,
+    BaseImporterPlugin,
+    BufferAttribute,
+    BufferGeometry2,
+    DirectionalLight2,
+    FileLoader,
+    ILoader,
+    Importer, Mesh,
+    Mesh2,
+    Object3D,
+    Object3D2,
+    OrthographicCamera0,
+    PerspectiveCamera0,
+    PhysicalMaterial,
+    PointLight2,
+    Scene, SpotLight2,
+    UnlitMaterial,
+} from 'threepipe'
 import {parseBlend} from './js-blend/main.js'
 import {createObjects} from './loader'
 
@@ -15,18 +34,38 @@ export class BlendLoadPlugin extends BaseImporterPlugin {
             this.setResponseType('arraybuffer')
             const res = (await super.loadAsync(url, onProgress)) as ArrayBuffer
             const blend = await parseBlend(res)
-            const objects = await createObjects(blend)
+            // console.log(bakeGetters(blend))
+            const ctx = {
+                Object3D: Object3D2,
+                Mesh: Mesh2 as typeof Mesh,
+                MeshPhysicalMaterial: PhysicalMaterial,
+                MeshBasicMaterial: UnlitMaterial,
+                PerspectiveCamera: PerspectiveCamera0,
+                OrthographicCamera: OrthographicCamera0,
+                PointLight: PointLight2,
+                DirectionalLight: DirectionalLight2,
+                SpotLight: SpotLight2,
+                AmbientLight: AmbientLight2,
+                BufferGeometry: BufferGeometry2,
+                BufferAttribute: BufferAttribute,
+            }
+            const objects = await createObjects(blend, ctx)
             const root = new Object3D()
             root.add(...objects)
+            root.userData.autoScaled = true
+            root.userData.autoCentered = true
             // console.log(res, blend, root)
             blend.scene = root
             return blend
         }
 
-        transform(res: any, _: AnyOptions): Scene {
+        transform(res: any, options: AnyOptions): Scene {
             // console.log(res)
             // res.scene.userData.kinematics = res.kinematics
             // res.scene.userData.library = res.library
+            if (typeof options.onBlendLoad === 'function') {
+                options.onBlendLoad(res)
+            }
             return res.scene
         }
     }, ['blend'], ['application/x-blender'], true)

package/src/js-blend/main.js

@@ -13,8 +13,9 @@ import parser from './parser/parser.js';
 export async function parseBlend (buffer, name = '') {
     return new Promise((res, rej) => {
         parser.onParseReady = (file, error) => {
-            if (error) rej(error)
-            else res(file)
+            // todo throw error if no objects?
+            if (error) console.error(error)
+            res(file)
         }
         parser.loadBlendFromArrayBuffer(buffer, name)
     })

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

@@ -88,7 +88,7 @@ function worker_code () {
             Export object for a parsed __blender_file__.
         */
 
-    var BLENDER_FILE = function (AB) {
+    const BLENDER_FILE = function (AB) {
         this.AB = AB;
         // this.double = new Float64Array(AB);
         this.byte = new Uint8Array(AB);
@@ -144,6 +144,8 @@ function worker_code () {
                     this.__blender_file__.dv.setFloat64(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -159,6 +161,8 @@ function worker_code () {
                     this.__blender_file__.dv.setFloat32(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -174,6 +178,8 @@ function worker_code () {
                     this.__blender_file__.dv.setInt32(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -189,6 +195,8 @@ function worker_code () {
                     this.__blender_file__.dv.setUint32(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -204,6 +212,8 @@ function worker_code () {
                     this.__blender_file__.dv.setInt16(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -220,6 +230,8 @@ function worker_code () {
                     this.__blender_file__.dv.setUint16(this.__data_address__ + offset, float, this.__blender_file__.template.endianess);
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     };
 
@@ -254,6 +266,8 @@ function worker_code () {
                     this.__blender_file__.byte[(this.__data_address__ + offset)] = byte | 0;
                 }
             },
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -281,6 +295,8 @@ function worker_code () {
                 return results;
             },
             set: function () {},
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -306,6 +322,8 @@ function worker_code () {
                 }
             },
             set: function () {},
+            enumerable: true,
+            configurable: true,
         };
     }
 
@@ -323,9 +341,11 @@ function worker_code () {
                 Object.defineProperty(obj, name, intProp(offset, array_size, length >> 2));
                 break;
             case 'short':
-            case 'ushort':
                 Object.defineProperty(obj, name, shortProp(offset, array_size, length >> 1));
                 break;
+            case 'ushort':
+                Object.defineProperty(obj, name, uShortProp(offset, array_size, length >> 1));
+                break;
             case 'char':
             case 'uchar':
                 Object.defineProperty(obj, name, charProp(offset, array_size, length));
@@ -339,6 +359,7 @@ function worker_code () {
             offset += length;
         } else {
             Object.defineProperty(obj, name, pointerProp(offset, array_size, pointer_size));
+            obj._length += pointer_size * array_size;
             offset += pointer_size * array_size;
         }
 
@@ -359,13 +380,19 @@ function worker_code () {
     MASTER_SDNA_SCHEMA.prototype = {
         getSDNAStructureConstructor: function (name, struct) {
             if (struct) {
-                const blen_struct = Function('function ' + name + '(){}; return ' + name)();
+                const jsName = name === 'void' ? 'void_' : name
+                const blen_struct = Function('function ' + jsName + '(){}; return ' + jsName)();
+
+                // if(name === 'CustomDataLayer') debugger
 
                 blen_struct.prototype = new BLENDER_STRUCTURE();
                 blen_struct.prototype.blender_name = name;
                 blen_struct.prototype.__pointers = [];
                 blen_struct.prototype.__list__ = [];
 
+                const DNA = this.SDNA[name] = {
+                    constructor: blen_struct,
+                };
                 let offset = 0;
                 // Create properties of struct
                 for (let i = 0; i < struct.length; i += 3) {
@@ -379,9 +406,6 @@ function worker_code () {
                         Suparray_match = 1,
                         PointerToArray = false,
                         Pointer_Match = 0;
-                    const DNA = this.SDNA[name] = {
-                        constructor: blen_struct,
-                    };
 
 
                     let original_name = _name;
@@ -445,6 +469,8 @@ function worker_code () {
                                     return array;
                                 };
                             })(array_names),
+                            enumerable: true,
+                            configurable: true,
                         });
                     } else {
                         offset = compileProp(blen_struct.prototype, _name, type, offset, Blender_Array_Length, Pointer_Match, pointer_size, length);
@@ -462,7 +488,7 @@ function worker_code () {
         },
     };
 
-    var BLENDER_STRUCTURE = function () {
+    const BLENDER_STRUCTURE = function () {
         this.__blender_file__ = null;
         this.__list__ = null;
         this.__super_array_list__ = null;
@@ -513,6 +539,8 @@ function worker_code () {
 
             this.__data_address__ = _data_offset;
 
+            // if(this.blender_name === 'CustomDataLayer') debugger
+
             if (struct === null) return this;
 
             for (i = 0; i < struct.length; i += 6) {
@@ -574,9 +602,11 @@ function worker_code () {
         struct_names = [];
         offset = 0;
 
+        // todo gzip, zstd(28 b5 2f fd, https://projects.blender.org/archive/blender-file/issues/93858)
         // Make sure we have a .blend __blender_file__. All blend files have the first 12bytes
         // set with BLENDER-v### in Utf-8
-        if (toString(_data, offset, 7) !== 'BLENDER') return ERROR = 'File supplied is not a .blend compatible Blender file.';
+        const magic = toString(_data, offset, 7)
+        if (magic !== 'BLENDER') return ERROR = 'File supplied is not a .blend compatible Blender file.';
 
         // otherwise get templete from save version.
 
@@ -644,13 +674,23 @@ function worker_code () {
                         curr_count++;
                     }
 
-
-                    // Adjust for 4byte alignment
-                    if ((offset2 % 4) > 0) offset2 = (4 - (offset2 % 4)) + offset2;
+                    // 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;
+                    }
+                    if(toString(_data, offset2, offset2 + 4) !== 'TYPE') {
+                        debugger
+                    }
                     offset2 += 4;
 
                     // Number of struct types
-                    count = data.getInt32(offset2, true);
+                    count = data.getUint32(offset2, true);
                     offset2 += 4;
                     curr_count = 0;
 
@@ -666,8 +706,19 @@ function worker_code () {
                         curr_count++;
                     }
 
+                    // todo fix seek logic
                     // Adjust for 4byte alignment
-                    if ((offset2 % 4) > 0) offset2 = (4 - (offset2 % 4)) + offset2;
+                    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;
+                    }
+                    if(toString(_data, offset2, offset2 + 4) !== 'TLEN') {
+                        debugger
+                    }
                     offset2 += 4;
                     curr_count = 0;
 
@@ -678,8 +729,19 @@ function worker_code () {
                         curr_count++;
                     }
 
-                    // Adjust for 4byte alignment
-                    if ((offset2 % 4) > 0) offset2 = (4 - (offset2 % 4)) + offset2;
+                    // 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;
+                    }
+                    if(toString(_data, offset2, offset2 + 4) !== 'STRC') {
+                        debugger
+                    }
                     offset2 += 4;
 
                     // Number of structures
@@ -699,6 +761,11 @@ function worker_code () {
 
                         // Fill an array with name, type, and length for each SDNA struct property
                         while (curr_count2 < count) {
+
+                            // const n = names[data.getInt16(offset2 + 2, BIG_ENDIAN)]
+                            // if(obj.find((o, i)=>i%3===0 && o===n)){
+                            //     debugger
+                            // }
                             obj.push(names[data.getInt16(offset2 + 2, BIG_ENDIAN)], types[data.getInt16(offset2, BIG_ENDIAN)], lengths[data.getInt16(offset2, BIG_ENDIAN)]);
                             offset2 += 4;
                             curr_count2++;
@@ -720,19 +787,74 @@ function worker_code () {
 
         // TODO: turn into "on-demand" parsing.
 
+        // https://github.com/fschutt/mystery-of-the-blend-backup
         while (true) {
-            if ((offset % 4) > 0) {
-                offset = (4 - (offset % 4)) + offset;
+            // todo fix cleanup
+            // this is not the case, see blend-load-test.blend and Ruins_Assets.blend
+            // if ((offset % 4) > 0) {
+            //     console.log('fix', offset, offset % 4)
+            //     debugger
+            //     offset = (4 - (offset % 4)) + offset;
+            // }
+            for (let j = 0; j < 8; j++) {
+                if(data.getInt8(offset) === 0) {
+                    offset++
+                    continue
+                }
+                break
+            }
+            if(data.getInt8(offset) === 0) {
+                debugger
             }
 
             data_offset = offset;
+
+            if (offset + pointer_size + 12 >= data.byteLength) {
+                ERROR = 'Unexpected end of file while parsing';
+                break
+            }
+
             sdna_index = data.getInt32(offset + pointer_size + 8, BIG_ENDIAN);
-            let code_uint = data.getUint32(offset, BIG_ENDIAN);
+            // let code_uint = data.getUint32(offset, BIG_ENDIAN);
+            const code_str = toString(_data, offset, offset + 4) // data.getUint32(offset, BIG_ENDIAN);
+
             offset2 = offset + 16 + (pointer_size);
-            offset += data.getInt32(offset + 4, true) + 16 + (pointer_size);
+            // console.log(code_str, code_str.length, data.getInt8(offset))
 
-            if (code_uint === DNA1); // skip - already processed at this point
-            else if (code_uint === ENDB) break; // end of __blender_file__ found
+            const blockLength = data.getInt32(offset + 4, true);
+            if (blockLength < 0 || offset + blockLength + 16 + pointer_size > data.byteLength) {
+                ERROR = 'Invalid block length detected';
+                break
+            }
+            // if(blockLength === 1) {
+            //     debugger
+            // }
+
+            // last_offset = offset
+
+            offset += blockLength + 16 + (pointer_size);
+
+            if (code_str === 'DNA1') {} // skip - already processed at this point
+            else if (code_str === 'ENDB') break; // end of __blender_file__ found
+            else if (code_str === 'TEST') { // snapshot
+                const data_start = data_offset + pointer_size + 16;
+                const width = data.getInt32(data_start, BIG_ENDIAN);
+                const height = data.getInt32(data_start + 4, BIG_ENDIAN);
+                if ((width * height > 0)) {
+                    const data_len = width * height * 4; // RGBA
+                    if(blockLength < data_len + 8) {
+                        ERROR = 'Invalid TEST block length detected';
+                        break;
+                    }
+                    const image_data = new Uint32Array(_data, data_start + 8, data_len >> 2);
+                    const image = {
+                        width: width,
+                        height: height,
+                        data: image_data,
+                    };
+                    FILE.thumbnail = image
+                }
+            }
             else {
                 // Create a Blender object using a constructor template from current_SDNA_template
                 const data_start = data_offset + pointer_size + 16;
@@ -744,7 +866,7 @@ function worker_code () {
 
                 count = data.getInt32(data_offset + 12 + pointer_size, BIG_ENDIAN);
 
-                if (count > 0) {
+                if (count > 0 && constructor) {
                     let obj = new constructor();
 
                     const length = constructor.prototype._length;
@@ -776,8 +898,14 @@ function worker_code () {
 
 worker = new worker_code();
 
-worker.postMessage = function (message) {
-    return_object.onParseReady(message);
+worker.postMessage = function (message, err) {
+    return_object.onParseReady(message, err);
 };
 
 export default return_object;
+
+// window.prettyPrintHex = function (view, offset = 0, length = view.byteLength - offset) {
+//     const bytes = Array.from({ length }, (_, i) => view.getUint8(offset + i));
+//     console.log(bytes.map((b, i) => (i % 16 === 0 ? '\n' : '') + b.toString(16).padStart(2, '0')).join(' '));
+//     console.log(bytes.map((b, i) => (i % 16 === 0 ? '\n' : '') + String.fromCharCode(b)).join(''));
+// }

package/src/js-blend/threejs/blend_three.js

@@ -15,7 +15,7 @@ function createObject (blender_file, object) {
         // get the mesh
         const buffered_geometry = createThreeJSBufferGeometry(object.data, [0, 0, 0]);
 
-        console.log(object)
+        // console.log(object)
         const blend_material = object.data.mat[0];
 
         const material = blend_material ? createThreeJSMaterial(blend_material) : null;

package/src/js-blend/threejs/light.js

@@ -11,7 +11,7 @@ const blender_light_types = {
 
 export function createThreeJSLamp (blend_lamp) {
 
-    console.log(blend_lamp)
+    // console.log(blend_lamp)
 
     let ldata = blend_lamp.data;
 

package/src/js-blend/threejs/material.js

@@ -118,7 +118,7 @@ function applyTexture (blender_texture, material) {
 
 export function createThreeJSMaterial (blend_mat) {
 
-    console.log(blend_mat)
+    // console.log(blend_mat)
 
     let material = new MeshPhysicalMaterial();
     material.color.setRGB(blend_mat.r, blend_mat.g, blend_mat.b);

package/src/loader/bakeGetters.ts

@@ -0,0 +1,63 @@
+export function bakeGetters(
+    obj: any,
+): string {
+    const ss = new Set<any>()
+
+    // Create a plain object that includes getter values
+    function toPlainObject(source: any, level = 0): any {
+        if (!source || typeof source !== 'object') {
+            return source
+        }
+        if (ss.has(source)) {
+            // console.warn('duplicate', source, level)
+            // debugger
+            return 'duplicate'
+        }
+        ss.add(source)
+
+        if (Array.isArray(source)) {
+            return source.map(toPlainObject)
+        }
+
+        const result: Record<string, any> = {}
+
+        const keys = getAllKeys(source) as string[]
+        // Get all enumerable properties (including getters)
+        for (const key of keys) {
+            // if (key.startsWith('__')) continue
+            if (key === '__blender_file__') continue
+            try {
+                const v = source[key]
+                if (v === source || v === undefined || v === null) continue
+                // result[key] = 'a'
+
+                // if (key === 'typemap') console.log(v)
+                // const v = source[key]
+                // if (v === source) continue
+                // console.log(key, v)
+                if (typeof v === 'object' && v?.buffer instanceof ArrayBuffer) {
+                    result[key] = Object.getPrototypeOf(v).constructor.name
+                } else
+                    result[key] = toPlainObject(v, level + 1)
+            } catch (e) {
+                // Skip properties that throw errors when accessed
+            }
+        }
+
+        return result
+    }
+
+    const plainObj = toPlainObject(obj)
+    return plainObj
+}
+function getAllKeys(obj: any) {
+    const keys = new Set()
+    let current = obj
+
+    while (current !== null) {
+        Object.getOwnPropertyNames(current).forEach(key => keys.add(key))
+        current = Object.getPrototypeOf(current)
+    }
+
+    return Array.from(keys)
+}