@weasel-js/core 1.10.0 → 1.11.0

package/dist/animation/rewind.js

@@ -1,66 +1,97 @@
-import { easeOut as e, resolveEasing as t } from "@weasel-js/geom";
+import { easeOut, resolveEasing } from "@weasel-js/geom";
+
 //#region src/animation/rewind.ts
-function n(e) {
+/** A handle that answers for whichever leg of a move is running. */
+function following(current) {
 	return {
 		get id() {
-			return e().id;
+			return current().id;
 		},
-		cancel: () => e().cancel(),
-		pause: () => e().pause(),
-		resume: () => e().resume(),
-		setTimeScale: (t) => e().setTimeScale(t),
-		timeScale: () => e().timeScale(),
-		isPaused: () => e().isPaused()
+		cancel: () => current().cancel(),
+		pause: () => current().pause(),
+		resume: () => current().resume(),
+		setTimeScale: (s) => current().setTimeScale(s),
+		timeScale: () => current().timeScale(),
+		isPaused: () => current().isPaused()
 	};
 }
-function r(e, t) {
-	let n = e.axes.to(e.committed()), r = e.axes.to(t);
-	return n.every((e, t) => e === r[t]);
+/** Whether the document holds `pose`, as the target's axes read both. */
+function holds(target, pose) {
+	const doc = target.axes.to(target.committed());
+	const want = target.axes.to(pose);
+	return doc.every((x, i) => x === want[i]);
 }
-function i(i, a, o) {
-	let s = t(o.easing ?? e), { ms: c } = o, l, u = (e, t, n) => {
-		let d = e === 0 && t, f = c > 0 ? s(e / c) : 1, p = t ? c - e : e, m = t ? o.to : o.start;
-		if (!d && (p < 1 || (t ? f >= 1 : f <= 0))) {
-			a.stop({ commit: !1 }), t && o.onDone?.();
+/**
+* A tween of `target` from `start` to `to` that follows the document when the move is undone
+* and redone mid-flight: once the document holds the pose at its other end, it turns around
+* and travels there along the positions it passed, at the pace it passed them. Any other
+* write still wins at once, as it does for a plain move.
+*/
+function rewindingTween(animator, target, o) {
+	const ease = resolveEasing(o.easing ?? easeOut);
+	const { ms } = o;
+	let current;
+	/** Travels from `from`, the pose on screen with the move `at` ms along, toward `to` when
+	*  `forward` and back toward `start` when not. */
+	const leg = (at, forward, from) => {
+		const first = at === 0 && forward;
+		const done = ms > 0 ? ease(at / ms) : 1;
+		const span = forward ? ms - at : at;
+		const dest = forward ? o.to : o.start;
+		if (!first && (span < 1 || (forward ? done >= 1 : done <= 0))) {
+			target.stop({ commit: false });
+			if (forward) o.onDone?.();
 			return;
 		}
-		let h = t ? (t) => (s((e + p * t) / c) - f) / (1 - f) : (t) => 1 - s(e * (1 - t) / c) / f, g = l = i.tween({
-			target: a,
-			from: n,
-			to: m,
-			ms: p,
-			easing: d ? s : h,
+		const easing = forward ? (v) => (ease((at + span * v) / ms) - done) / (1 - done) : (v) => 1 - ease(at * (1 - v) / ms) / done;
+		const mine = current = animator.tween({
+			target,
+			from,
+			to: dest,
+			ms: span,
+			easing: first ? ease : easing,
 			cancelKey: o.cancelKey,
-			interrupt: !1,
+			interrupt: false,
 			interpolate: o.interpolate,
-			onDone: t ? o.onDone : void 0,
-			onTick(n) {
-				if (r(a, m) || !r(a, t ? o.start : o.to)) return;
-				let s = i.live().find((e) => e.id === g.id)?.elapsed ?? 0, c = e + (t ? 1 : -1) * Math.min(p, s);
-				a.stop({ commit: !1 }), u(c, !t, n);
+			onDone: forward ? o.onDone : void 0,
+			onTick(value) {
+				if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;
+				const elapsed = animator.live().find((row) => row.id === mine.id)?.elapsed ?? 0;
+				const now = at + (forward ? 1 : -1) * Math.min(span, elapsed);
+				target.stop({ commit: false });
+				leg(now, !forward, value);
 			}
 		});
 	};
-	return u(0, !0, o.from), n(() => l);
+	leg(0, true, o.from);
+	return following(() => current);
 }
-function a(e, t, i) {
-	let a, o = (n, s) => {
-		let c = n ? i.to : i.start;
-		a = e.spring({
-			target: t,
-			from: s,
-			to: c,
-			...i.tuning,
-			cancelKey: i.cancelKey,
-			onDone: n ? i.onDone : void 0,
-			onTick(e) {
-				!r(t, c) && r(t, n ? i.start : i.to) && o(!n, e);
+/**
+* A spring of `target` from `start` to `to` that follows the document as
+* {@link rewindingTween} does: it springs toward the pose at its other end from where it is,
+* at the speed it has.
+*/
+function rewindingSpring(animator, target, o) {
+	let current;
+	const leg = (forward, from) => {
+		const dest = forward ? o.to : o.start;
+		current = animator.spring({
+			target,
+			from,
+			to: dest,
+			...o.tuning,
+			cancelKey: o.cancelKey,
+			onDone: forward ? o.onDone : void 0,
+			onTick(value) {
+				if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;
+				leg(!forward, value);
 			}
 		});
 	};
-	return o(!0, i.from), n(() => a);
+	leg(true, o.from);
+	return following(() => current);
 }
-//#endregion
-export { a as rewindingSpring, i as rewindingTween };
 
+//#endregion
+export { rewindingSpring, rewindingTween };
 //# sourceMappingURL=rewind.js.map

package/dist/animation/rewind.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewind.js","names":["following","current","s","holds","doc","target","want","pose","x","i","rewindingTween","ease","resolveEasing","easeOut","leg","first","at","forward","done","ms","span","dest","easing","v","mine","animator","elapsed","row","now","value","rewindingSpring","o"],"sources":["../../src/animation/rewind.ts"],"sourcesContent":["import { easeOut, resolveEasing, type EasingSpec } from '@weasel-js/geom';\nimport type { AnimationHandle, Animator, Target, TargetSpringOptions } from '@weasel-js/animator';\n\n/** A move of a pose between the document pose it began at and the one it commits. */\ninterface Ends<TPose> {\n  /** The document pose before the move: what an undo of it writes back. */\n  start: TPose;\n  /** The pose the move commits. */\n  to: TPose;\n  cancelKey: string;\n  /** Called when the move arrives at `to`, never when it arrives back at `start`. */\n  onDone?: () => void;\n}\n\n/** What {@link rewindingTween} takes. */\nexport interface RewindingTween<TPose> extends Ends<TPose> {\n  /** Where the move appears to start. */\n  from: TPose;\n  ms: number;\n  easing?: EasingSpec;\n  interpolate?: (a: TPose, b: TPose, t: number) => TPose;\n}\n\n/** What {@link rewindingSpring} takes. */\nexport interface RewindingSpring<TPose> extends Ends<TPose> {\n  from: TPose;\n  tuning: Pick<TargetSpringOptions<TPose>, 'preset' | 'stiffness' | 'damping' | 'mass'>;\n}\n\n/** A handle that answers for whichever leg of a move is running. */\nfunction following(current: () => AnimationHandle): AnimationHandle {\n  return {\n    get id() { return current().id; },\n    cancel: () => current().cancel(),\n    pause: () => current().pause(),\n    resume: () => current().resume(),\n    setTimeScale: (s) => current().setTimeScale(s),\n    timeScale: () => current().timeScale(),\n    isPaused: () => current().isPaused(),\n  };\n}\n\n/** Whether the document holds `pose`, as the target's axes read both. */\nfunction holds<TPose>(target: Target<TPose>, pose: TPose): boolean {\n  const doc = target.axes.to(target.committed());\n  const want = target.axes.to(pose);\n  return doc.every((x, i) => x === want[i]);\n}\n\n/**\n * A tween of `target` from `start` to `to` that follows the document when the move is undone\n * and redone mid-flight: once the document holds the pose at its other end, it turns around\n * and travels there along the positions it passed, at the pace it passed them. Any other\n * write still wins at once, as it does for a plain move.\n */\nexport function rewindingTween<TPose>(\n  animator: Animator, target: Target<TPose>, o: RewindingTween<TPose>,\n): AnimationHandle {\n  const ease = resolveEasing(o.easing ?? easeOut);\n  const { ms } = o;\n  let current: AnimationHandle;\n\n  /** Travels from `from`, the pose on screen with the move `at` ms along, toward `to` when\n   *  `forward` and back toward `start` when not. */\n  const leg = (at: number, forward: boolean, from: TPose): void => {\n    const first = at === 0 && forward;\n    const done = ms > 0 ? ease(at / ms) : 1;\n    const span = forward ? ms - at : at;\n    const dest = forward ? o.to : o.start;\n    // Nothing of the move lies that way: the pose is at that end already.\n    if (!first && (span < 1 || (forward ? done >= 1 : done <= 0))) {\n      target.stop({ commit: false });\n      if (forward) o.onDone?.();\n      return;\n    }\n    // The share of this leg's travel covered `v` of the way through its time.\n    const easing = forward\n      ? (v: number) => (ease((at + span * v) / ms) - done) / (1 - done)\n      : (v: number) => 1 - ease((at * (1 - v)) / ms) / done;\n    const mine: AnimationHandle = current = animator.tween<TPose>({\n      target,\n      from,\n      to: dest,\n      ms: span,\n      easing: first ? ease : easing,\n      cancelKey: o.cancelKey,\n      interrupt: false,\n      interpolate: o.interpolate,\n      onDone: forward ? o.onDone : undefined,\n      onTick(value) {\n        if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;\n        const elapsed = animator.live().find((row) => row.id === mine.id)?.elapsed ?? 0;\n        const now = at + (forward ? 1 : -1) * Math.min(span, elapsed);\n        target.stop({ commit: false });\n        leg(now, !forward, value);\n      },\n    });\n  };\n  leg(0, true, o.from);\n  return following(() => current);\n}\n\n/**\n * A spring of `target` from `start` to `to` that follows the document as\n * {@link rewindingTween} does: it springs toward the pose at its other end from where it is,\n * at the speed it has.\n */\nexport function rewindingSpring<TPose>(\n  animator: Animator, target: Target<TPose>, o: RewindingSpring<TPose>,\n): AnimationHandle {\n  let current: AnimationHandle;\n  const leg = (forward: boolean, from: TPose): void => {\n    const dest = forward ? o.to : o.start;\n    current = animator.spring<TPose>({\n      target,\n      from,\n      to: dest,\n      ...o.tuning,\n      // Under the key it interrupts the leg before it, and starts at that one's velocity.\n      cancelKey: o.cancelKey,\n      onDone: forward ? o.onDone : undefined,\n      onTick(value) {\n        if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;\n        leg(!forward, value);\n      },\n    });\n  };\n  leg(true, o.from);\n  return following(() => current);\n}\n"],"mappings":";;AA8BA,SAASA,EAAU,GAAiD;CAClE,OAAO;EACL,IAAI,KAAK;GAAE,OAAOC,EAAQ,CAAC,CAAC;EAAI;EAChC,cAAcA,EAAQ,CAAC,CAAC,OAAO;EAC/B,aAAaA,EAAQ,CAAC,CAAC,MAAM;EAC7B,cAAcA,EAAQ,CAAC,CAAC,OAAO;EAC/B,eAAe,MAAMA,EAAQ,CAAC,CAAC,aAAaC,CAAC;EAC7C,iBAAiBD,EAAQ,CAAC,CAAC,UAAU;EACrC,gBAAgBA,EAAQ,CAAC,CAAC,SAAS;CACrC;AACF;AAGA,SAASE,EAAa,GAAuB,GAAsB;CACjE,IAAMC,IAAMC,EAAO,KAAK,GAAGA,EAAO,UAAU,CAAC,GACvCC,IAAOD,EAAO,KAAK,GAAGE,CAAI;CAChC,OAAOH,EAAI,OAAO,GAAG,MAAMI,MAAMF,EAAKG,EAAE;AAC1C;AAQA,SAAgBC,EACd,GAAoB,GAAuB,GAC1B;CACjB,IAAMC,IAAOC,EAAc,EAAE,UAAUC,CAAO,GACxC,EAAE,UAAO,GACXZ,GAIEa,KAAO,GAAY,GAAkB,MAAsB;EAC/D,IAAMC,IAAQC,MAAO,KAAKC,GACpBC,IAAOC,IAAK,IAAIR,EAAKK,IAAKG,CAAE,IAAI,GAChCC,IAAOH,IAAUE,IAAKH,IAAKA,GAC3BK,IAAOJ,IAAU,EAAE,KAAK,EAAE;EAEhC,IAAI,CAACF,MAAUK,IAAO,MAAMH,IAAUC,KAAQ,IAAIA,KAAQ,KAAK;GAE7D,AADAb,EAAO,KAAK,EAAE,QAAQ,GAAM,CAAC,GACzBY,KAAS,EAAE,SAAS;GACxB;EACF;EAEA,IAAMK,IAASL,KACV,OAAeN,GAAMK,IAAKI,IAAOG,KAAKJ,CAAE,IAAID,MAAS,IAAIA,MACzD,MAAc,IAAIP,EAAMK,KAAM,IAAIO,KAAMJ,CAAE,IAAID,GAC7CM,IAAwB,IAAUC,EAAS,MAAa;GAC5D;GACA;GACA,IAAIJ;GACJ,IAAID;GACJ,QAAQL,IAAQJ,IAAOW;GACvB,WAAW,EAAE;GACb,WAAW;GACX,aAAa,EAAE;GACf,QAAQL,IAAU,EAAE,SAAS,KAAA;GAC7B,OAAO,GAAO;IACZ,IAAId,EAAME,GAAQgB,CAAI,KAAK,CAAClB,EAAME,GAAQY,IAAU,EAAE,QAAQ,EAAE,EAAE,GAAG;IACrE,IAAMS,IAAUD,EAAS,KAAK,CAAC,CAAC,MAAM,MAAQE,EAAI,OAAOH,EAAK,EAAE,CAAC,EAAE,WAAW,GACxEI,IAAMZ,KAAMC,IAAU,IAAI,MAAM,KAAK,IAAIG,GAAMM,CAAO;IAE5D,AADArB,EAAO,KAAK,EAAE,QAAQ,GAAM,CAAC,GAC7BS,EAAIc,GAAK,CAACX,GAASY,CAAK;GAC1B;EACF,CAAC;CACH;CAEA,OADAf,EAAI,GAAG,IAAM,EAAE,IAAI,GACZd,QAAgBC,CAAO;AAChC;AAOA,SAAgB6B,EACd,GAAoB,GAAuB,GAC1B;CACjB,IAAI7B,GACEa,KAAO,GAAkB,MAAsB;EACnD,IAAMO,IAAOJ,IAAUc,EAAE,KAAKA,EAAE;EAChC,IAAUN,EAAS,OAAc;GAC/B;GACA;GACA,IAAIJ;GACJ,GAAGU,EAAE;GAEL,WAAWA,EAAE;GACb,QAAQd,IAAUc,EAAE,SAAS,KAAA;GAC7B,OAAO,GAAO;IACZ,AAAI,GAAM1B,GAAQgB,CAAI,KAAMlB,EAAME,GAAQY,IAAUc,EAAE,QAAQA,EAAE,EAAE,KAClEjB,EAAI,CAACG,GAASY,CAAK;GACrB;EACF,CAAC;CACH;CAEA,OADAf,EAAI,IAAMiB,EAAE,IAAI,GACT/B,QAAgBC,CAAO;AAChC"}
+{"version":3,"file":"rewind.js","names":[],"sources":["../../src/animation/rewind.ts"],"sourcesContent":["import { easeOut, resolveEasing, type EasingSpec } from '@weasel-js/geom';\nimport type { AnimationHandle, Animator, Target, TargetSpringOptions } from '@weasel-js/animator';\n\n/** A move of a pose between the document pose it began at and the one it commits. */\ninterface Ends<TPose> {\n  /** The document pose before the move: what an undo of it writes back. */\n  start: TPose;\n  /** The pose the move commits. */\n  to: TPose;\n  cancelKey: string;\n  /** Called when the move arrives at `to`, never when it arrives back at `start`. */\n  onDone?: () => void;\n}\n\n/** What {@link rewindingTween} takes. */\nexport interface RewindingTween<TPose> extends Ends<TPose> {\n  /** Where the move appears to start. */\n  from: TPose;\n  ms: number;\n  easing?: EasingSpec;\n  interpolate?: (a: TPose, b: TPose, t: number) => TPose;\n}\n\n/** What {@link rewindingSpring} takes. */\nexport interface RewindingSpring<TPose> extends Ends<TPose> {\n  from: TPose;\n  tuning: Pick<TargetSpringOptions<TPose>, 'preset' | 'stiffness' | 'damping' | 'mass'>;\n}\n\n/** A handle that answers for whichever leg of a move is running. */\nfunction following(current: () => AnimationHandle): AnimationHandle {\n  return {\n    get id() { return current().id; },\n    cancel: () => current().cancel(),\n    pause: () => current().pause(),\n    resume: () => current().resume(),\n    setTimeScale: (s) => current().setTimeScale(s),\n    timeScale: () => current().timeScale(),\n    isPaused: () => current().isPaused(),\n  };\n}\n\n/** Whether the document holds `pose`, as the target's axes read both. */\nfunction holds<TPose>(target: Target<TPose>, pose: TPose): boolean {\n  const doc = target.axes.to(target.committed());\n  const want = target.axes.to(pose);\n  return doc.every((x, i) => x === want[i]);\n}\n\n/**\n * A tween of `target` from `start` to `to` that follows the document when the move is undone\n * and redone mid-flight: once the document holds the pose at its other end, it turns around\n * and travels there along the positions it passed, at the pace it passed them. Any other\n * write still wins at once, as it does for a plain move.\n */\nexport function rewindingTween<TPose>(\n  animator: Animator, target: Target<TPose>, o: RewindingTween<TPose>,\n): AnimationHandle {\n  const ease = resolveEasing(o.easing ?? easeOut);\n  const { ms } = o;\n  let current: AnimationHandle;\n\n  /** Travels from `from`, the pose on screen with the move `at` ms along, toward `to` when\n   *  `forward` and back toward `start` when not. */\n  const leg = (at: number, forward: boolean, from: TPose): void => {\n    const first = at === 0 && forward;\n    const done = ms > 0 ? ease(at / ms) : 1;\n    const span = forward ? ms - at : at;\n    const dest = forward ? o.to : o.start;\n    // Nothing of the move lies that way: the pose is at that end already.\n    if (!first && (span < 1 || (forward ? done >= 1 : done <= 0))) {\n      target.stop({ commit: false });\n      if (forward) o.onDone?.();\n      return;\n    }\n    // The share of this leg's travel covered `v` of the way through its time.\n    const easing = forward\n      ? (v: number) => (ease((at + span * v) / ms) - done) / (1 - done)\n      : (v: number) => 1 - ease((at * (1 - v)) / ms) / done;\n    const mine: AnimationHandle = current = animator.tween<TPose>({\n      target,\n      from,\n      to: dest,\n      ms: span,\n      easing: first ? ease : easing,\n      cancelKey: o.cancelKey,\n      interrupt: false,\n      interpolate: o.interpolate,\n      onDone: forward ? o.onDone : undefined,\n      onTick(value) {\n        if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;\n        const elapsed = animator.live().find((row) => row.id === mine.id)?.elapsed ?? 0;\n        const now = at + (forward ? 1 : -1) * Math.min(span, elapsed);\n        target.stop({ commit: false });\n        leg(now, !forward, value);\n      },\n    });\n  };\n  leg(0, true, o.from);\n  return following(() => current);\n}\n\n/**\n * A spring of `target` from `start` to `to` that follows the document as\n * {@link rewindingTween} does: it springs toward the pose at its other end from where it is,\n * at the speed it has.\n */\nexport function rewindingSpring<TPose>(\n  animator: Animator, target: Target<TPose>, o: RewindingSpring<TPose>,\n): AnimationHandle {\n  let current: AnimationHandle;\n  const leg = (forward: boolean, from: TPose): void => {\n    const dest = forward ? o.to : o.start;\n    current = animator.spring<TPose>({\n      target,\n      from,\n      to: dest,\n      ...o.tuning,\n      // Under the key it interrupts the leg before it, and starts at that one's velocity.\n      cancelKey: o.cancelKey,\n      onDone: forward ? o.onDone : undefined,\n      onTick(value) {\n        if (holds(target, dest) || !holds(target, forward ? o.start : o.to)) return;\n        leg(!forward, value);\n      },\n    });\n  };\n  leg(true, o.from);\n  return following(() => current);\n}\n"],"mappings":";;;;AA8BA,SAAS,UAAU,SAAiD;CAClE,OAAO;EACL,IAAI,KAAK;GAAE,OAAO,QAAQ,CAAC,CAAC;EAAI;EAChC,cAAc,QAAQ,CAAC,CAAC,OAAO;EAC/B,aAAa,QAAQ,CAAC,CAAC,MAAM;EAC7B,cAAc,QAAQ,CAAC,CAAC,OAAO;EAC/B,eAAe,MAAM,QAAQ,CAAC,CAAC,aAAa,CAAC;EAC7C,iBAAiB,QAAQ,CAAC,CAAC,UAAU;EACrC,gBAAgB,QAAQ,CAAC,CAAC,SAAS;CACrC;AACF;;AAGA,SAAS,MAAa,QAAuB,MAAsB;CACjE,MAAM,MAAM,OAAO,KAAK,GAAG,OAAO,UAAU,CAAC;CAC7C,MAAM,OAAO,OAAO,KAAK,GAAG,IAAI;CAChC,OAAO,IAAI,OAAO,GAAG,MAAM,MAAM,KAAK,EAAE;AAC1C;;;;;;;AAQA,SAAgB,eACd,UAAoB,QAAuB,GAC1B;CACjB,MAAM,OAAO,cAAc,EAAE,UAAU,OAAO;CAC9C,MAAM,EAAE,OAAO;CACf,IAAI;;;CAIJ,MAAM,OAAO,IAAY,SAAkB,SAAsB;EAC/D,MAAM,QAAQ,OAAO,KAAK;EAC1B,MAAM,OAAO,KAAK,IAAI,KAAK,KAAK,EAAE,IAAI;EACtC,MAAM,OAAO,UAAU,KAAK,KAAK;EACjC,MAAM,OAAO,UAAU,EAAE,KAAK,EAAE;EAEhC,IAAI,CAAC,UAAU,OAAO,MAAM,UAAU,QAAQ,IAAI,QAAQ,KAAK;GAC7D,OAAO,KAAK,EAAE,QAAQ,MAAM,CAAC;GAC7B,IAAI,SAAS,EAAE,SAAS;GACxB;EACF;EAEA,MAAM,SAAS,WACV,OAAe,MAAM,KAAK,OAAO,KAAK,EAAE,IAAI,SAAS,IAAI,SACzD,MAAc,IAAI,KAAM,MAAM,IAAI,KAAM,EAAE,IAAI;EACnD,MAAM,OAAwB,UAAU,SAAS,MAAa;GAC5D;GACA;GACA,IAAI;GACJ,IAAI;GACJ,QAAQ,QAAQ,OAAO;GACvB,WAAW,EAAE;GACb,WAAW;GACX,aAAa,EAAE;GACf,QAAQ,UAAU,EAAE,SAAS;GAC7B,OAAO,OAAO;IACZ,IAAI,MAAM,QAAQ,IAAI,KAAK,CAAC,MAAM,QAAQ,UAAU,EAAE,QAAQ,EAAE,EAAE,GAAG;IACrE,MAAM,UAAU,SAAS,KAAK,CAAC,CAAC,MAAM,QAAQ,IAAI,OAAO,KAAK,EAAE,CAAC,EAAE,WAAW;IAC9E,MAAM,MAAM,MAAM,UAAU,IAAI,MAAM,KAAK,IAAI,MAAM,OAAO;IAC5D,OAAO,KAAK,EAAE,QAAQ,MAAM,CAAC;IAC7B,IAAI,KAAK,CAAC,SAAS,KAAK;GAC1B;EACF,CAAC;CACH;CACA,IAAI,GAAG,MAAM,EAAE,IAAI;CACnB,OAAO,gBAAgB,OAAO;AAChC;;;;;;AAOA,SAAgB,gBACd,UAAoB,QAAuB,GAC1B;CACjB,IAAI;CACJ,MAAM,OAAO,SAAkB,SAAsB;EACnD,MAAM,OAAO,UAAU,EAAE,KAAK,EAAE;EAChC,UAAU,SAAS,OAAc;GAC/B;GACA;GACA,IAAI;GACJ,GAAG,EAAE;GAEL,WAAW,EAAE;GACb,QAAQ,UAAU,EAAE,SAAS;GAC7B,OAAO,OAAO;IACZ,IAAI,MAAM,QAAQ,IAAI,KAAK,CAAC,MAAM,QAAQ,UAAU,EAAE,QAAQ,EAAE,EAAE,GAAG;IACrE,IAAI,CAAC,SAAS,KAAK;GACrB;EACF,CAAC;CACH;CACA,IAAI,MAAM,EAAE,IAAI;CAChB,OAAO,gBAAgB,OAAO;AAChC"}

package/dist/animation/rig/bindRig.js

@@ -1,106 +1,159 @@
-import { AUTO_POSE_DESCRIPTOR as e } from "../../core/geometry/autoPoseDescriptor.js";
-import { createRigSeat as t } from "./rigSeat.js";
-import { bindSkins as n, dataRestPath as r } from "./skinBinding.js";
-import { mat3 as i } from "@weasel-js/geom";
-import { resolveSkeleton as a } from "@weasel-js/animator";
+import { AUTO_POSE_DESCRIPTOR } from "../../core/geometry/autoPoseDescriptor.js";
+import { createRigSeat } from "./rigSeat.js";
+import { bindSkins, dataRestPath } from "./skinBinding.js";
+import { mat3 } from "@weasel-js/geom";
+import { resolveSkeleton } from "@weasel-js/animator";
+
 //#region src/animation/rig/bindRig.ts
-function o(e) {
-	return (t, { rest: n, fromRest: r }) => {
-		let a = e.getBounds(n), o = a.x + a.width / 2, s = a.y + a.height / 2, [c, l] = i.apply(r, o, s), u = e.translate ? e.translate(n, c - o, l - s) : e.remapBounds(n, a, {
-			...a,
-			x: a.x + c - o,
-			y: a.y + l - s
+/**
+* Carries a node rigidly with its joint: the rest pose's center moves by
+* `fromRest`, and its rotation turns with the rest pose's x-axis. Scale in the
+* joint chain moves positions but not sizes — the pose model holds no shear,
+* and a sized pose under anisotropic scale would need one. Write an `apply`
+* that reads `world` to size nodes from joint scale.
+*/
+function rigidRigApply(descriptor) {
+	return (_world, { rest, fromRest }) => {
+		const b = descriptor.getBounds(rest);
+		const cx = b.x + b.width / 2;
+		const cy = b.y + b.height / 2;
+		const [nx, ny] = mat3.apply(fromRest, cx, cy);
+		const moved = descriptor.translate ? descriptor.translate(rest, nx - cx, ny - cy) : descriptor.remapBounds(rest, b, {
+			...b,
+			x: b.x + nx - cx,
+			y: b.y + ny - cy
 		});
-		if (!e.withRotation) return u;
-		let d = e.getRotation?.(n) ?? 0, f = Math.cos(d), p = Math.sin(d);
-		return e.withRotation(u, Math.atan2(r[1] * f + r[4] * p, r[0] * f + r[3] * p));
+		if (!descriptor.withRotation) return moved;
+		const r0 = descriptor.getRotation?.(rest) ?? 0;
+		const ux = Math.cos(r0);
+		const uy = Math.sin(r0);
+		return descriptor.withRotation(moved, Math.atan2(fromRest[1] * ux + fromRest[4] * uy, fromRest[0] * ux + fromRest[3] * uy));
 	};
 }
-function s(e) {
-	let n = t(e.skeleton), { rig: r, binding: i } = c(e, n);
-	return n.binding = i, r;
+/**
+* Bind a skeleton's joints to scene nodes. Nodes are written in world space
+* and the rig resolves its own hierarchy, so bound nodes are best left
+* unparented, or under containers whose pose does not compose into theirs;
+* the scene's tree stays free to order and group them for drawing.
+*/
+function bindRig(options) {
+	const seat = createRigSeat(options.skeleton);
+	const { rig, binding } = bindRigOn(options, seat);
+	seat.binding = binding;
+	return rig;
 }
-function c(t, s) {
-	let { scene: c, skeleton: l } = t, u = t.descriptor ?? e, d = t.apply ?? o(u), f = a(l, {}), p = /* @__PURE__ */ new Map(), m = (e) => {
-		let t = p.get(e);
-		if (t) return t;
-		let n = f.get(e);
-		if (!n) throw Error(`bindRig: the skeleton has no joint "${e}".`);
-		if (t = i.invert(n) ?? void 0, !t) throw Error(`bindRig: joint "${e}" is singular at the bind pose.`);
-		return p.set(e, t), t;
-	}, h = n(c, t.skins ?? {}, t.restPath ?? r, u);
-	h.joints.forEach(m);
-	let g = [];
-	for (let [e, n] of Object.entries(t.bindings ?? {})) {
-		m(e);
-		let r = f.get(e);
-		for (let i of typeof n == "string" ? [n] : n) {
-			if (t.skins && i in t.skins) throw Error(`bindRig: node "${i}" is both bound to joint "${e}" and skinned.`);
-			let n = c.get(i);
-			if (!n) throw Error(`bindRig: joint "${e}" is bound to node "${i}", which the scene lacks.`);
-			g.push({
-				node: i,
-				joint: e,
+/** {@link bindRig} on a seat the caller keeps. The rig shows the seat's target once its
+*  `binding` is the seat's. */
+function bindRigOn(options, seat) {
+	const { scene, skeleton } = options;
+	const descriptor = options.descriptor ?? AUTO_POSE_DESCRIPTOR;
+	const apply = options.apply ?? rigidRigApply(descriptor);
+	const restWorlds = resolveSkeleton(skeleton, {});
+	const restInverses = /* @__PURE__ */ new Map();
+	const restInverseOf = (joint) => {
+		let inverse = restInverses.get(joint);
+		if (inverse) return inverse;
+		const restWorld = restWorlds.get(joint);
+		if (!restWorld) throw new Error(`bindRig: the skeleton has no joint "${joint}".`);
+		inverse = mat3.invert(restWorld) ?? void 0;
+		if (!inverse) throw new Error(`bindRig: joint "${joint}" is singular at the bind pose.`);
+		restInverses.set(joint, inverse);
+		return inverse;
+	};
+	const skins = bindSkins(scene, options.skins ?? {}, options.restPath ?? dataRestPath, descriptor);
+	skins.joints.forEach(restInverseOf);
+	const bound = [];
+	for (const [joint, ids] of Object.entries(options.bindings ?? {})) {
+		restInverseOf(joint);
+		const restWorld = restWorlds.get(joint);
+		for (const node of typeof ids === "string" ? [ids] : ids) {
+			if (options.skins && node in options.skins) throw new Error(`bindRig: node "${node}" is both bound to joint "${joint}" and skinned.`);
+			const n = scene.get(node);
+			if (!n) throw new Error(`bindRig: joint "${joint}" is bound to node "${node}", which the scene lacks.`);
+			bound.push({
+				node,
+				joint,
 				rest: n.pose,
-				restWorld: r,
+				restWorld,
 				entry: { pose: n.pose }
 			});
 		}
 	}
-	let _ = f, v = !1, y = () => {
-		if (v) {
-			v = !1;
-			for (let e of g) c.overrides.clear(e.node);
-			h.release();
-		}
-	}, b = () => {
-		s.shown = !1, y();
-	}, x = (e) => {
-		let t = a(l, e), { root: n } = s;
-		if (n) for (let [e, r] of t) t.set(e, i.multiply(n, r));
-		_ = t;
-		let r = /* @__PURE__ */ new Map(), o = (e) => {
-			let n = r.get(e);
-			return n || (n = i.multiply(t.get(e), m(e)), r.set(e, n)), n;
+	let world = restWorlds;
+	let installed = false;
+	const drop = () => {
+		if (!installed) return;
+		installed = false;
+		for (const b of bound) scene.overrides.clear(b.node);
+		skins.release();
+	};
+	const release = () => {
+		seat.shown = false;
+		drop();
+	};
+	const show = (pose) => {
+		const local = resolveSkeleton(skeleton, pose);
+		const { root } = seat;
+		if (root) for (const [name, m] of local) local.set(name, mat3.multiply(root, m));
+		world = local;
+		const fromRest = /* @__PURE__ */ new Map();
+		const motionOf = (joint) => {
+			let delta = fromRest.get(joint);
+			if (!delta) {
+				delta = mat3.multiply(local.get(joint), restInverseOf(joint));
+				fromRest.set(joint, delta);
+			}
+			return delta;
 		};
-		for (let e of g) {
-			let n = t.get(e.joint);
-			e.entry.pose = d(n, {
-				joint: e.joint,
-				node: e.node,
-				rest: e.rest,
-				restWorld: e.restWorld,
-				fromRest: o(e.joint)
-			}), v || c.overrides.set(e.node, e.entry);
+		for (const b of bound) {
+			const w = local.get(b.joint);
+			b.entry.pose = apply(w, {
+				joint: b.joint,
+				node: b.node,
+				rest: b.rest,
+				restWorld: b.restWorld,
+				fromRest: motionOf(b.joint)
+			});
+			if (!installed) scene.overrides.set(b.node, b.entry);
 		}
-		h.joints.forEach(o), h.show(r), v = !0, s.shown = !0, c.overrides.commit();
-	}, { target: S } = s;
+		skins.joints.forEach(motionOf);
+		skins.show(fromRest);
+		installed = true;
+		seat.shown = true;
+		scene.overrides.commit();
+	};
+	const { target } = seat;
 	return {
 		rig: {
-			skeleton: l,
-			target: S,
-			pose(e, t) {
-				s.committed = e, t && (s.root = t), x(S.read());
+			skeleton,
+			target,
+			pose(pose, at) {
+				seat.committed = pose;
+				if (at) seat.root = at;
+				show(target.read());
 			},
-			place(e) {
-				s.root = e, x(S.read());
+			place(at) {
+				seat.root = at;
+				show(target.read());
 			},
-			world: () => _,
-			bake(e = "Bake rig pose") {
-				v && (c.batch(e, () => {
-					for (let e of g) e.entry.pose !== void 0 && c.setPose(e.node, e.entry.pose);
-					h.write();
-				}), b());
+			world: () => world,
+			bake(label = "Bake rig pose") {
+				if (!installed) return;
+				scene.batch(label, () => {
+					for (const b of bound) if (b.entry.pose !== void 0) scene.setPose(b.node, b.entry.pose);
+					skins.write();
+				});
+				release();
 			},
-			release: b
+			release
 		},
 		binding: {
-			show: x,
-			drop: y
+			show,
+			drop
 		}
 	};
 }
-//#endregion
-export { s as bindRig, c as bindRigOn, o as rigidRigApply };
 
+//#endregion
+export { bindRig, bindRigOn, rigidRigApply };
 //# sourceMappingURL=bindRig.js.map

package/dist/animation/rig/bindRig.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindRig.js","names":["rigidRigApply","b","descriptor","rest","cx","cy","nx","ny","mat3","fromRest","moved","r0","ux","uy","bindRig","seat","createRigSeat","options","bindRigOn","binding","rig","AUTO_POSE_DESCRIPTOR","apply","restWorlds","resolveSkeleton","skeleton","restInverses","restInverseOf","inverse","joint","restWorld","skins","bindSkins","scene","dataRestPath","bound","ids","node","world","installed","drop","release","show","local","pose","root","name","m","motionOf","delta","w","at","target","label"],"sources":["../../../src/animation/rig/bindRig.ts"],"sourcesContent":["import type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId, PoseOverride } from '../../core/scene/types';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport { mat3, type GlMat3 } from '@weasel-js/geom';\nimport type { Target } from '@weasel-js/animator';\nimport { resolveSkeleton } from '@weasel-js/animator';\nimport type { Pose, Skeleton } from '@weasel-js/animator';\nimport type { Skin } from '@weasel-js/animator';\nimport { createRigSeat, type RigBinding, type RigSeat } from './rigSeat';\nimport { bindSkins, dataRestPath, type RestPath, type SkinScene } from './skinBinding';\n\n/** The part of a scene a rig writes to. */\nexport interface RigScene<TPose> extends SkinScene<TPose> {\n  batch<T>(label: string, fn: () => T): T;\n}\n\n/** What a `RigApply` knows about the node it is posing. */\nexport interface RigApplyContext<TPose> {\n  /** The joint the node rides. */\n  joint: string;\n  node: NodeId;\n  /** The node's document pose when the rig was bound — where it sits at the\n   *  bind pose. */\n  rest: TPose;\n  /** The joint's world transform at the bind pose. */\n  restWorld: GlMat3;\n  /** `world * inverse(restWorld)`: the motion since the bind pose, in world\n   *  space. Carrying `rest` by it is what welding the node to the joint means. */\n  fromRest: GlMat3;\n}\n\n/** Turns a joint's world transform into a pose for one bound node. The only\n *  part of a rig that knows the scene's pose shape. */\nexport type RigApply<TPose> = (world: GlMat3, ctx: RigApplyContext<TPose>) => TPose;\n\n/** Options for `bindRig`. */\nexport interface BindRigOptions<TPose> {\n  scene: RigScene<TPose>;\n  skeleton: Skeleton;\n  /** Joint name → the node or nodes that ride it. Each node keeps the offset\n   *  from its joint that it has at the bind pose. */\n  bindings?: Readonly<Record<string, NodeId | readonly NodeId[]>>;\n  /** Node id → the weights its path bends by. Where a bound node moves whole with one joint,\n   *  a skinned node's points each follow their own joints, and the rig shows the bent path\n   *  through the node's pose override, posed at the path's bounds. */\n  skins?: Readonly<Record<NodeId, Skin>>;\n  /** Where a skinned node's path is drawn when the rig is bound. Default\n   *  {@link dataRestPath}: the node's `data.path`, through its pose. */\n  restPath?: RestPath<TPose>;\n  /** Default: {@link rigidRigApply} over `descriptor`. */\n  apply?: RigApply<TPose>;\n  /** The descriptor the default `apply` reads and writes poses through.\n   *  Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor?: PoseDescriptor<TPose>;\n}\n\n/** A skeleton bound to scene nodes, as `bindRig` returns it. */\nexport interface Rig {\n  readonly skeleton: Skeleton;\n  /**\n   * The rig's pose as a value an animator moves. Its committed value starts as `{}`, the bind\n   * pose, and each frame the rig is posed with what the target shows. A clip is a\n   * `SampledTrack<Pose>` given this as its `target`: clips on one rig crossfade by their\n   * `weight`s, weights short of 1 leave the rest to the committed pose, and a `spring` or\n   * `tween` from a pose away from the committed one adds on top. `animator.hold` shows a pose made elsewhere the same way, an\n   * IK solve included.\n   */\n  readonly target: Target<Pose>;\n  /**\n   * Commit `pose` and move every bound node to what the target now shows, which is `pose`\n   * unless something is animating the target; a hold on it weighs the new pose in when it is\n   * next read, at the animator's next frame or the hold's `touch()`. Writes go through the scene's pose overrides —\n   * no history entry, no document write, no version bump — and are committed. `root`, where\n   * given, replaces the placement, as {@link Rig.place}.\n   */\n  pose(pose: Pose, root?: GlMat3): void;\n  /** Place the rig in the world by `root`, which may mirror it, and pose it there. It stays\n   *  until placed again; with no `root`, the rig goes back to where its skeleton puts it. */\n  place(root?: GlMat3): void;\n  /** The joint world transforms as the rig was last posed, root applied. */\n  world(): ReadonlyMap<string, GlMat3>;\n  /** Write the current frame into the bound nodes' document poses as one\n   *  undo entry, and drop the overrides. A skinned node's bent path goes into\n   *  its `data.path`. Later frames stay relative to the bind-time rest, so\n   *  baking does not compound. */\n  bake(label?: string): void;\n  /** Drop the overrides; the nodes show their document poses again until the\n   *  rig is next posed. */\n  release(): void;\n}\n\n/**\n * Carries a node rigidly with its joint: the rest pose's center moves by\n * `fromRest`, and its rotation turns with the rest pose's x-axis. Scale in the\n * joint chain moves positions but not sizes — the pose model holds no shear,\n * and a sized pose under anisotropic scale would need one. Write an `apply`\n * that reads `world` to size nodes from joint scale.\n */\nexport function rigidRigApply<TPose>(descriptor: PoseDescriptor<TPose>): RigApply<TPose> {\n  return (_world, { rest, fromRest }) => {\n    const b = descriptor.getBounds(rest);\n    const cx = b.x + b.width / 2;\n    const cy = b.y + b.height / 2;\n    const [nx, ny] = mat3.apply(fromRest, cx, cy);\n    const moved = descriptor.translate\n      ? descriptor.translate(rest, nx - cx, ny - cy)\n      : descriptor.remapBounds(rest, b, { ...b, x: b.x + nx - cx, y: b.y + ny - cy });\n    if (!descriptor.withRotation) return moved;\n    const r0 = descriptor.getRotation?.(rest) ?? 0;\n    const ux = Math.cos(r0);\n    const uy = Math.sin(r0);\n    return descriptor.withRotation(\n      moved,\n      Math.atan2(fromRest[1] * ux + fromRest[4] * uy, fromRest[0] * ux + fromRest[3] * uy),\n    );\n  };\n}\n\ninterface Bound<TPose> {\n  node: NodeId;\n  joint: string;\n  rest: TPose;\n  restWorld: GlMat3;\n  entry: PoseOverride<TPose>;\n}\n\n/**\n * Bind a skeleton's joints to scene nodes. Nodes are written in world space\n * and the rig resolves its own hierarchy, so bound nodes are best left\n * unparented, or under containers whose pose does not compose into theirs;\n * the scene's tree stays free to order and group them for drawing.\n */\nexport function bindRig<TPose>(options: BindRigOptions<TPose>): Rig {\n  const seat = createRigSeat(options.skeleton);\n  const { rig, binding } = bindRigOn(options, seat);\n  seat.binding = binding;\n  return rig;\n}\n\n/** {@link bindRig} on a seat the caller keeps. The rig shows the seat's target once its\n *  `binding` is the seat's. */\nexport function bindRigOn<TPose>(\n  options: BindRigOptions<TPose>,\n  seat: RigSeat,\n): { rig: Rig; binding: RigBinding } {\n  const { scene, skeleton } = options;\n  const descriptor = options.descriptor ?? (AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>);\n  const apply = options.apply ?? rigidRigApply(descriptor);\n  const restWorlds = resolveSkeleton(skeleton, {});\n  const restInverses = new Map<string, GlMat3>();\n  const restInverseOf = (joint: string): GlMat3 => {\n    let inverse = restInverses.get(joint);\n    if (inverse) return inverse;\n    const restWorld = restWorlds.get(joint);\n    if (!restWorld) throw new Error(`bindRig: the skeleton has no joint \"${joint}\".`);\n    inverse = mat3.invert(restWorld) ?? undefined;\n    if (!inverse) throw new Error(`bindRig: joint \"${joint}\" is singular at the bind pose.`);\n    restInverses.set(joint, inverse);\n    return inverse;\n  };\n\n  const skins = bindSkins(scene, options.skins ?? {}, options.restPath ?? dataRestPath, descriptor);\n  skins.joints.forEach(restInverseOf);\n\n  const bound: Bound<TPose>[] = [];\n  for (const [joint, ids] of Object.entries(options.bindings ?? {})) {\n    restInverseOf(joint);\n    const restWorld = restWorlds.get(joint)!;\n    for (const node of typeof ids === 'string' ? [ids] : (ids as readonly NodeId[])) {\n      if (options.skins && node in options.skins) {\n        throw new Error(`bindRig: node \"${node}\" is both bound to joint \"${joint}\" and skinned.`);\n      }\n      const n = scene.get(node);\n      if (!n) throw new Error(`bindRig: joint \"${joint}\" is bound to node \"${node}\", which the scene lacks.`);\n      bound.push({ node, joint, rest: n.pose, restWorld, entry: { pose: n.pose } });\n    }\n  }\n\n  let world: ReadonlyMap<string, GlMat3> = restWorlds;\n  let installed = false;\n\n  const drop = () => {\n    if (!installed) return;\n    installed = false;\n    for (const b of bound) scene.overrides.clear(b.node);\n    skins.release();\n  };\n  const release = () => {\n    seat.shown = false;\n    drop();\n  };\n\n  const show = (pose: Pose): void => {\n    const local = resolveSkeleton(skeleton, pose);\n    const { root } = seat;\n    if (root) for (const [name, m] of local) local.set(name, mat3.multiply(root, m));\n    world = local;\n    const fromRest = new Map<string, GlMat3>();\n    const motionOf = (joint: string): GlMat3 => {\n      let delta = fromRest.get(joint);\n      if (!delta) {\n        delta = mat3.multiply(local.get(joint)!, restInverseOf(joint));\n        fromRest.set(joint, delta);\n      }\n      return delta;\n    };\n    for (const b of bound) {\n      const w = local.get(b.joint)!;\n      b.entry.pose = apply(w, { joint: b.joint, node: b.node, rest: b.rest, restWorld: b.restWorld, fromRest: motionOf(b.joint) });\n      if (!installed) scene.overrides.set(b.node, b.entry);\n    }\n    skins.joints.forEach(motionOf);\n    skins.show(fromRest);\n    installed = true;\n    seat.shown = true;\n    scene.overrides.commit();\n  };\n\n  const { target } = seat;\n  const rig: Rig = {\n    skeleton,\n    target,\n    pose(pose, at) {\n      seat.committed = pose;\n      if (at) seat.root = at;\n      show(target.read());\n    },\n    place(at) {\n      seat.root = at;\n      show(target.read());\n    },\n    world: () => world,\n    bake(label = 'Bake rig pose') {\n      if (!installed) return;\n      scene.batch(label, () => {\n        for (const b of bound) if (b.entry.pose !== undefined) scene.setPose(b.node, b.entry.pose);\n        skins.write();\n      });\n      release();\n    },\n    release,\n  };\n  return { rig, binding: { show, drop } };\n}\n"],"mappings":"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"}
+{"version":3,"file":"bindRig.js","names":[],"sources":["../../../src/animation/rig/bindRig.ts"],"sourcesContent":["import type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId, PoseOverride } from '../../core/scene/types';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport { mat3, type GlMat3 } from '@weasel-js/geom';\nimport type { Target } from '@weasel-js/animator';\nimport { resolveSkeleton } from '@weasel-js/animator';\nimport type { Pose, Skeleton } from '@weasel-js/animator';\nimport type { Skin } from '@weasel-js/animator';\nimport { createRigSeat, type RigBinding, type RigSeat } from './rigSeat';\nimport { bindSkins, dataRestPath, type RestPath, type SkinScene } from './skinBinding';\n\n/** The part of a scene a rig writes to. */\nexport interface RigScene<TPose> extends SkinScene<TPose> {\n  batch<T>(label: string, fn: () => T): T;\n}\n\n/** What a `RigApply` knows about the node it is posing. */\nexport interface RigApplyContext<TPose> {\n  /** The joint the node rides. */\n  joint: string;\n  node: NodeId;\n  /** The node's document pose when the rig was bound — where it sits at the\n   *  bind pose. */\n  rest: TPose;\n  /** The joint's world transform at the bind pose. */\n  restWorld: GlMat3;\n  /** `world * inverse(restWorld)`: the motion since the bind pose, in world\n   *  space. Carrying `rest` by it is what welding the node to the joint means. */\n  fromRest: GlMat3;\n}\n\n/** Turns a joint's world transform into a pose for one bound node. The only\n *  part of a rig that knows the scene's pose shape. */\nexport type RigApply<TPose> = (world: GlMat3, ctx: RigApplyContext<TPose>) => TPose;\n\n/** Options for `bindRig`. */\nexport interface BindRigOptions<TPose> {\n  scene: RigScene<TPose>;\n  skeleton: Skeleton;\n  /** Joint name → the node or nodes that ride it. Each node keeps the offset\n   *  from its joint that it has at the bind pose. */\n  bindings?: Readonly<Record<string, NodeId | readonly NodeId[]>>;\n  /** Node id → the weights its path bends by. Where a bound node moves whole with one joint,\n   *  a skinned node's points each follow their own joints, and the rig shows the bent path\n   *  through the node's pose override, posed at the path's bounds. */\n  skins?: Readonly<Record<NodeId, Skin>>;\n  /** Where a skinned node's path is drawn when the rig is bound. Default\n   *  {@link dataRestPath}: the node's `data.path`, through its pose. */\n  restPath?: RestPath<TPose>;\n  /** Default: {@link rigidRigApply} over `descriptor`. */\n  apply?: RigApply<TPose>;\n  /** The descriptor the default `apply` reads and writes poses through.\n   *  Default `AUTO_POSE_DESCRIPTOR`. */\n  descriptor?: PoseDescriptor<TPose>;\n}\n\n/** A skeleton bound to scene nodes, as `bindRig` returns it. */\nexport interface Rig {\n  readonly skeleton: Skeleton;\n  /**\n   * The rig's pose as a value an animator moves. Its committed value starts as `{}`, the bind\n   * pose, and each frame the rig is posed with what the target shows. A clip is a\n   * `SampledTrack<Pose>` given this as its `target`: clips on one rig crossfade by their\n   * `weight`s, weights short of 1 leave the rest to the committed pose, and a `spring` or\n   * `tween` from a pose away from the committed one adds on top. `animator.hold` shows a pose made elsewhere the same way, an\n   * IK solve included.\n   */\n  readonly target: Target<Pose>;\n  /**\n   * Commit `pose` and move every bound node to what the target now shows, which is `pose`\n   * unless something is animating the target; a hold on it weighs the new pose in when it is\n   * next read, at the animator's next frame or the hold's `touch()`. Writes go through the scene's pose overrides —\n   * no history entry, no document write, no version bump — and are committed. `root`, where\n   * given, replaces the placement, as {@link Rig.place}.\n   */\n  pose(pose: Pose, root?: GlMat3): void;\n  /** Place the rig in the world by `root`, which may mirror it, and pose it there. It stays\n   *  until placed again; with no `root`, the rig goes back to where its skeleton puts it. */\n  place(root?: GlMat3): void;\n  /** The joint world transforms as the rig was last posed, root applied. */\n  world(): ReadonlyMap<string, GlMat3>;\n  /** Write the current frame into the bound nodes' document poses as one\n   *  undo entry, and drop the overrides. A skinned node's bent path goes into\n   *  its `data.path`. Later frames stay relative to the bind-time rest, so\n   *  baking does not compound. */\n  bake(label?: string): void;\n  /** Drop the overrides; the nodes show their document poses again until the\n   *  rig is next posed. */\n  release(): void;\n}\n\n/**\n * Carries a node rigidly with its joint: the rest pose's center moves by\n * `fromRest`, and its rotation turns with the rest pose's x-axis. Scale in the\n * joint chain moves positions but not sizes — the pose model holds no shear,\n * and a sized pose under anisotropic scale would need one. Write an `apply`\n * that reads `world` to size nodes from joint scale.\n */\nexport function rigidRigApply<TPose>(descriptor: PoseDescriptor<TPose>): RigApply<TPose> {\n  return (_world, { rest, fromRest }) => {\n    const b = descriptor.getBounds(rest);\n    const cx = b.x + b.width / 2;\n    const cy = b.y + b.height / 2;\n    const [nx, ny] = mat3.apply(fromRest, cx, cy);\n    const moved = descriptor.translate\n      ? descriptor.translate(rest, nx - cx, ny - cy)\n      : descriptor.remapBounds(rest, b, { ...b, x: b.x + nx - cx, y: b.y + ny - cy });\n    if (!descriptor.withRotation) return moved;\n    const r0 = descriptor.getRotation?.(rest) ?? 0;\n    const ux = Math.cos(r0);\n    const uy = Math.sin(r0);\n    return descriptor.withRotation(\n      moved,\n      Math.atan2(fromRest[1] * ux + fromRest[4] * uy, fromRest[0] * ux + fromRest[3] * uy),\n    );\n  };\n}\n\ninterface Bound<TPose> {\n  node: NodeId;\n  joint: string;\n  rest: TPose;\n  restWorld: GlMat3;\n  entry: PoseOverride<TPose>;\n}\n\n/**\n * Bind a skeleton's joints to scene nodes. Nodes are written in world space\n * and the rig resolves its own hierarchy, so bound nodes are best left\n * unparented, or under containers whose pose does not compose into theirs;\n * the scene's tree stays free to order and group them for drawing.\n */\nexport function bindRig<TPose>(options: BindRigOptions<TPose>): Rig {\n  const seat = createRigSeat(options.skeleton);\n  const { rig, binding } = bindRigOn(options, seat);\n  seat.binding = binding;\n  return rig;\n}\n\n/** {@link bindRig} on a seat the caller keeps. The rig shows the seat's target once its\n *  `binding` is the seat's. */\nexport function bindRigOn<TPose>(\n  options: BindRigOptions<TPose>,\n  seat: RigSeat,\n): { rig: Rig; binding: RigBinding } {\n  const { scene, skeleton } = options;\n  const descriptor = options.descriptor ?? (AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>);\n  const apply = options.apply ?? rigidRigApply(descriptor);\n  const restWorlds = resolveSkeleton(skeleton, {});\n  const restInverses = new Map<string, GlMat3>();\n  const restInverseOf = (joint: string): GlMat3 => {\n    let inverse = restInverses.get(joint);\n    if (inverse) return inverse;\n    const restWorld = restWorlds.get(joint);\n    if (!restWorld) throw new Error(`bindRig: the skeleton has no joint \"${joint}\".`);\n    inverse = mat3.invert(restWorld) ?? undefined;\n    if (!inverse) throw new Error(`bindRig: joint \"${joint}\" is singular at the bind pose.`);\n    restInverses.set(joint, inverse);\n    return inverse;\n  };\n\n  const skins = bindSkins(scene, options.skins ?? {}, options.restPath ?? dataRestPath, descriptor);\n  skins.joints.forEach(restInverseOf);\n\n  const bound: Bound<TPose>[] = [];\n  for (const [joint, ids] of Object.entries(options.bindings ?? {})) {\n    restInverseOf(joint);\n    const restWorld = restWorlds.get(joint)!;\n    for (const node of typeof ids === 'string' ? [ids] : (ids as readonly NodeId[])) {\n      if (options.skins && node in options.skins) {\n        throw new Error(`bindRig: node \"${node}\" is both bound to joint \"${joint}\" and skinned.`);\n      }\n      const n = scene.get(node);\n      if (!n) throw new Error(`bindRig: joint \"${joint}\" is bound to node \"${node}\", which the scene lacks.`);\n      bound.push({ node, joint, rest: n.pose, restWorld, entry: { pose: n.pose } });\n    }\n  }\n\n  let world: ReadonlyMap<string, GlMat3> = restWorlds;\n  let installed = false;\n\n  const drop = () => {\n    if (!installed) return;\n    installed = false;\n    for (const b of bound) scene.overrides.clear(b.node);\n    skins.release();\n  };\n  const release = () => {\n    seat.shown = false;\n    drop();\n  };\n\n  const show = (pose: Pose): void => {\n    const local = resolveSkeleton(skeleton, pose);\n    const { root } = seat;\n    if (root) for (const [name, m] of local) local.set(name, mat3.multiply(root, m));\n    world = local;\n    const fromRest = new Map<string, GlMat3>();\n    const motionOf = (joint: string): GlMat3 => {\n      let delta = fromRest.get(joint);\n      if (!delta) {\n        delta = mat3.multiply(local.get(joint)!, restInverseOf(joint));\n        fromRest.set(joint, delta);\n      }\n      return delta;\n    };\n    for (const b of bound) {\n      const w = local.get(b.joint)!;\n      b.entry.pose = apply(w, { joint: b.joint, node: b.node, rest: b.rest, restWorld: b.restWorld, fromRest: motionOf(b.joint) });\n      if (!installed) scene.overrides.set(b.node, b.entry);\n    }\n    skins.joints.forEach(motionOf);\n    skins.show(fromRest);\n    installed = true;\n    seat.shown = true;\n    scene.overrides.commit();\n  };\n\n  const { target } = seat;\n  const rig: Rig = {\n    skeleton,\n    target,\n    pose(pose, at) {\n      seat.committed = pose;\n      if (at) seat.root = at;\n      show(target.read());\n    },\n    place(at) {\n      seat.root = at;\n      show(target.read());\n    },\n    world: () => world,\n    bake(label = 'Bake rig pose') {\n      if (!installed) return;\n      scene.batch(label, () => {\n        for (const b of bound) if (b.entry.pose !== undefined) scene.setPose(b.node, b.entry.pose);\n        skins.write();\n      });\n      release();\n    },\n    release,\n  };\n  return { rig, binding: { show, drop } };\n}\n"],"mappings":";;;;;;;;;;;;;;AAkGA,SAAgB,cAAqB,YAAoD;CACvF,QAAQ,QAAQ,EAAE,MAAM,eAAe;EACrC,MAAM,IAAI,WAAW,UAAU,IAAI;EACnC,MAAM,KAAK,EAAE,IAAI,EAAE,QAAQ;EAC3B,MAAM,KAAK,EAAE,IAAI,EAAE,SAAS;EAC5B,MAAM,CAAC,IAAI,MAAM,KAAK,MAAM,UAAU,IAAI,EAAE;EAC5C,MAAM,QAAQ,WAAW,YACrB,WAAW,UAAU,MAAM,KAAK,IAAI,KAAK,EAAE,IAC3C,WAAW,YAAY,MAAM,GAAG;GAAE,GAAG;GAAG,GAAG,EAAE,IAAI,KAAK;GAAI,GAAG,EAAE,IAAI,KAAK;EAAG,CAAC;EAChF,IAAI,CAAC,WAAW,cAAc,OAAO;EACrC,MAAM,KAAK,WAAW,cAAc,IAAI,KAAK;EAC7C,MAAM,KAAK,KAAK,IAAI,EAAE;EACtB,MAAM,KAAK,KAAK,IAAI,EAAE;EACtB,OAAO,WAAW,aAChB,OACA,KAAK,MAAM,SAAS,KAAK,KAAK,SAAS,KAAK,IAAI,SAAS,KAAK,KAAK,SAAS,KAAK,EAAE,CACrF;CACF;AACF;;;;;;;AAgBA,SAAgB,QAAe,SAAqC;CAClE,MAAM,OAAO,cAAc,QAAQ,QAAQ;CAC3C,MAAM,EAAE,KAAK,YAAY,UAAU,SAAS,IAAI;CAChD,KAAK,UAAU;CACf,OAAO;AACT;;;AAIA,SAAgB,UACd,SACA,MACmC;CACnC,MAAM,EAAE,OAAO,aAAa;CAC5B,MAAM,aAAa,QAAQ,cAAe;CAC1C,MAAM,QAAQ,QAAQ,SAAS,cAAc,UAAU;CACvD,MAAM,aAAa,gBAAgB,UAAU,CAAC,CAAC;CAC/C,MAAM,+BAAe,IAAI,IAAoB;CAC7C,MAAM,iBAAiB,UAA0B;EAC/C,IAAI,UAAU,aAAa,IAAI,KAAK;EACpC,IAAI,SAAS,OAAO;EACpB,MAAM,YAAY,WAAW,IAAI,KAAK;EACtC,IAAI,CAAC,WAAW,MAAM,IAAI,MAAM,uCAAuC,MAAM,GAAG;EAChF,UAAU,KAAK,OAAO,SAAS,KAAK;EACpC,IAAI,CAAC,SAAS,MAAM,IAAI,MAAM,mBAAmB,MAAM,gCAAgC;EACvF,aAAa,IAAI,OAAO,OAAO;EAC/B,OAAO;CACT;CAEA,MAAM,QAAQ,UAAU,OAAO,QAAQ,SAAS,CAAC,GAAG,QAAQ,YAAY,cAAc,UAAU;CAChG,MAAM,OAAO,QAAQ,aAAa;CAElC,MAAM,QAAwB,CAAC;CAC/B,KAAK,MAAM,CAAC,OAAO,QAAQ,OAAO,QAAQ,QAAQ,YAAY,CAAC,CAAC,GAAG;EACjE,cAAc,KAAK;EACnB,MAAM,YAAY,WAAW,IAAI,KAAK;EACtC,KAAK,MAAM,QAAQ,OAAO,QAAQ,WAAW,CAAC,GAAG,IAAK,KAA2B;GAC/E,IAAI,QAAQ,SAAS,QAAQ,QAAQ,OACnC,MAAM,IAAI,MAAM,kBAAkB,KAAK,4BAA4B,MAAM,eAAe;GAE1F,MAAM,IAAI,MAAM,IAAI,IAAI;GACxB,IAAI,CAAC,GAAG,MAAM,IAAI,MAAM,mBAAmB,MAAM,sBAAsB,KAAK,0BAA0B;GACtG,MAAM,KAAK;IAAE;IAAM;IAAO,MAAM,EAAE;IAAM;IAAW,OAAO,EAAE,MAAM,EAAE,KAAK;GAAE,CAAC;EAC9E;CACF;CAEA,IAAI,QAAqC;CACzC,IAAI,YAAY;CAEhB,MAAM,aAAa;EACjB,IAAI,CAAC,WAAW;EAChB,YAAY;EACZ,KAAK,MAAM,KAAK,OAAO,MAAM,UAAU,MAAM,EAAE,IAAI;EACnD,MAAM,QAAQ;CAChB;CACA,MAAM,gBAAgB;EACpB,KAAK,QAAQ;EACb,KAAK;CACP;CAEA,MAAM,QAAQ,SAAqB;EACjC,MAAM,QAAQ,gBAAgB,UAAU,IAAI;EAC5C,MAAM,EAAE,SAAS;EACjB,IAAI,MAAM,KAAK,MAAM,CAAC,MAAM,MAAM,OAAO,MAAM,IAAI,MAAM,KAAK,SAAS,MAAM,CAAC,CAAC;EAC/E,QAAQ;EACR,MAAM,2BAAW,IAAI,IAAoB;EACzC,MAAM,YAAY,UAA0B;GAC1C,IAAI,QAAQ,SAAS,IAAI,KAAK;GAC9B,IAAI,CAAC,OAAO;IACV,QAAQ,KAAK,SAAS,MAAM,IAAI,KAAK,GAAI,cAAc,KAAK,CAAC;IAC7D,SAAS,IAAI,OAAO,KAAK;GAC3B;GACA,OAAO;EACT;EACA,KAAK,MAAM,KAAK,OAAO;GACrB,MAAM,IAAI,MAAM,IAAI,EAAE,KAAK;GAC3B,EAAE,MAAM,OAAO,MAAM,GAAG;IAAE,OAAO,EAAE;IAAO,MAAM,EAAE;IAAM,MAAM,EAAE;IAAM,WAAW,EAAE;IAAW,UAAU,SAAS,EAAE,KAAK;GAAE,CAAC;GAC3H,IAAI,CAAC,WAAW,MAAM,UAAU,IAAI,EAAE,MAAM,EAAE,KAAK;EACrD;EACA,MAAM,OAAO,QAAQ,QAAQ;EAC7B,MAAM,KAAK,QAAQ;EACnB,YAAY;EACZ,KAAK,QAAQ;EACb,MAAM,UAAU,OAAO;CACzB;CAEA,MAAM,EAAE,WAAW;CAwBnB,OAAO;EAAE;GAtBP;GACA;GACA,KAAK,MAAM,IAAI;IACb,KAAK,YAAY;IACjB,IAAI,IAAI,KAAK,OAAO;IACpB,KAAK,OAAO,KAAK,CAAC;GACpB;GACA,MAAM,IAAI;IACR,KAAK,OAAO;IACZ,KAAK,OAAO,KAAK,CAAC;GACpB;GACA,aAAa;GACb,KAAK,QAAQ,iBAAiB;IAC5B,IAAI,CAAC,WAAW;IAChB,MAAM,MAAM,aAAa;KACvB,KAAK,MAAM,KAAK,OAAO,IAAI,EAAE,MAAM,SAAS,QAAW,MAAM,QAAQ,EAAE,MAAM,EAAE,MAAM,IAAI;KACzF,MAAM,MAAM;IACd,CAAC;IACD,QAAQ;GACV;GACA;EAEO;EAAK,SAAS;GAAE;GAAM;EAAK;CAAE;AACxC"}