minerender 2.1.0-alpha.123 → 2.1.0-alpha.125

package/dist/browser/index.d.mts

@@ -1189,7 +1189,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>;
@@ -1597,11 +1597,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/browser/index.d.ts

@@ -1189,7 +1189,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>;
@@ -1597,11 +1597,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/browser/index.js

@@ -3869,11 +3869,14 @@ var init_UVMapper = __esm({
         });
       }
       static fillMissingTextureKeys(textures, target) {
-        for (let faceName of CUBE_FACES) {
-          let v = textures[faceName];
-          if (v && v.startsWith("#")) {
-            target[faceName] = target[v.substr(1)];
+        for (const key in textures) {
+          let name = key;
+          const seen = /* @__PURE__ */ new Set();
+          while (textures[name]?.startsWith("#") && !seen.has(name)) {
+            seen.add(name);
+            name = textures[name].substr(1);
           }
+          if (name !== key) target[key] = target[name];
         }
         return target;
       }
@@ -5254,13 +5257,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) => {
@@ -5271,6 +5275,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) {
@@ -5330,24 +5336,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]);
         });