minerender 2.1.0-alpha.139 → 2.1.0-alpha.140

package/dist/bundle.js

@@ -101852,6 +101852,23 @@ gl_FragDepth=readDepth(vUv);
       }
     });
   };
+  function entityAnimation(value, path) {
+    const animation = object3(value, path);
+    if (["name", "clips"].filter((key) => animation[key] !== void 0).length !== 1) {
+      fail2(path, "expected exactly one of name or clips");
+    }
+    fields(value, path, { name: text, clips: (value2, path2) => {
+      list((value3, path3) => {
+        fields(value3, path3, { name: text, weight: nonnegative }, ["name"]);
+      })(value2, path2);
+      if (!value2.length) fail2(path2, "expected at least one clip");
+      const names = /* @__PURE__ */ new Set();
+      for (const [index, clip] of value2.entries()) {
+        if (names.has(clip.name)) fail2(`${path2}[${index}].name`, `duplicate clip "${clip.name}"`);
+        names.add(clip.name);
+      }
+    }, loop: boolean, speed: nonnegative, time: nonnegative, paused: boolean });
+  }
   function guiLayer(value, path) {
     const layer = object3(value, path);
     if (["texture", "item", "text"].filter((key) => layer[key] !== void 0).length !== 1) {
@@ -101954,9 +101971,7 @@ gl_FragDepth=readDepth(vUv);
               })
             });
           },
-          animation: (value2, path2) => {
-            fields(value2, path2, { name: text, loop: boolean, speed: nonnegative, time: nonnegative, paused: boolean }, ["name"]);
-          }
+          animation: entityAnimation
         }, [...required, "asset"]);
         if (Array.isArray(input.layers) && !input.layers.length) fail2(`${path}.layers`, "expected at least one layer");
         break;
@@ -102229,10 +102244,20 @@ gl_FragDepth=readDepth(vUv);
             const entity = await content.addEntity(model, { ...definition.options, instanceMeshes: false });
             object4 = entity;
             if (definition.animation) {
+              const animation = definition.animation;
               const animations = await Entities.getAnimations(key);
-              const clip = animations?.[definition.animation.name];
-              if (!clip) throw new Error(`Entity ${definition.asset} has no animation "${definition.animation.name}"`);
-              entity.playAnimation(clip, definition.animation);
+              if (animation.name !== void 0) {
+                const clip = animations && Object.prototype.hasOwnProperty.call(animations, animation.name) ? animations[animation.name] : void 0;
+                if (!clip) throw new Error(`Entity ${definition.asset} has no animation "${animation.name}"`);
+                entity.playAnimation(clip, animation);
+              } else {
+                const clips = animation.clips.map(({ name: name2 }) => {
+                  const clip = animations && Object.prototype.hasOwnProperty.call(animations, name2) ? animations[name2] : void 0;
+                  if (!clip) throw new Error(`Entity ${definition.asset} has no animation "${name2}"`);
+                  return clip;
+                });
+                entity.playAnimations(clips, { ...animation, weights: animation.clips.map((clip) => clip.weight ?? 1) });
+              }
             }
             break;
           }