minerender 2.1.0-alpha.125 → 2.1.0-alpha.126

package/dist/browser/index.d.mts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, ShaderMaterial, Texture, Camera, MOUSE, TOUCH, Controls, WebGLRenderer, EventDispatcher, Raycaster, Intersection, Group, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Quaternion, Box2, Scene, Object3DEventMap, ShaderMaterial, Texture, Camera, MOUSE, TOUCH, Controls, WebGLRenderer, EventDispatcher, Raycaster, Intersection, Group, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { Buffer } from 'buffer';
@@ -1422,6 +1422,12 @@ declare class DisplayTransforms {
     static withHandFallbacks(display: Model["display"]): Model["display"];
     /** Build a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
     static getMatrix(display: Model["display"], position: DisplayPosition): Matrix4;
+    /** Position, rotation, and scale of a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
+    static getTransform(display: Model["display"], position: DisplayPosition): {
+        position: Vector3;
+        quaternion: Quaternion;
+        scale: Vector3;
+    };
     /** Transforms geometry in place and reverses triangle winding when the matrix reflects it. */
     static apply(geometry: BufferGeometry, matrix: Matrix4): void;
 }

package/dist/browser/index.d.ts

@@ -1,5 +1,5 @@
 import * as three from 'three';
-import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Box2, Scene, Object3DEventMap, ShaderMaterial, Texture, Camera, MOUSE, TOUCH, Controls, WebGLRenderer, EventDispatcher, Raycaster, Intersection, Group, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
+import { Vector3, PixelFormat, BoxGeometry, Material, ColorRepresentation, MeshBasicMaterial, Mesh, Euler, Vector2, BufferAttribute, Float32BufferAttribute, BufferGeometry, Object3D, Box3, InstancedMesh, PerspectiveCamera, OrthographicCamera, Matrix4, Quaternion, Box2, Scene, Object3DEventMap, ShaderMaterial, Texture, Camera, MOUSE, TOUCH, Controls, WebGLRenderer, EventDispatcher, Raycaster, Intersection, Group, DataTexture, CanvasTexture, InterleavedBufferAttribute, TrianglesDrawModes, Line, Points } from 'three';
 import * as nodeCanvas from 'canvas';
 import { ImageData as ImageData$1, CanvasRenderingContext2D } from 'canvas';
 import { Buffer } from 'buffer';
@@ -1422,6 +1422,12 @@ declare class DisplayTransforms {
     static withHandFallbacks(display: Model["display"]): Model["display"];
     /** Build a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
     static getMatrix(display: Model["display"], position: DisplayPosition): Matrix4;
+    /** Position, rotation, and scale of a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
+    static getTransform(display: Model["display"], position: DisplayPosition): {
+        position: Vector3;
+        quaternion: Quaternion;
+        scale: Vector3;
+    };
     /** Transforms geometry in place and reverses triangle winding when the matrix reflects it. */
     static apply(geometry: BufferGeometry, matrix: Matrix4): void;
 }

package/dist/browser/index.js

@@ -1479,6 +1479,11 @@ var init_DisplayTransforms = __esm({
       }
       /** Build a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
       static getMatrix(display, position) {
+        const transform = this.getTransform(display, position);
+        return new import_three7.Matrix4().compose(transform.position, transform.quaternion, transform.scale);
+      }
+      /** Position, rotation, and scale of a display pose for geometry already centered at the model's [8, 8, 8] pivot. */
+      static getTransform(display, position) {
         const transform = this.withHandFallbacks(display)?.[position] ?? {};
         const left = position === "firstperson_lefthand" /* FIRSTPERSON_LEFTHAND */ || position === "thirdperson_lefthand" /* THIRDPERSON_LEFTHAND */;
         const sign = left ? -1 : 1;
@@ -1487,7 +1492,7 @@ var init_DisplayTransforms = __esm({
         const translation = new import_three7.Vector3(...transform.translation ?? [0, 0, 0]).clampScalar(-80, 80);
         translation.x *= sign;
         const scale = new import_three7.Vector3(...transform.scale ?? [1, 1, 1]).clampScalar(-4, 4);
-        return new import_three7.Matrix4().compose(translation, rotation, scale);
+        return { position: translation, quaternion: rotation, scale };
       }
       /** Transforms geometry in place and reverses triangle winding when the matrix reflects it. */
       static apply(geometry, matrix) {
@@ -7007,16 +7012,21 @@ var init_ModelObject = __esm({
         const special = this.originalModel.special;
         if (special) {
           const parts2 = await SpecialItems.getParts(special, this.originalModel.key?.root, this.originalModel.components);
-          const transform = this.options.displayPosition ? DisplayTransforms.getMatrix(this.originalModel.display, this.options.displayPosition) : new import_three27.Matrix4();
-          transform.multiply(new import_three27.Matrix4().makeTranslation(-8, -8, -8));
+          const display = new SceneObject();
+          if (this.options.displayPosition) {
+            const transform = DisplayTransforms.getTransform(this.originalModel.display, this.options.displayPosition);
+            display.position.copy(transform.position);
+            display.quaternion.copy(transform.quaternion);
+            display.scale.copy(transform.scale);
+          }
+          this.add(display);
+          const offset = new import_three27.Matrix4().makeTranslation(-8, -8, -8);
           try {
             const targets = [];
             for (const part of parts2) {
               const object4 = new EntityObject(part.model, { flip: false, wireframe: this.options.wireframe, tints: part.tints, faces: part.faces });
-              object4.matrix.copy(transform).multiply(part.transform);
-              object4.matrixWorldNeedsUpdate = true;
-              object4.matrixAutoUpdate = false;
-              this.add(object4);
+              object4.matrix.multiplyMatrices(offset, part.transform).decompose(object4.position, object4.quaternion, object4.scale);
+              display.add(object4);
               await object4.init(part.material);
               object4.iterateAllMeshes((mesh) => {
                 const source = mesh.material;