@threepipe/plugin-blend-importer 0.0.5 → 0.0.6

package/dist/loader/camera.d.ts

@@ -1,3 +1,4 @@
 import { Object3D } from 'threepipe';
-export declare function createCamera(object: any, ctx: any): Object3D | undefined;
+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

@@ -1 +1 @@
-{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../src/loader/camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAA;AAElC,wBAAgB,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,QAAQ,GAAG,SAAS,CA2CxE"}
+{"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 @@
-export declare function createBufferGeometry(meshData: any, ctx: any): any;
-export declare function createBufferGeometryOld(mesh: any, ctx: any): any;
+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,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAgM3D;AASD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OA0E1D"}
+{"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, ctx: any): Promise<Object3D<import('threepipe').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":"AAGA,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAA;AAUlC,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,6DAgEtD"}
+{"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 { Light } from 'threepipe';
-export declare function createLight(lamp: any, ctx: any): Light<import('three').LightShadow<import('threepipe').Camera<import('threepipe').Object3DEventMap>> | undefined, import('threepipe').Object3DEventMap> | undefined;
+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,KAAK,EAAC,MAAM,WAAW,CAAA;AAU/B,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,sKAmC9C"}
+{"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,2 +1,3 @@
-export declare function createMaterial(mat: any, ctx: any): any;
+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":"AAEA,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAShD"}
+{"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,4 +1,3 @@
-import { Object3D } from 'threepipe';
-export declare function setCreateTransform(object: any, obj: Object3D): void;
-export declare function createMesh(object: any, loaded: WeakMap<any, any>, ctx: any): any;
+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,QAAQ,EAAC,MAAM,WAAW,CAAA;AAIlC,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,QAU5D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,OAsB1E"}
+{"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.5",
+  "version": "0.0.6",
   "dependencies": {},
   "exports": {
     ".": {

package/src/BlendLoadPlugin.ts

@@ -1,4 +1,5 @@
 import {
+    AmbientLight2,
     AnyOptions,
     BaseImporterPlugin,
     BufferAttribute,
@@ -6,7 +7,7 @@ import {
     DirectionalLight2,
     FileLoader,
     ILoader,
-    Importer,
+    Importer, Mesh,
     Mesh2,
     Object3D,
     Object3D2,
@@ -14,7 +15,7 @@ import {
     PerspectiveCamera0,
     PhysicalMaterial,
     PointLight2,
-    Scene,
+    Scene, SpotLight2,
     UnlitMaterial,
 } from 'threepipe'
 import {parseBlend} from './js-blend/main.js'
@@ -36,19 +37,23 @@ export class BlendLoadPlugin extends BaseImporterPlugin {
             // console.log(bakeGetters(blend))
             const ctx = {
                 Object3D: Object3D2,
-                Mesh: Mesh2,
+                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

package/src/loader/camera.ts

@@ -1,6 +1,7 @@
 import {Object3D} from 'threepipe'
+import {Ctx} from './ctx'
 
-export function createCamera(object: any, ctx: any): Object3D | undefined {
+export function createCamera(object: any, ctx: Ctx): Object3D | undefined {
     const cdata = object.data
     // console.log(bakeGetters(object))
     if (!cdata) return undefined
@@ -10,14 +11,19 @@ export function createCamera(object: any, ctx: any): Object3D | undefined {
     let camera: Object3D
     if (type === 0) {
         // Perspective
+        // Convert lens (mm) to field of view (fov) in degrees (vfov)
+        const sensorWidth = cdata.sensor_x || 36
+        const sensorHeight = cdata.sensor_y || 24
+        const lens = cdata.lens || 50
+        const fov = 2 * Math.atan(sensorHeight / (2 * lens)) * (180 / Math.PI)
+
         camera = new ctx.PerspectiveCamera(
-            cdata.lens || 50, // fov or lens
-            (cdata.sensor_x || 36) / (cdata.sensor_y || 24), // aspect
-            cdata.clipsta || 0.1, // near
-            cdata.clipend || 1000 // far
+            fov,
+            sensorWidth / sensorHeight,
+            cdata.clipsta || 0.1,
+            cdata.clipend || 1000
         )
-        // Set additional properties if needed
-        camera.position.set(0, 0, 0)
+        if ('shiftx' in cdata) camera.userData.shiftX = cdata.shiftx // todo?
         if ('shiftx' in cdata) camera.userData.shiftX = cdata.shiftx // todo?
         if ('shifty' in cdata) camera.userData.shiftY = cdata.shifty
     } else if (type === 1) {
@@ -33,7 +39,6 @@ export function createCamera(object: any, ctx: any): Object3D | undefined {
             cdata.clipsta || 0.1,
             cdata.clipend || 1000
         )
-        camera.position.set(0, 0, 0)
         if ('shiftx' in cdata) camera.userData.shiftX = cdata.shiftx
         if ('shifty' in cdata) camera.userData.shiftY = cdata.shifty
     } else {
@@ -42,5 +47,9 @@ export function createCamera(object: any, ctx: any): Object3D | undefined {
         console.warn('Unsupported camera type', type)
     }
 
+    // const obj = new Object3D()
+    // camera.rotation.x = -Math.PI / 2
+    // obj.add(camera)
+
     return camera
 }

package/src/loader/ctx.ts

@@ -0,0 +1,29 @@
+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
+}

package/src/loader/geometry.ts

@@ -1,3 +1,5 @@
+import {Ctx} from './ctx'
+
 function getLayer(layers: any, i: number) {
     if (!Array.isArray(layers)) return layers
     return layers[i]
@@ -11,7 +13,7 @@ function getLayer(layers: any, i: number) {
 // https://projects.blender.org/blender/blender/pulls/106638
 
 // https://github.com/blender/blender/blob/55e2fd2929b7577e0785c128c8f8069efd990c07/source/blender/blenkernel/intern/mesh.cc#L413
-export function createBufferGeometry(meshData: any, ctx: any) {
+export function createBufferGeometry(meshData: any, ctx: Ctx) {
 
     if (meshData.mpoly) return createBufferGeometryOld(meshData, ctx)
     const geometry = new ctx.BufferGeometry()
@@ -212,7 +214,7 @@ export function createBufferGeometry(meshData: any, ctx: any) {
 //     // meshData.eData = domain edge - https://github.com/blender/blender/blob/05dcc0377b62d8e026e1901dfbecbd4b06fda0b5/scripts/addons_core/io_scene_gltf2/blender/exp/primitive_extract.py#L189
 //     // todo normals, tangents
 
-export function createBufferGeometryOld(mesh: any, ctx: any) {
+export function createBufferGeometryOld(mesh: any, ctx: Ctx) {
     const
         faces = Array.isArray(mesh.mpoly) ? mesh.mpoly as any[] : [mesh.mpoly],
         loops = mesh.mloop,

package/src/loader/index.ts

@@ -1,7 +1,10 @@
 import {createCamera} from './camera'
 import {createLight} from './light'
-import {createMesh, setCreateTransform} from './mesh'
-import {Object3D} from 'threepipe'
+import {createMesh} from './mesh'
+import {IObject3D, Object3D} from 'threepipe'
+import {Ctx} from './ctx'
+import {Euler, EulerOrder} from 'three/src/math/Euler'
+import {Quaternion, Vector3} from 'three'
 
 // https://github.com/blender/blender/blob/99a4c93081cc2310a09a14f20a1493e8974c10d2/source/blender/makesdna/DNA_object_types.h#L445
 const blenderObjectTypes = {
@@ -11,7 +14,7 @@ const blenderObjectTypes = {
     camera: 11,
 }
 
-export async function createObjects(file: any, ctx: any) {
+export async function createObjects(file: any, ctx: Ctx) {
     const objects: (Object3D|null)[] = []
     const childMap = new Map<any, Object3D[]>()
     const objMap = new Map<any, Object3D>()
@@ -42,7 +45,7 @@ export async function createObjects(file: any, ctx: any) {
             console.warn('Unsupported object type', object.type, object, obj)
         }
         if (obj) {
-            setCreateTransform(object, obj)
+            setTransform(object, obj as any)
             const exChildren = childMap.get(object)
             if (exChildren) {
                 for (const exChild of exChildren) {
@@ -52,7 +55,7 @@ export async function createObjects(file: any, ctx: any) {
             }
             objMap.set(object, obj)
             if (object.parent === object) {
-                console.error('invalid, parent same as object, adding to root', object)
+                console.error('BlendLoader - invalid, parent same as object, adding to root', object)
                 objects.push(obj)
             } else if (!object.parent) { // just in case
                 objects.push(obj)
@@ -71,8 +74,42 @@ export async function createObjects(file: any, ctx: any) {
     }
     if (childMap.size) {
         const vals = [...childMap.values()].flat()
-        console.warn('unknown objects with parents, adding to root', vals, childMap)
+        console.warn('BlendLoader - unknown objects with parents, adding to root', vals, childMap)
         objects.push(...vals)
     }
     return objects.filter(o => !!o) as Object3D[]
 }
+
+
+// https://github.com/blender/blender/blob/458e224587e8c45da20841a283cc1b41adc98950/source/blender/makesdna/DNA_action_types.h#L526
+const eulerModes: Record<number, EulerOrder> = {
+    [1]: 'XYZ',
+    [2]: 'XZY',
+    [3]: 'YXZ',
+    [4]: 'YZX',
+    [5]: 'ZXY',
+    [6]: 'ZYX',
+}
+
+function setTransform(object: any, obj: IObject3D) {
+    obj.name = object.aname
+    obj.scale.set(object.size[0], object.size[2], object.size[1])
+    obj.position.set(object.loc[0], object.loc[2], -object.loc[1])
+
+    if (!object.rotmode || object.rotmode === 0) {
+        // const quat = new Quaternion()
+        obj.quaternion.set(object.quat[1], object.quat[3], -object.quat[2], object.quat[0]) // wxyz
+    } else {
+        // console.log(object.rotmode)
+        // const order = eulerModes[4]
+        const order = eulerModes[object.rotmode] ?? 'XYZ'
+        const quat = new Quaternion().setFromEuler(new Euler(object.rot[0], object.rot[1], object.rot[2], order.split('').reverse().join('') as any))
+        obj.quaternion.set(quat.x, quat.z, -quat.y, quat.w) // wxyz
+    }
+    // because camera is rotated 90d in blender
+    if (object.type === blenderObjectTypes.camera)
+        obj.quaternion.multiply(new Quaternion().setFromAxisAngle(new Vector3(1, 0, 0), -Math.PI / 2))
+
+    obj.updateMatrix()
+    if (obj.setDirty) obj.setDirty()
+}

package/src/loader/light.ts

@@ -1,4 +1,5 @@
 import {Light} from 'threepipe'
+import {Ctx} from './ctx'
 
 const blenderLightTypes = {
     point: 0,
@@ -8,7 +9,7 @@ const blenderLightTypes = {
     area: 0,
 }
 
-export function createLight(lamp: any, ctx: any) {
+export function createLight(lamp: any, ctx: Ctx) {
     const ldata = lamp.data
 
     const position = [lamp.loc[0], lamp.loc[2], -lamp.loc[1]]

package/src/loader/material.ts

@@ -1,6 +1,8 @@
 // todo see blender gltf exporter and convert to js. structure is the same
 //   https://github.com/KhronosGroup/glTF-Blender-IO/blob/ed5100ab6c40472b7c3254fddfe0dd0d76d60644/addons/io_scene_gltf2/blender/exp/material/materials.py#L60
-export function createMaterial(mat: any, ctx: any) {
+import {Ctx} from './ctx'
+
+export function createMaterial(mat: any, ctx: Ctx) {
     const material = new ctx.MeshPhysicalMaterial()
     material.color.setRGB(mat.r, mat.g, mat.b)
     material.roughness = mat.roughness !== undefined ? mat.roughness : 0.4

package/src/loader/mesh.ts

@@ -1,20 +1,8 @@
-import {Object3D} from 'threepipe'
 import {createBufferGeometry} from './geometry'
 import {createMaterial} from './material'
+import {Ctx} from './ctx'
 
-export function setCreateTransform(object: any, obj: Object3D) {
-    // obj.rotateZ(object.rot[2])
-    // obj.rotateY(object.rot[1])
-    // obj.rotateX(object.rot[0])
-
-    obj.name = object.aname
-    obj.quaternion.set(object.quat[1], object.quat[3], -object.quat[2], object.quat[0]) // wxyz
-    obj.scale.set(object.size[0], object.size[1], object.size[2])
-    obj.position.set(object.loc[0], object.loc[2], -object.loc[1])
-    obj.updateMatrix()
-}
-
-export function createMesh(object: any, loaded: WeakMap<any, any>, ctx: any) {
+export function createMesh(object: any, loaded: WeakMap<any, any>, ctx: Ctx) {
     if (!object.data) {
         return undefined
     }