minerender 2.1.0-alpha.124 → 2.1.0-alpha.126

package/dist/node/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';
@@ -1191,7 +1191,7 @@ interface EntityAnimation {
     /** Seconds. */
     length: number;
     loop: boolean;
-    /** Geometry layer targeted by this clip; defaults to `main`. */
+    /** Geometry layer targeted by this clip; defaults to `main`. A `main` clip also poses selected layers without their own clip. */
     layer?: string;
     /** Part name anywhere in a layer; `root` is the layer's root part. */
     bones: Record<string, EntityAnimationBone>;
@@ -1424,6 +1424,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;
 }
@@ -1599,11 +1605,12 @@ declare class EntityObject extends SceneObject {
     get animationTime(): number;
     /**
      * Plays a clip from {@link Entities.getAnimations}, replacing all active clips.
-     * Offsets apply to the baked pose in the clip's layer (`main` by default), including repeated draws of that layer.
+     * Offsets apply to the baked pose in the clip's layer (`main` by default) and its repeated draws.
+     * A `main` clip also poses every selected layer without a clip of its own.
      * The object owns no clock: call {@link advanceAnimation} per frame, or {@link setAnimationTime}.
      */
     playAnimation(animation: EntityAnimation, options?: EntityAnimationOptions): void;
-    /** Plays one clip per selected geometry layer, with a shared clock and no blending between clips. */
+    /** Plays clips with a shared clock and no blending. Selected layers without their own clip follow `main`. */
     playAnimations(animations: readonly EntityAnimation[], options?: EntityAnimationOptions): void;
     /** Stops all clips and restores the poses from before playback. */
     stopAnimation(): void;

package/dist/node/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';
@@ -1191,7 +1191,7 @@ interface EntityAnimation {
     /** Seconds. */
     length: number;
     loop: boolean;
-    /** Geometry layer targeted by this clip; defaults to `main`. */
+    /** Geometry layer targeted by this clip; defaults to `main`. A `main` clip also poses selected layers without their own clip. */
     layer?: string;
     /** Part name anywhere in a layer; `root` is the layer's root part. */
     bones: Record<string, EntityAnimationBone>;
@@ -1424,6 +1424,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;
 }
@@ -1599,11 +1605,12 @@ declare class EntityObject extends SceneObject {
     get animationTime(): number;
     /**
      * Plays a clip from {@link Entities.getAnimations}, replacing all active clips.
-     * Offsets apply to the baked pose in the clip's layer (`main` by default), including repeated draws of that layer.
+     * Offsets apply to the baked pose in the clip's layer (`main` by default) and its repeated draws.
+     * A `main` clip also poses every selected layer without a clip of its own.
      * The object owns no clock: call {@link advanceAnimation} per frame, or {@link setAnimationTime}.
      */
     playAnimation(animation: EntityAnimation, options?: EntityAnimationOptions): void;
-    /** Plays one clip per selected geometry layer, with a shared clock and no blending between clips. */
+    /** Plays clips with a shared clock and no blending. Selected layers without their own clip follow `main`. */
     playAnimations(animations: readonly EntityAnimation[], options?: EntityAnimationOptions): void;
     /** Stops all clips and restores the poses from before playback. */
     stopAnimation(): void;

package/dist/node/index.js

@@ -1535,6 +1535,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;
@@ -1543,7 +1548,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) {
@@ -5358,13 +5363,14 @@ var init_EntityObject = __esm({
       }
       /**
        * Plays a clip from {@link Entities.getAnimations}, replacing all active clips.
-       * Offsets apply to the baked pose in the clip's layer (`main` by default), including repeated draws of that layer.
+       * Offsets apply to the baked pose in the clip's layer (`main` by default) and its repeated draws.
+       * A `main` clip also poses every selected layer without a clip of its own.
        * The object owns no clock: call {@link advanceAnimation} per frame, or {@link setAnimationTime}.
        */
       playAnimation(animation, options) {
         this.playAnimations([animation], options);
       }
-      /** Plays one clip per selected geometry layer, with a shared clock and no blending between clips. */
+      /** Plays clips with a shared clock and no blending. Selected layers without their own clip follow `main`. */
       playAnimations(animations, options) {
         const targets = /* @__PURE__ */ new Set();
         const selections = animations.map((animation) => {
@@ -5375,6 +5381,8 @@ var init_EntityObject = __esm({
           if (!names.length) throw new Error(`Entity ${this.entity.id} has no selected animation layer "${layer}"`);
           return { animation, names };
         });
+        const main = selections.find(({ animation }) => (animation.layer ?? "main") === "main");
+        if (main) main.names.push(...Object.keys(this.entityLayers).filter((name) => !targets.has(name.split("#")[0])));
         this.createMeshes();
         this.stopAnimation();
         for (const { animation, names } of selections) {
@@ -5434,24 +5442,26 @@ var init_EntityObject = __esm({
       createMeshes(force = false) {
         if (this.meshesCreated && !force) return;
         const modelRoot = new import_three14.Object3D();
+        let transformNode = modelRoot;
         const transform = this.options.flip === void 0 ? this.entity.transform : void 0;
         if (transform) {
-          for (const op of transform) {
-            const matrix = new import_three14.Matrix4();
-            if ("scale" in op) matrix.makeScale(...op.scale);
-            else if ("translate" in op) matrix.makeTranslation(...op.translate);
-            else matrix.makeRotationFromEuler(new import_three14.Euler(...op.rotate, "ZYX"));
-            modelRoot.matrix.multiply(matrix);
+          for (const [index, op] of transform.entries()) {
+            if (index > 0) {
+              const child = new import_three14.Object3D();
+              transformNode.add(child);
+              transformNode = child;
+            }
+            if ("scale" in op) transformNode.scale.set(...op.scale);
+            else if ("translate" in op) transformNode.position.set(...op.translate);
+            else transformNode.rotation.set(...op.rotate, "ZYX");
           }
-          modelRoot.matrixWorldNeedsUpdate = true;
-          modelRoot.matrixAutoUpdate = false;
         } else if (this.options.flip ?? true) {
           modelRoot.scale.set(-1, -1, 1);
         }
         this.add(modelRoot);
         Object.entries(this.entityLayers).forEach(([name, layer], index) => {
           const group = this.createGroup(`layer:${name}`);
-          modelRoot.add(group);
+          transformNode.add(group);
           const inward = !Materials.entityModeCulls(layer.render ?? layer.layer.render);
           this.createPart("root", layer.layer.root, group, layer.layer.texture, Materials.MISSING_TEXTURE, index, inward, this.options.faces?.[name]);
         });
@@ -7104,16 +7114,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;