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

package/dist/bundle.js

@@ -43098,6 +43098,11 @@ void main() {
         }
         /** 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 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;
@@ -43106,7 +43111,7 @@ void main() {
           const translation = new Vector3(...transform.translation ?? [0, 0, 0]).clampScalar(-80, 80);
           translation.x *= sign;
           const scale = new Vector3(...transform.scale ?? [1, 1, 1]).clampScalar(-4, 4);
-          return new 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) {
@@ -90271,13 +90276,14 @@ ${key}` : key;
         }
         /**
          * 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) => {
@@ -90288,6 +90294,8 @@ ${key}` : key;
             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((name2) => !targets.has(name2.split("#")[0])));
           this.createMeshes();
           this.stopAnimation();
           for (const { animation, names } of selections) {
@@ -90347,24 +90355,26 @@ ${key}` : key;
         createMeshes(force = false) {
           if (this.meshesCreated && !force) return;
           const modelRoot = new 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 Matrix4();
-              if ("scale" in op) matrix.makeScale(...op.scale);
-              else if ("translate" in op) matrix.makeTranslation(...op.translate);
-              else matrix.makeRotationFromEuler(new Euler(...op.rotate, "ZYX"));
-              modelRoot.matrix.multiply(matrix);
-            }
-            modelRoot.matrixWorldNeedsUpdate = true;
-            modelRoot.matrixAutoUpdate = false;
+            for (const [index, op] of transform.entries()) {
+              if (index > 0) {
+                const child = new 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");
+            }
           } else if (this.options.flip ?? true) {
             modelRoot.scale.set(-1, -1, 1);
           }
           this.add(modelRoot);
           Object.entries(this.entityLayers).forEach(([name2, layer], index) => {
             const group = this.createGroup(`layer:${name2}`);
-            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?.[name2]);
           });
@@ -94779,16 +94789,21 @@ ${shader.fragmentShader}`.replace(
           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 Matrix4();
-            transform.multiply(new 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 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;