@weasel-js/core 1.10.0 → 1.11.0

package/dist/animation/rig/rigNode.js

@@ -1,93 +1,144 @@
-import { AUTO_POSE_DESCRIPTOR as e } from "../../core/geometry/autoPoseDescriptor.js";
-import { createRigSeat as t } from "./rigSeat.js";
-import { useSeatedRig as n } from "./useRig.js";
-import { poseFrameInverseOf as r, poseFrameOf as i } from "@weasel-js/geom";
-import { useMemo as a, useState as o, useSyncExternalStore as s } from "react";
+import { AUTO_POSE_DESCRIPTOR } from "../../core/geometry/autoPoseDescriptor.js";
+import { createRigSeat } from "./rigSeat.js";
+import { useSeatedRig } from "./useRig.js";
+import { poseFrameInverseOf, poseFrameOf } from "@weasel-js/geom";
+import { useMemo, useState, useSyncExternalStore } from "react";
+
 //#region src/animation/rig/rigNode.ts
-var c = (e, t, n) => e ? [e[0] * t + e[2] * n + e[4], e[1] * t + e[3] * n + e[5]] : [t, n];
-function l(t, n, r = e) {
-	let a = r.getBounds(n), o = i(n), s = r.getRotation?.(n) ?? 0;
-	return { joints: t.joints.map((e) => {
-		if (e.parent != null) return e;
-		let [t, n] = c(o, a.x + e.bind.x, a.y + e.bind.y);
+var through = (m, x, y) => m ? [m[0] * x + m[2] * y + m[4], m[1] * x + m[3] * y + m[5]] : [x, y];
+/**
+* A skeleton as a rig node's data keeps it, moved to where the node's pose puts it: its root
+* joints are offset from the pose box's top-left corner and turned as the node is. Joints
+* under a root are relative to their parents and are left as they are.
+*/
+function placeSkeleton(skeleton, pose, descriptor = AUTO_POSE_DESCRIPTOR) {
+	const box = descriptor.getBounds(pose);
+	const frame = poseFrameOf(pose);
+	const turn = descriptor.getRotation?.(pose) ?? 0;
+	return { joints: skeleton.joints.map((joint) => {
+		if (joint.parent != null) return joint;
+		const [x, y] = through(frame, box.x + joint.bind.x, box.y + joint.bind.y);
 		return {
-			...e,
+			...joint,
 			bind: {
-				...e.bind,
-				x: t,
-				y: n,
-				rotation: e.bind.rotation + s
+				...joint.bind,
+				x,
+				y,
+				rotation: joint.bind.rotation + turn
 			}
 		};
 	}) };
 }
-function u(t, n, i = e) {
-	let a = i.getBounds(n), o = r(n), s = i.getRotation?.(n) ?? 0;
-	return { joints: t.joints.map((e) => {
-		if (e.parent != null) return e;
-		let [t, n] = c(o, e.bind.x, e.bind.y);
+/** The inverse of {@link placeSkeleton}: a skeleton in the scene's space, as the node at
+*  `pose` would keep it in its data. */
+function unplaceSkeleton(skeleton, pose, descriptor = AUTO_POSE_DESCRIPTOR) {
+	const box = descriptor.getBounds(pose);
+	const inverse = poseFrameInverseOf(pose);
+	const turn = descriptor.getRotation?.(pose) ?? 0;
+	return { joints: skeleton.joints.map((joint) => {
+		if (joint.parent != null) return joint;
+		const [x, y] = through(inverse, joint.bind.x, joint.bind.y);
 		return {
-			...e,
+			...joint,
 			bind: {
-				...e.bind,
-				x: t - a.x,
-				y: n - a.y,
-				rotation: e.bind.rotation - s
+				...joint.bind,
+				x: x - box.x,
+				y: y - box.y,
+				rotation: joint.bind.rotation - turn
 			}
 		};
 	}) };
 }
-var d = /* @__PURE__ */ new Map(), f = () => () => {}, p = () => d;
-function m(e, t, n, r = d) {
-	let i = e.get(t);
-	if (!i) throw Error(`rigFromNode: the rig is node "${t}", which the scene lacks.`);
-	let a = i.data?.skeleton;
-	if (!a) throw Error(`rigFromNode: node "${t}" has no skeleton in its data.`);
-	let o = {
-		skeleton: l(a, i.pose, n),
+var UNPAINTED = /* @__PURE__ */ new Map();
+var noWord = () => () => {};
+var unpainted = () => UNPAINTED;
+function read(scene, id, descriptor, painted = UNPAINTED) {
+	const node = scene.get(id);
+	if (!node) throw new Error(`rigFromNode: the rig is node "${id}", which the scene lacks.`);
+	const local = node.data?.skeleton;
+	if (!local) throw new Error(`rigFromNode: node "${id}" has no skeleton in its data.`);
+	const out = {
+		skeleton: placeSkeleton(local, node.pose, descriptor),
 		bindings: {},
 		skins: {},
-		refs: [i.pose, i.data]
-	}, s = (t) => {
-		for (let n of e.childrenOf(t)) {
-			let t = e.get(n);
-			if (!t) continue;
-			let i = t.data, a = r.get(n) ?? i?.skin;
-			o.refs.push(n, t.pose, t.data, a), a ? o.skins[n] = a : i?.joint !== void 0 && (o.bindings[i.joint] ??= []).push(n), s(n);
+		refs: [node.pose, node.data]
+	};
+	const walk = (parent) => {
+		for (const child of scene.childrenOf(parent)) {
+			const n = scene.get(child);
+			if (!n) continue;
+			const data = n.data;
+			const skin = painted.get(child) ?? data?.skin;
+			out.refs.push(child, n.pose, n.data, skin);
+			if (skin) out.skins[child] = skin;
+			else if (data?.joint !== void 0) (out.bindings[data.joint] ??= []).push(child);
+			walk(child);
 		}
 	};
-	return s(t), o;
+	walk(id);
+	return out;
 }
-var h = (e, t) => e === t || e.refs.length === t.refs.length && e.refs.every((e, n) => e === t.refs[n]);
-function g(t, n, r = e) {
-	let { skeleton: i, bindings: a, skins: o } = m(t, n, r);
+var sameRefs = (a, b) => a === b || a.refs.length === b.refs.length && a.refs.every((r, i) => r === b.refs[i]);
+/**
+* Read a rig out of the scene: the skeleton in `id`'s `data.skeleton`, placed by that node's
+* pose, and under it every node whose data has a `skin` or names a `joint`.
+*/
+function rigFromNode(scene, id, descriptor = AUTO_POSE_DESCRIPTOR) {
+	const { skeleton, bindings, skins } = read(scene, id, descriptor);
 	return {
-		skeleton: i,
-		bindings: a,
-		skins: o
+		skeleton,
+		bindings,
+		skins
 	};
 }
-function _(r) {
-	let { scene: i, node: c, apply: l, descriptor: u, restPath: d, painting: g } = r, _ = s(i.subscribe, i.getVersion), v = s(g?.listen ?? f, g?.painted ?? p), y = a(() => m(i, c, u ?? e, v), [
-		i,
-		c,
-		u,
-		_,
-		v
-	]), [b, x] = o(y), S = h(b, y) ? b : y;
-	S !== b && x(y);
-	let C = JSON.stringify(S.skeleton.joints.map((e) => e.name)), w = a(() => t(S.skeleton), [C]);
-	return n({
-		scene: i,
-		skeleton: S.skeleton,
-		bindings: S.bindings,
-		skins: S.skins,
-		apply: l,
-		descriptor: u,
-		restPath: d
-	}, w);
+/**
+* A {@link Rig} read from a node, as {@link rigFromNode} reads it. It is bound again when the
+* rig node or a node under it changes its pose or data, or when nodes under it come or go; an
+* edit elsewhere in the scene leaves it alone. A rig bound again keeps its `target`, with the
+* animations running on it, its committed pose, and its placement, unless the skeleton's
+* joints were added, removed, renamed, or reordered. Then it has a new `target`, which takes
+* over the placement and the pose of every joint the skeleton still names. Animations go on
+* running on the target they were started on and show through the new one, so a joint that
+* was renamed stops moving.
+*/
+function useRigNode(options) {
+	const { scene, node, apply, descriptor, restPath, painting } = options;
+	const version = useSyncExternalStore(scene.subscribe, scene.getVersion);
+	const painted = useSyncExternalStore(painting?.listen ?? noWord, painting?.painted ?? unpainted);
+	const next = useMemo(() => read(scene, node, descriptor ?? AUTO_POSE_DESCRIPTOR, painted), [
+		scene,
+		node,
+		descriptor,
+		version,
+		painted
+	]);
+	const [held, setHeld] = useState(next);
+	const parts = sameRefs(held, next) ? held : next;
+	if (parts !== held) setHeld(next);
+	const joints = JSON.stringify(parts.skeleton.joints.map((joint) => joint.name));
+	const [seated, setSeated] = useState(() => ({
+		joints,
+		seat: createRigSeat(parts.skeleton)
+	}));
+	let { seat } = seated;
+	if (seated.joints !== joints) {
+		seat = createRigSeat(parts.skeleton, seated.seat);
+		setSeated({
+			joints,
+			seat
+		});
+	}
+	return useSeatedRig({
+		scene,
+		skeleton: parts.skeleton,
+		bindings: parts.bindings,
+		skins: parts.skins,
+		apply,
+		descriptor,
+		restPath
+	}, seat);
 }
-//#endregion
-export { l as placeSkeleton, g as rigFromNode, u as unplaceSkeleton, _ as useRigNode };
 
+//#endregion
+export { placeSkeleton, rigFromNode, unplaceSkeleton, useRigNode };
 //# sourceMappingURL=rigNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"rigNode.js","names":["through","m","x","y","placeSkeleton","AUTO_POSE_DESCRIPTOR","box","descriptor","pose","frame","poseFrameOf","turn","skeleton","joint","unplaceSkeleton","inverse","poseFrameInverseOf","UNPAINTED","noWord","unpainted","read","node","scene","id","local","out","walk","child","parent","n","data","skin","painted","sameRefs","a","b","r","i","rigFromNode","useRigNode","options","version","useSyncExternalStore","painting","next","useMemo","held","setHeld","useState","parts","joints","seat","createRigSeat","useSeatedRig"],"sources":["../../../src/animation/rig/rigNode.ts"],"sourcesContent":["import { useMemo, useState, useSyncExternalStore } from 'react';\nimport { poseFrameInverseOf, poseFrameOf } from '@weasel-js/geom';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId } from '../../core/scene/types';\nimport type { BindRigOptions, Rig, RigScene } from './bindRig';\nimport type { Skin } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\nimport { createRigSeat } from './rigSeat';\nimport { useSeatedRig } from './useRig';\n\n/** What a rig reads from node data: a `skeleton` on the node that is the rig, and on the nodes\n *  under it a `skin` for a path that bends or a `joint` for a node that rides one whole. */\nexport interface RigNodeData {\n  /** Joints relative to the node's pose: its box's top-left corner, turned as the node is. */\n  skeleton?: Skeleton;\n  skin?: Skin;\n  joint?: string;\n}\n\n/** Weights to bind in place of the document's, and word of when they change. A `RigEditState`\n *  is one: it holds what a stroke of the weight tool has painted and not yet written. */\nexport interface PaintedSkins {\n  /** By node. A new map whenever the weights change. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  listen(fn: () => void): () => void;\n}\n\n/** The part of a scene `rigFromNode` reads. */\nexport interface RigNodeSource<TPose> {\n  get(id: NodeId): { pose: TPose; data?: unknown } | undefined;\n  childrenOf(id: NodeId): readonly NodeId[];\n}\n\n/** The skeleton, bindings, and skins a rig node declares, as `bindRig` takes them. */\nexport interface RigNodeParts {\n  skeleton: Skeleton;\n  bindings: Record<string, NodeId[]>;\n  skins: Record<NodeId, Skin>;\n}\n\ninterface Reading extends RigNodeParts {\n  /** Every node, pose, and data object the parts were read from, to tell when they are stale. */\n  refs: unknown[];\n}\n\ntype Affine = readonly [number, number, number, number, number, number];\nconst through = (m: Affine | null, x: number, y: number): [number, number] =>\n  (m ? [m[0] * x + m[2] * y + m[4], m[1] * x + m[3] * y + m[5]] : [x, y]);\n\n/**\n * A skeleton as a rig node's data keeps it, moved to where the node's pose puts it: its root\n * joints are offset from the pose box's top-left corner and turned as the node is. Joints\n * under a root are relative to their parents and are left as they are.\n */\nexport function placeSkeleton<TPose>(\n  skeleton: Skeleton,\n  pose: TPose,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): Skeleton {\n  const box = descriptor.getBounds(pose);\n  const frame = poseFrameOf(pose);\n  const turn = descriptor.getRotation?.(pose) ?? 0;\n  return {\n    joints: skeleton.joints.map((joint) => {\n      if (joint.parent != null) return joint;\n      const [x, y] = through(frame, box.x + joint.bind.x, box.y + joint.bind.y);\n      return { ...joint, bind: { ...joint.bind, x, y, rotation: joint.bind.rotation + turn } };\n    }),\n  };\n}\n\n/** The inverse of {@link placeSkeleton}: a skeleton in the scene's space, as the node at\n *  `pose` would keep it in its data. */\nexport function unplaceSkeleton<TPose>(\n  skeleton: Skeleton,\n  pose: TPose,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): Skeleton {\n  const box = descriptor.getBounds(pose);\n  const inverse = poseFrameInverseOf(pose);\n  const turn = descriptor.getRotation?.(pose) ?? 0;\n  return {\n    joints: skeleton.joints.map((joint) => {\n      if (joint.parent != null) return joint;\n      const [x, y] = through(inverse, joint.bind.x, joint.bind.y);\n      return { ...joint, bind: { ...joint.bind, x: x - box.x, y: y - box.y, rotation: joint.bind.rotation - turn } };\n    }),\n  };\n}\n\nconst UNPAINTED: ReadonlyMap<NodeId, Skin> = new Map();\nconst noWord = (): (() => void) => () => {};\nconst unpainted = (): ReadonlyMap<NodeId, Skin> => UNPAINTED;\n\nfunction read<TPose>(\n  scene: RigNodeSource<TPose>,\n  id: NodeId,\n  descriptor: PoseDescriptor<TPose>,\n  painted: ReadonlyMap<NodeId, Skin> = UNPAINTED,\n): Reading {\n  const node = scene.get(id);\n  if (!node) throw new Error(`rigFromNode: the rig is node \"${id}\", which the scene lacks.`);\n  const local = (node.data as RigNodeData | null | undefined)?.skeleton;\n  if (!local) throw new Error(`rigFromNode: node \"${id}\" has no skeleton in its data.`);\n\n  const skeleton = placeSkeleton(local, node.pose, descriptor);\n\n  const out: Reading = { skeleton, bindings: {}, skins: {}, refs: [node.pose, node.data] };\n  const walk = (parent: NodeId): void => {\n    for (const child of scene.childrenOf(parent)) {\n      const n = scene.get(child);\n      if (!n) continue;\n      const data = n.data as RigNodeData | null | undefined;\n      const skin = painted.get(child) ?? data?.skin;\n      out.refs.push(child, n.pose, n.data, skin);\n      if (skin) out.skins[child] = skin;\n      else if (data?.joint !== undefined) (out.bindings[data.joint] ??= []).push(child);\n      walk(child);\n    }\n  };\n  walk(id);\n  return out;\n}\n\nconst sameRefs = (a: Reading, b: Reading): boolean =>\n  a === b || (a.refs.length === b.refs.length && a.refs.every((r, i) => r === b.refs[i]));\n\n/**\n * Read a rig out of the scene: the skeleton in `id`'s `data.skeleton`, placed by that node's\n * pose, and under it every node whose data has a `skin` or names a `joint`.\n */\nexport function rigFromNode<TPose>(\n  scene: RigNodeSource<TPose>,\n  id: NodeId,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): RigNodeParts {\n  const { skeleton, bindings, skins } = read(scene, id, descriptor);\n  return { skeleton, bindings, skins };\n}\n\n/** Options for `useRigNode`. */\nexport interface UseRigNodeOptions<TPose>\n  extends Pick<BindRigOptions<TPose>, 'apply' | 'descriptor' | 'restPath'> {\n  scene: RigScene<TPose> & RigNodeSource<TPose> & {\n    subscribe(listener: () => void): () => void;\n    getVersion(): number;\n  };\n  /** The node whose data holds the skeleton. */\n  node: NodeId;\n  /** Weights bound in place of a node's `data.skin` while they are held. Give it the\n   *  `RigEditState` the weight tool has, and a stroke bends the path as it is painted. */\n  painting?: PaintedSkins;\n}\n\n/**\n * A {@link Rig} read from a node, as {@link rigFromNode} reads it. It is bound again when the\n * rig node or a node under it changes its pose or data, or when nodes under it come or go; an\n * edit elsewhere in the scene leaves it alone. A rig bound again keeps its `target`, with the\n * animations running on it, its committed pose, and its placement, unless the skeleton's\n * joints were added, removed, renamed, or reordered: then it starts at the bind pose with a\n * new `target`.\n */\nexport function useRigNode<TPose>(options: UseRigNodeOptions<TPose>): Rig {\n  const { scene, node, apply, descriptor, restPath, painting } = options;\n  const version = useSyncExternalStore(scene.subscribe, scene.getVersion);\n  const painted = useSyncExternalStore(painting?.listen ?? noWord, painting?.painted ?? unpainted);\n  const next = useMemo(\n    () => read(scene, node, descriptor ?? (AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>), painted),\n    // `version` is what says the scene may answer differently.\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [scene, node, descriptor, version, painted],\n  );\n  // Each read makes new objects; the rig must outlive a read that found nothing changed.\n  const [held, setHeld] = useState(next);\n  const parts = sameRefs(held, next) ? held : next;\n  if (parts !== held) setHeld(next);\n  const joints = JSON.stringify(parts.skeleton.joints.map((joint) => joint.name));\n  // A pose target's axes are its joints' names in order, so the seat holds while those do.\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  const seat = useMemo(() => createRigSeat(parts.skeleton), [joints]);\n  return useSeatedRig({\n    scene, skeleton: parts.skeleton, bindings: parts.bindings, skins: parts.skins, apply, descriptor, restPath,\n  }, seat);\n}\n"],"mappings":"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"}
+{"version":3,"file":"rigNode.js","names":[],"sources":["../../../src/animation/rig/rigNode.ts"],"sourcesContent":["import { useMemo, useState, useSyncExternalStore } from 'react';\nimport { poseFrameInverseOf, poseFrameOf } from '@weasel-js/geom';\nimport { AUTO_POSE_DESCRIPTOR } from 'core/geometry/autoPoseDescriptor';\nimport type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId } from '../../core/scene/types';\nimport type { BindRigOptions, Rig, RigScene } from './bindRig';\nimport type { Skin } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\nimport { createRigSeat } from './rigSeat';\nimport { useSeatedRig } from './useRig';\n\n/** What a rig reads from node data: a `skeleton` on the node that is the rig, and on the nodes\n *  under it a `skin` for a path that bends or a `joint` for a node that rides one whole. */\nexport interface RigNodeData {\n  /** Joints relative to the node's pose: its box's top-left corner, turned as the node is. */\n  skeleton?: Skeleton;\n  skin?: Skin;\n  joint?: string;\n}\n\n/** Weights to bind in place of the document's, and word of when they change. A `RigEditState`\n *  is one: it holds what a stroke of the weight tool has painted and not yet written. */\nexport interface PaintedSkins {\n  /** By node. A new map whenever the weights change. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  listen(fn: () => void): () => void;\n}\n\n/** The part of a scene `rigFromNode` reads. */\nexport interface RigNodeSource<TPose> {\n  get(id: NodeId): { pose: TPose; data?: unknown } | undefined;\n  childrenOf(id: NodeId): readonly NodeId[];\n}\n\n/** The skeleton, bindings, and skins a rig node declares, as `bindRig` takes them. */\nexport interface RigNodeParts {\n  skeleton: Skeleton;\n  bindings: Record<string, NodeId[]>;\n  skins: Record<NodeId, Skin>;\n}\n\ninterface Reading extends RigNodeParts {\n  /** Every node, pose, and data object the parts were read from, to tell when they are stale. */\n  refs: unknown[];\n}\n\ntype Affine = readonly [number, number, number, number, number, number];\nconst through = (m: Affine | null, x: number, y: number): [number, number] =>\n  (m ? [m[0] * x + m[2] * y + m[4], m[1] * x + m[3] * y + m[5]] : [x, y]);\n\n/**\n * A skeleton as a rig node's data keeps it, moved to where the node's pose puts it: its root\n * joints are offset from the pose box's top-left corner and turned as the node is. Joints\n * under a root are relative to their parents and are left as they are.\n */\nexport function placeSkeleton<TPose>(\n  skeleton: Skeleton,\n  pose: TPose,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): Skeleton {\n  const box = descriptor.getBounds(pose);\n  const frame = poseFrameOf(pose);\n  const turn = descriptor.getRotation?.(pose) ?? 0;\n  return {\n    joints: skeleton.joints.map((joint) => {\n      if (joint.parent != null) return joint;\n      const [x, y] = through(frame, box.x + joint.bind.x, box.y + joint.bind.y);\n      return { ...joint, bind: { ...joint.bind, x, y, rotation: joint.bind.rotation + turn } };\n    }),\n  };\n}\n\n/** The inverse of {@link placeSkeleton}: a skeleton in the scene's space, as the node at\n *  `pose` would keep it in its data. */\nexport function unplaceSkeleton<TPose>(\n  skeleton: Skeleton,\n  pose: TPose,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): Skeleton {\n  const box = descriptor.getBounds(pose);\n  const inverse = poseFrameInverseOf(pose);\n  const turn = descriptor.getRotation?.(pose) ?? 0;\n  return {\n    joints: skeleton.joints.map((joint) => {\n      if (joint.parent != null) return joint;\n      const [x, y] = through(inverse, joint.bind.x, joint.bind.y);\n      return { ...joint, bind: { ...joint.bind, x: x - box.x, y: y - box.y, rotation: joint.bind.rotation - turn } };\n    }),\n  };\n}\n\nconst UNPAINTED: ReadonlyMap<NodeId, Skin> = new Map();\nconst noWord = (): (() => void) => () => {};\nconst unpainted = (): ReadonlyMap<NodeId, Skin> => UNPAINTED;\n\nfunction read<TPose>(\n  scene: RigNodeSource<TPose>,\n  id: NodeId,\n  descriptor: PoseDescriptor<TPose>,\n  painted: ReadonlyMap<NodeId, Skin> = UNPAINTED,\n): Reading {\n  const node = scene.get(id);\n  if (!node) throw new Error(`rigFromNode: the rig is node \"${id}\", which the scene lacks.`);\n  const local = (node.data as RigNodeData | null | undefined)?.skeleton;\n  if (!local) throw new Error(`rigFromNode: node \"${id}\" has no skeleton in its data.`);\n\n  const skeleton = placeSkeleton(local, node.pose, descriptor);\n\n  const out: Reading = { skeleton, bindings: {}, skins: {}, refs: [node.pose, node.data] };\n  const walk = (parent: NodeId): void => {\n    for (const child of scene.childrenOf(parent)) {\n      const n = scene.get(child);\n      if (!n) continue;\n      const data = n.data as RigNodeData | null | undefined;\n      const skin = painted.get(child) ?? data?.skin;\n      out.refs.push(child, n.pose, n.data, skin);\n      if (skin) out.skins[child] = skin;\n      else if (data?.joint !== undefined) (out.bindings[data.joint] ??= []).push(child);\n      walk(child);\n    }\n  };\n  walk(id);\n  return out;\n}\n\nconst sameRefs = (a: Reading, b: Reading): boolean =>\n  a === b || (a.refs.length === b.refs.length && a.refs.every((r, i) => r === b.refs[i]));\n\n/**\n * Read a rig out of the scene: the skeleton in `id`'s `data.skeleton`, placed by that node's\n * pose, and under it every node whose data has a `skin` or names a `joint`.\n */\nexport function rigFromNode<TPose>(\n  scene: RigNodeSource<TPose>,\n  id: NodeId,\n  descriptor: PoseDescriptor<TPose> = AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>,\n): RigNodeParts {\n  const { skeleton, bindings, skins } = read(scene, id, descriptor);\n  return { skeleton, bindings, skins };\n}\n\n/** Options for `useRigNode`. */\nexport interface UseRigNodeOptions<TPose>\n  extends Pick<BindRigOptions<TPose>, 'apply' | 'descriptor' | 'restPath'> {\n  scene: RigScene<TPose> & RigNodeSource<TPose> & {\n    subscribe(listener: () => void): () => void;\n    getVersion(): number;\n  };\n  /** The node whose data holds the skeleton. */\n  node: NodeId;\n  /** Weights bound in place of a node's `data.skin` while they are held. Give it the\n   *  `RigEditState` the weight tool has, and a stroke bends the path as it is painted. */\n  painting?: PaintedSkins;\n}\n\n/**\n * A {@link Rig} read from a node, as {@link rigFromNode} reads it. It is bound again when the\n * rig node or a node under it changes its pose or data, or when nodes under it come or go; an\n * edit elsewhere in the scene leaves it alone. A rig bound again keeps its `target`, with the\n * animations running on it, its committed pose, and its placement, unless the skeleton's\n * joints were added, removed, renamed, or reordered. Then it has a new `target`, which takes\n * over the placement and the pose of every joint the skeleton still names. Animations go on\n * running on the target they were started on and show through the new one, so a joint that\n * was renamed stops moving.\n */\nexport function useRigNode<TPose>(options: UseRigNodeOptions<TPose>): Rig {\n  const { scene, node, apply, descriptor, restPath, painting } = options;\n  const version = useSyncExternalStore(scene.subscribe, scene.getVersion);\n  const painted = useSyncExternalStore(painting?.listen ?? noWord, painting?.painted ?? unpainted);\n  const next = useMemo(\n    () => read(scene, node, descriptor ?? (AUTO_POSE_DESCRIPTOR as PoseDescriptor<TPose>), painted),\n    // `version` is what says the scene may answer differently.\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [scene, node, descriptor, version, painted],\n  );\n  // Each read makes new objects; the rig must outlive a read that found nothing changed.\n  const [held, setHeld] = useState(next);\n  const parts = sameRefs(held, next) ? held : next;\n  if (parts !== held) setHeld(next);\n  const joints = JSON.stringify(parts.skeleton.joints.map((joint) => joint.name));\n  // A pose target's axes are its joints' names in order, so the seat holds while those do,\n  // and the next one takes over from it.\n  const [seated, setSeated] = useState(() => ({ joints, seat: createRigSeat(parts.skeleton) }));\n  let { seat } = seated;\n  if (seated.joints !== joints) {\n    seat = createRigSeat(parts.skeleton, seated.seat);\n    setSeated({ joints, seat });\n  }\n  return useSeatedRig({\n    scene, skeleton: parts.skeleton, bindings: parts.bindings, skins: parts.skins, apply, descriptor, restPath,\n  }, seat);\n}\n"],"mappings":"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"}

package/dist/animation/rig/rigSeat.js

@@ -1,26 +1,79 @@
-import { createTarget as e, skeletonAxes as t } from "@weasel-js/animator";
+import { createTarget, skeletonAxes } from "@weasel-js/animator";
+
 //#region src/animation/rig/rigSeat.ts
-function n(n) {
-	let r = {
-		committed: {},
-		root: void 0,
+var moving = (seat) => seat.target.active || seat.carried !== null && moving(seat.carried.seat);
+/** How far `carried`'s target has moved since it was taken over from, in the new seat's axes. */
+function travel(carried) {
+	const { target } = carried.seat;
+	const now = target.axes.to(target.read());
+	return carried.axis.map((k) => k < 0 ? 0 : now[k] - carried.from[k]);
+}
+/** The joints of `pose` that `skeleton` names. */
+function jointsOf(pose, skeleton) {
+	const out = {};
+	for (const { name } of skeleton.joints) {
+		const joint = pose[name];
+		if (joint) out[name] = joint;
+	}
+	return out;
+}
+/**
+* A seat for a skeleton with these joints in this order. With no `prior` it is at the bind
+* pose. With one, it takes over where that seat stands: its placement, and its pose on the
+* joints `skeleton` still names. Animations go on running on the prior seat's target, and
+* this one shows them.
+*/
+function createRigSeat(skeleton, prior) {
+	const axes = skeletonAxes(skeleton);
+	const shifted = (pose, by, sign) => axes.from(axes.to(pose).map((v, i) => v + sign * by[i]));
+	const seat = {
+		committed: prior ? jointsOf(prior.target.read(), skeleton) : {},
+		root: prior?.root,
 		binding: null,
-		shown: !1,
-		target: e({
-			get: () => r.committed,
-			set: (e) => {
-				r.committed = e;
+		shown: prior?.shown ?? false,
+		carried: prior && moving(prior) ? carry(prior, axes.names ?? []) : null,
+		target: createTarget({
+			get: () => {
+				const { carried } = seat;
+				if (!carried) return seat.committed;
+				const pose = shifted(seat.committed, travel(carried), 1);
+				if (!moving(carried.seat)) {
+					seat.committed = pose;
+					seat.carried = null;
+				}
+				return pose;
 			},
-			axes: t(n),
-			show: (e) => r.binding?.show(e)
+			set: (pose) => {
+				const { carried } = seat;
+				seat.committed = carried ? shifted(pose, travel(carried), -1) : pose;
+			},
+			axes,
+			show: (pose) => seat.binding?.show(pose)
 		})
 	};
-	return r;
+	return seat;
 }
-function r(e, t) {
-	e.binding = t, e.shown && t.show(e.target.read());
+function carry(prior, names) {
+	const { target } = prior;
+	const had = target.axes.names ?? [];
+	return {
+		seat: prior,
+		from: target.axes.to(target.read()),
+		axis: names.map((name) => had.indexOf(name))
+	};
+}
+/** Make `binding` the one `seat` shows through, and show it what the last one had on screen.
+*  A seat it took over from shows through it too. */
+function seatBinding(seat, binding) {
+	seat.binding = binding;
+	const prior = seat.carried?.seat;
+	if (prior) prior.binding = {
+		show: () => seat.binding?.show(seat.target.read()),
+		drop: () => {}
+	};
+	if (seat.shown) binding.show(seat.target.read());
 }
-//#endregion
-export { n as createRigSeat, r as seatBinding };
 
+//#endregion
+export { createRigSeat, seatBinding };
 //# sourceMappingURL=rigSeat.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"rigSeat.js","names":["createRigSeat","seat","createTarget","pose","skeletonAxes","skeleton","seatBinding","binding"],"sources":["../../../src/animation/rig/rigSeat.ts"],"sourcesContent":["import type { GlMat3 } from '@weasel-js/geom';\nimport { createTarget, skeletonAxes, type Pose, type Skeleton, type Target } from '@weasel-js/animator';\n\n/** One binding of a rig to the scene: what a seat shows its pose through. */\nexport interface RigBinding {\n  show(pose: Pose): void;\n  /** Drop the overrides, leaving the seat as it is. */\n  drop(): void;\n}\n\n/**\n * A rig's pose apart from the binding that shows it: the target, the committed pose, and the\n * placement. A rig bound again on the seat it had goes on under the animations running on its\n * target.\n */\nexport interface RigSeat {\n  readonly target: Target<Pose>;\n  committed: Pose;\n  root: GlMat3 | undefined;\n  binding: RigBinding | null;\n  /** Whether the pose is on screen: set as a binding shows it, cleared as the rig is released. */\n  shown: boolean;\n}\n\n/** A seat at the bind pose, for a skeleton with these joints in this order. */\nexport function createRigSeat(skeleton: Skeleton): RigSeat {\n  const seat: RigSeat = {\n    committed: {},\n    root: undefined,\n    binding: null,\n    shown: false,\n    target: createTarget<Pose>({\n      get: () => seat.committed,\n      set: (pose) => { seat.committed = pose; },\n      axes: skeletonAxes(skeleton),\n      show: (pose) => seat.binding?.show(pose),\n    }),\n  };\n  return seat;\n}\n\n/** Make `binding` the one `seat` shows through, and show it what the last one had on screen. */\nexport function seatBinding(seat: RigSeat, binding: RigBinding): void {\n  seat.binding = binding;\n  if (seat.shown) binding.show(seat.target.read());\n}\n"],"mappings":";;AAyBA,SAAgBA,EAAc,GAA6B;CACzD,IAAMC,IAAgB;EACpB,WAAW,CAAC;EACZ,MAAM,KAAA;EACN,SAAS;EACT,OAAO;EACP,QAAQC,EAAmB;GACzB,WAAWD,EAAK;GAChB,MAAM,MAAS;IAAE,EAAK,YAAYE;GAAM;GACxC,MAAMC,EAAaC,CAAQ;GAC3B,OAAO,MAASJ,EAAK,SAAS,KAAKE,CAAI;EACzC,CAAC;CACH;CACA,OAAOF;AACT;AAGA,SAAgBK,EAAY,GAAe,GAA2B;CAEpE,AADA,EAAK,UAAUC,GACXN,EAAK,SAAOM,EAAQ,KAAKN,EAAK,OAAO,KAAK,CAAC;AACjD"}
+{"version":3,"file":"rigSeat.js","names":[],"sources":["../../../src/animation/rig/rigSeat.ts"],"sourcesContent":["import type { GlMat3 } from '@weasel-js/geom';\nimport { createTarget, skeletonAxes, type Pose, type Skeleton, type Target } from '@weasel-js/animator';\n\n/** One binding of a rig to the scene: what a seat shows its pose through. */\nexport interface RigBinding {\n  show(pose: Pose): void;\n  /** Drop the overrides, leaving the seat as it is. */\n  drop(): void;\n}\n\n/** The seat another took over from, while something still moves its target. */\ninterface Carried {\n  seat: RigSeat;\n  /** That seat's target as it read when this one was made, as its axes. */\n  from: number[];\n  /** For each axis of this seat, that seat's axis of the same name; -1 where it has none. */\n  axis: number[];\n}\n\n/**\n * A rig's pose apart from the binding that shows it: the target, the committed pose, and the\n * placement. A rig bound again on the seat it had goes on under the animations running on its\n * target.\n */\nexport interface RigSeat {\n  readonly target: Target<Pose>;\n  /** The committed pose, less what `carried` adds to it. */\n  committed: Pose;\n  root: GlMat3 | undefined;\n  binding: RigBinding | null;\n  /** Whether the pose is on screen: set as a binding shows it, cleared as the rig is released. */\n  shown: boolean;\n  /** The seat this one took over from as the skeleton's joints changed. What moves that\n   *  seat's target since then is added to this one's, on the joints both skeletons name. */\n  carried: Carried | null;\n}\n\nconst moving = (seat: RigSeat): boolean =>\n  seat.target.active || (seat.carried !== null && moving(seat.carried.seat));\n\n/** How far `carried`'s target has moved since it was taken over from, in the new seat's axes. */\nfunction travel(carried: Carried): number[] {\n  const { target } = carried.seat;\n  const now = target.axes.to(target.read());\n  return carried.axis.map((k) => (k < 0 ? 0 : now[k]! - carried.from[k]!));\n}\n\n/** The joints of `pose` that `skeleton` names. */\nfunction jointsOf(pose: Pose, skeleton: Skeleton): Pose {\n  const out: Pose = {};\n  for (const { name } of skeleton.joints) {\n    const joint = pose[name];\n    if (joint) out[name] = joint;\n  }\n  return out;\n}\n\n/**\n * A seat for a skeleton with these joints in this order. With no `prior` it is at the bind\n * pose. With one, it takes over where that seat stands: its placement, and its pose on the\n * joints `skeleton` still names. Animations go on running on the prior seat's target, and\n * this one shows them.\n */\nexport function createRigSeat(skeleton: Skeleton, prior?: RigSeat): RigSeat {\n  const axes = skeletonAxes(skeleton);\n  const shifted = (pose: Pose, by: number[], sign: 1 | -1): Pose =>\n    axes.from(axes.to(pose).map((v, i) => v + sign * by[i]!));\n  const seat: RigSeat = {\n    committed: prior ? jointsOf(prior.target.read(), skeleton) : {},\n    root: prior?.root,\n    binding: null,\n    shown: prior?.shown ?? false,\n    carried: prior && moving(prior) ? carry(prior, axes.names ?? []) : null,\n    target: createTarget<Pose>({\n      get: () => {\n        const { carried } = seat;\n        if (!carried) return seat.committed;\n        const pose = shifted(seat.committed, travel(carried), 1);\n        if (!moving(carried.seat)) {\n          seat.committed = pose;\n          seat.carried = null;\n        }\n        return pose;\n      },\n      set: (pose) => {\n        const { carried } = seat;\n        seat.committed = carried ? shifted(pose, travel(carried), -1) : pose;\n      },\n      axes,\n      show: (pose) => seat.binding?.show(pose),\n    }),\n  };\n  return seat;\n}\n\nfunction carry(prior: RigSeat, names: readonly string[]): Carried {\n  const { target } = prior;\n  const had = target.axes.names ?? [];\n  return { seat: prior, from: target.axes.to(target.read()), axis: names.map((name) => had.indexOf(name)) };\n}\n\n/** Make `binding` the one `seat` shows through, and show it what the last one had on screen.\n *  A seat it took over from shows through it too. */\nexport function seatBinding(seat: RigSeat, binding: RigBinding): void {\n  seat.binding = binding;\n  const prior = seat.carried?.seat;\n  if (prior) prior.binding = { show: () => seat.binding?.show(seat.target.read()), drop: () => {} };\n  if (seat.shown) binding.show(seat.target.read());\n}\n"],"mappings":";;;AAqCA,IAAM,UAAU,SACd,KAAK,OAAO,UAAW,KAAK,YAAY,QAAQ,OAAO,KAAK,QAAQ,IAAI;;AAG1E,SAAS,OAAO,SAA4B;CAC1C,MAAM,EAAE,WAAW,QAAQ;CAC3B,MAAM,MAAM,OAAO,KAAK,GAAG,OAAO,KAAK,CAAC;CACxC,OAAO,QAAQ,KAAK,KAAK,MAAO,IAAI,IAAI,IAAI,IAAI,KAAM,QAAQ,KAAK,EAAI;AACzE;;AAGA,SAAS,SAAS,MAAY,UAA0B;CACtD,MAAM,MAAY,CAAC;CACnB,KAAK,MAAM,EAAE,UAAU,SAAS,QAAQ;EACtC,MAAM,QAAQ,KAAK;EACnB,IAAI,OAAO,IAAI,QAAQ;CACzB;CACA,OAAO;AACT;;;;;;;AAQA,SAAgB,cAAc,UAAoB,OAA0B;CAC1E,MAAM,OAAO,aAAa,QAAQ;CAClC,MAAM,WAAW,MAAY,IAAc,SACzC,KAAK,KAAK,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,GAAG,MAAM,IAAI,OAAO,GAAG,EAAG,CAAC;CAC1D,MAAM,OAAgB;EACpB,WAAW,QAAQ,SAAS,MAAM,OAAO,KAAK,GAAG,QAAQ,IAAI,CAAC;EAC9D,MAAM,OAAO;EACb,SAAS;EACT,OAAO,OAAO,SAAS;EACvB,SAAS,SAAS,OAAO,KAAK,IAAI,MAAM,OAAO,KAAK,SAAS,CAAC,CAAC,IAAI;EACnE,QAAQ,aAAmB;GACzB,WAAW;IACT,MAAM,EAAE,YAAY;IACpB,IAAI,CAAC,SAAS,OAAO,KAAK;IAC1B,MAAM,OAAO,QAAQ,KAAK,WAAW,OAAO,OAAO,GAAG,CAAC;IACvD,IAAI,CAAC,OAAO,QAAQ,IAAI,GAAG;KACzB,KAAK,YAAY;KACjB,KAAK,UAAU;IACjB;IACA,OAAO;GACT;GACA,MAAM,SAAS;IACb,MAAM,EAAE,YAAY;IACpB,KAAK,YAAY,UAAU,QAAQ,MAAM,OAAO,OAAO,GAAG,EAAE,IAAI;GAClE;GACA;GACA,OAAO,SAAS,KAAK,SAAS,KAAK,IAAI;EACzC,CAAC;CACH;CACA,OAAO;AACT;AAEA,SAAS,MAAM,OAAgB,OAAmC;CAChE,MAAM,EAAE,WAAW;CACnB,MAAM,MAAM,OAAO,KAAK,SAAS,CAAC;CAClC,OAAO;EAAE,MAAM;EAAO,MAAM,OAAO,KAAK,GAAG,OAAO,KAAK,CAAC;EAAG,MAAM,MAAM,KAAK,SAAS,IAAI,QAAQ,IAAI,CAAC;CAAE;AAC1G;;;AAIA,SAAgB,YAAY,MAAe,SAA2B;CACpE,KAAK,UAAU;CACf,MAAM,QAAQ,KAAK,SAAS;CAC5B,IAAI,OAAO,MAAM,UAAU;EAAE,YAAY,KAAK,SAAS,KAAK,KAAK,OAAO,KAAK,CAAC;EAAG,YAAY,CAAC;CAAE;CAChG,IAAI,KAAK,OAAO,QAAQ,KAAK,KAAK,OAAO,KAAK,CAAC;AACjD"}

package/dist/animation/rig/skinBinding.js

@@ -1,56 +1,76 @@
-import { boundsOfPath as e, pathInWorld as t } from "@weasel-js/geom";
-import { skinPath as n } from "@weasel-js/animator";
+import { boundsOfPath, pathInWorld, remapPointValues } from "@weasel-js/geom";
+import { skinPath } from "@weasel-js/animator";
+
 //#region src/animation/rig/skinBinding.ts
-function r(e) {
-	let n = e.data?.path;
-	return n ? t(n, e.pose) : null;
+/** The path in a node's `data.path`, carried through its pose as `kit:path` paints it. */
+function dataRestPath(node) {
+	const path = node.data?.path;
+	return path ? pathInWorld(path, node.pose) : null;
+}
+/**
+* `skin` after an edit to the points of the path it weighs: `origins` says where each point
+* of the new path came from, as `editAnchorSetTracked` answers. A point the edit made takes
+* weights between those of the points it lies between, and a joint left weighing nothing is
+* dropped.
+*/
+function remapSkin(skin, origins) {
+	const next = {};
+	for (const joint in skin) {
+		const weights = remapPointValues(skin[joint], origins);
+		if (weights.some((w) => w > 0)) next[joint] = weights;
+	}
+	return next;
 }
-function i(t, r, i, a) {
-	let o = [], s = /* @__PURE__ */ new Set();
-	for (let [e, n] of Object.entries(r)) {
-		let r = t.get(e);
-		if (!r) throw Error(`bindRig: a skin names node "${e}", which the scene lacks.`);
-		let a = i(r);
-		if (!a) throw Error(`bindRig: node "${e}" has no path to skin.`);
-		for (let e in n) s.add(e);
-		o.push({
-			node: e,
-			skin: n,
-			rest: a,
-			restPose: r.pose,
+/** Read each skinned node's rest path and ready an override for it. */
+function bindSkins(scene, skins, restPath, descriptor) {
+	const skinned = [];
+	const joints = /* @__PURE__ */ new Set();
+	for (const [id, skin] of Object.entries(skins)) {
+		const node = scene.get(id);
+		if (!node) throw new Error(`bindRig: a skin names node "${id}", which the scene lacks.`);
+		const rest = restPath(node);
+		if (!rest) throw new Error(`bindRig: node "${id}" has no path to skin.`);
+		for (const joint in skin) joints.add(joint);
+		skinned.push({
+			node: id,
+			skin,
+			rest,
+			restPose: node.pose,
 			entry: {}
 		});
 	}
-	let c = !1;
+	let installed = false;
 	return {
-		joints: [...s],
-		show(r) {
-			for (let i of o) {
-				let o = n(i.rest, i.skin, r);
-				i.entry.path = o, i.entry.pose = a.fromBounds(e(o), i.restPose), c || t.overrides.set(i.node, i.entry);
+		joints: [...joints],
+		show(motions) {
+			for (const s of skinned) {
+				const path = skinPath(s.rest, s.skin, motions);
+				s.entry.path = path;
+				s.entry.pose = descriptor.fromBounds(boundsOfPath(path), s.restPose);
+				if (!installed) scene.overrides.set(s.node, s.entry);
 			}
-			c = !0;
+			installed = true;
 		},
 		write() {
-			for (let e of o) {
-				let { path: n, pose: r } = e.entry;
-				if (n === void 0 || r === void 0) continue;
-				let i = t.get(e.node)?.data;
-				t.update(e.node, { data: {
-					...i,
-					path: n
-				} }), t.setPose(e.node, r);
+			for (const s of skinned) {
+				const { path, pose } = s.entry;
+				if (path === void 0 || pose === void 0) continue;
+				const data = scene.get(s.node)?.data;
+				scene.update(s.node, { data: {
+					...data,
+					path
+				} });
+				scene.setPose(s.node, pose);
 			}
 		},
 		release() {
-			if (c) {
-				c = !1;
-				for (let e of o) t.overrides.clear(e.node);
-			}
+			if (!installed) return;
+			installed = false;
+			for (const s of skinned) scene.overrides.clear(s.node);
 		}
 	};
 }
-//#endregion
-export { i as bindSkins, r as dataRestPath };
 
+//#endregion
+export { bindSkins, dataRestPath, remapSkin };
 //# sourceMappingURL=skinBinding.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"skinBinding.js","names":["dataRestPath","path","node","pathInWorld","bindSkins","skinned","joints","id","skin","skins","scene","rest","restPath","joint","installed","s","skinPath","motions","descriptor","boundsOfPath","pose","data"],"sources":["../../../src/animation/rig/skinBinding.ts"],"sourcesContent":["import { boundsOfPath, pathInWorld, type GlMat3, type Path, type PathInWorldPose } from '@weasel-js/geom';\nimport type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId, PoseOverride, PoseOverrides } from '../../core/scene/types';\nimport { skinPath, type Skin } from '@weasel-js/animator';\n\n/** The part of a scene a rig's skins read and write. */\nexport interface SkinScene<TPose> {\n  get(id: NodeId): { pose: TPose; data?: unknown } | undefined;\n  readonly overrides: PoseOverrides<TPose>;\n  setPose(id: NodeId, pose: TPose): void;\n  update(id: NodeId, patch: { data: never }): void;\n}\n\n/** Where a node's path is drawn, for a skin to bend: `null` for a node with none. */\nexport type RestPath<TPose> = (node: { pose: TPose; data?: unknown }) => Path | null;\n\n/** The path in a node's `data.path`, carried through its pose as `kit:path` paints it. */\nexport function dataRestPath<TPose>(node: { pose: TPose; data?: unknown }): Path | null {\n  const path = (node.data as { path?: Path } | null | undefined)?.path;\n  return path ? pathInWorld(path, node.pose as PathInWorldPose) : null;\n}\n\ninterface Skinned<TPose> {\n  node: NodeId;\n  skin: Skin;\n  rest: Path;\n  restPose: TPose;\n  entry: PoseOverride<TPose>;\n}\n\n/** A rig's skinned nodes, as `bindSkins` returns them. */\nexport interface SkinBinding {\n  /** Every joint a skin weighs. */\n  readonly joints: readonly string[];\n  /** Bend each skinned path by `motions`, which holds every one of `joints`, into its node's\n   *  pose override. The caller commits the overrides. */\n  show(motions: ReadonlyMap<string, GlMat3>): void;\n  /** Write each bent path and its bounds into the document. */\n  write(): void;\n  release(): void;\n}\n\n/** Read each skinned node's rest path and ready an override for it. */\nexport function bindSkins<TPose>(\n  scene: SkinScene<TPose>,\n  skins: Readonly<Record<NodeId, Skin>>,\n  restPath: RestPath<TPose>,\n  descriptor: PoseDescriptor<TPose>,\n): SkinBinding {\n  const skinned: Skinned<TPose>[] = [];\n  const joints = new Set<string>();\n  for (const [id, skin] of Object.entries(skins) as [NodeId, Skin][]) {\n    const node = scene.get(id);\n    if (!node) throw new Error(`bindRig: a skin names node \"${id}\", which the scene lacks.`);\n    const rest = restPath(node);\n    if (!rest) throw new Error(`bindRig: node \"${id}\" has no path to skin.`);\n    for (const joint in skin) joints.add(joint);\n    skinned.push({ node: id, skin, rest, restPose: node.pose, entry: {} });\n  }\n  let installed = false;\n  return {\n    joints: [...joints],\n    show(motions) {\n      for (const s of skinned) {\n        const path = skinPath(s.rest, s.skin, motions);\n        s.entry.path = path;\n        s.entry.pose = descriptor.fromBounds(boundsOfPath(path), s.restPose);\n        if (!installed) scene.overrides.set(s.node, s.entry);\n      }\n      installed = true;\n    },\n    write() {\n      for (const s of skinned) {\n        const { path, pose } = s.entry;\n        if (path === undefined || pose === undefined) continue;\n        const data = scene.get(s.node)?.data;\n        scene.update(s.node, { data: { ...(data as object), path } as never });\n        scene.setPose(s.node, pose);\n      }\n    },\n    release() {\n      if (!installed) return;\n      installed = false;\n      for (const s of skinned) scene.overrides.clear(s.node);\n    },\n  };\n}\n"],"mappings":";;;AAiBA,SAAgBA,EAAoB,GAAoD;CACtF,IAAMC,IAAQC,EAAK,MAA6C;CAChE,OAAOD,IAAOE,EAAYF,GAAMC,EAAK,IAAuB,IAAI;AAClE;AAuBA,SAAgBE,EACd,GACA,GACA,GACA,GACa;CACb,IAAMC,IAA4B,CAAC,GAC7BC,oBAAS,IAAI,IAAY;CAC/B,KAAK,IAAM,CAACC,GAAIC,MAAS,OAAO,QAAQC,CAAK,GAAuB;EAClE,IAAMP,IAAOQ,EAAM,IAAIH,CAAE;EACzB,IAAI,CAACL,GAAM,MAAU,MAAM,+BAA+BK,EAAG,0BAA0B;EACvF,IAAMI,IAAOC,EAASV,CAAI;EAC1B,IAAI,CAACS,GAAM,MAAU,MAAM,kBAAkBJ,EAAG,uBAAuB;EACvE,KAAK,IAAMM,KAASL,GAAM,EAAO,IAAIK,CAAK;EAC1C,EAAQ,KAAK;GAAE,MAAMN;GAAI;GAAM;GAAM,UAAUL,EAAK;GAAM,OAAO,CAAC;EAAE,CAAC;CACvE;CACA,IAAIY,IAAY;CAChB,OAAO;EACL,QAAQ,CAAC,GAAGR,CAAM;EAClB,KAAK,GAAS;GACZ,KAAK,IAAMS,KAAKV,GAAS;IACvB,IAAMJ,IAAOe,EAASD,EAAE,MAAMA,EAAE,MAAME,CAAO;IAG7C,AAFA,EAAE,MAAM,OAAOhB,GACf,EAAE,MAAM,OAAOiB,EAAW,WAAWC,EAAalB,CAAI,GAAGc,EAAE,QAAQ,GAC9DD,KAAWJ,EAAM,UAAU,IAAIK,EAAE,MAAMA,EAAE,KAAK;GACrD;GACA,IAAY;EACd;EACA,QAAQ;GACN,KAAK,IAAMA,KAAKV,GAAS;IACvB,IAAM,EAAE,SAAM,YAASU,EAAE;IACzB,IAAId,MAAS,KAAA,KAAamB,MAAS,KAAA,GAAW;IAC9C,IAAMC,IAAOX,EAAM,IAAIK,EAAE,IAAI,CAAC,EAAE;IAEhC,AADAL,EAAM,OAAOK,EAAE,MAAM,EAAE,MAAM;KAAE,GAAIM;KAAiB;IAAK,EAAW,CAAC,GACrEX,EAAM,QAAQK,EAAE,MAAMK,CAAI;GAC5B;EACF;EACA,UAAU;GACR,IAAKN,GACL;QAAY;IACZ,KAAK,IAAMC,KAAKV,GAAS,EAAM,UAAU,MAAMU,EAAE,IAAI;GADzC;EAEd;CACF;AACF"}
+{"version":3,"file":"skinBinding.js","names":[],"sources":["../../../src/animation/rig/skinBinding.ts"],"sourcesContent":["import {\n  boundsOfPath, pathInWorld, remapPointValues,\n  type GlMat3, type Path, type PathInWorldPose, type PointOrigin,\n} from '@weasel-js/geom';\nimport type { PoseDescriptor } from '../../core/geometry/poseDescriptor';\nimport type { NodeId, PoseOverride, PoseOverrides } from '../../core/scene/types';\nimport { skinPath, type Skin } from '@weasel-js/animator';\n\n/** The part of a scene a rig's skins read and write. */\nexport interface SkinScene<TPose> {\n  get(id: NodeId): { pose: TPose; data?: unknown } | undefined;\n  readonly overrides: PoseOverrides<TPose>;\n  setPose(id: NodeId, pose: TPose): void;\n  update(id: NodeId, patch: { data: never }): void;\n}\n\n/** Where a node's path is drawn, for a skin to bend: `null` for a node with none. */\nexport type RestPath<TPose> = (node: { pose: TPose; data?: unknown }) => Path | null;\n\n/** The path in a node's `data.path`, carried through its pose as `kit:path` paints it. */\nexport function dataRestPath<TPose>(node: { pose: TPose; data?: unknown }): Path | null {\n  const path = (node.data as { path?: Path } | null | undefined)?.path;\n  return path ? pathInWorld(path, node.pose as PathInWorldPose) : null;\n}\n\n/**\n * `skin` after an edit to the points of the path it weighs: `origins` says where each point\n * of the new path came from, as `editAnchorSetTracked` answers. A point the edit made takes\n * weights between those of the points it lies between, and a joint left weighing nothing is\n * dropped.\n */\nexport function remapSkin(skin: Skin, origins: readonly (PointOrigin | null)[]): Skin {\n  const next: Record<string, number[]> = {};\n  for (const joint in skin) {\n    const weights = remapPointValues(skin[joint], origins);\n    if (weights.some((w) => w > 0)) next[joint] = weights;\n  }\n  return next;\n}\n\ninterface Skinned<TPose> {\n  node: NodeId;\n  skin: Skin;\n  rest: Path;\n  restPose: TPose;\n  entry: PoseOverride<TPose>;\n}\n\n/** A rig's skinned nodes, as `bindSkins` returns them. */\nexport interface SkinBinding {\n  /** Every joint a skin weighs. */\n  readonly joints: readonly string[];\n  /** Bend each skinned path by `motions`, which holds every one of `joints`, into its node's\n   *  pose override. The caller commits the overrides. */\n  show(motions: ReadonlyMap<string, GlMat3>): void;\n  /** Write each bent path and its bounds into the document. */\n  write(): void;\n  release(): void;\n}\n\n/** Read each skinned node's rest path and ready an override for it. */\nexport function bindSkins<TPose>(\n  scene: SkinScene<TPose>,\n  skins: Readonly<Record<NodeId, Skin>>,\n  restPath: RestPath<TPose>,\n  descriptor: PoseDescriptor<TPose>,\n): SkinBinding {\n  const skinned: Skinned<TPose>[] = [];\n  const joints = new Set<string>();\n  for (const [id, skin] of Object.entries(skins) as [NodeId, Skin][]) {\n    const node = scene.get(id);\n    if (!node) throw new Error(`bindRig: a skin names node \"${id}\", which the scene lacks.`);\n    const rest = restPath(node);\n    if (!rest) throw new Error(`bindRig: node \"${id}\" has no path to skin.`);\n    for (const joint in skin) joints.add(joint);\n    skinned.push({ node: id, skin, rest, restPose: node.pose, entry: {} });\n  }\n  let installed = false;\n  return {\n    joints: [...joints],\n    show(motions) {\n      for (const s of skinned) {\n        const path = skinPath(s.rest, s.skin, motions);\n        s.entry.path = path;\n        s.entry.pose = descriptor.fromBounds(boundsOfPath(path), s.restPose);\n        if (!installed) scene.overrides.set(s.node, s.entry);\n      }\n      installed = true;\n    },\n    write() {\n      for (const s of skinned) {\n        const { path, pose } = s.entry;\n        if (path === undefined || pose === undefined) continue;\n        const data = scene.get(s.node)?.data;\n        scene.update(s.node, { data: { ...(data as object), path } as never });\n        scene.setPose(s.node, pose);\n      }\n    },\n    release() {\n      if (!installed) return;\n      installed = false;\n      for (const s of skinned) scene.overrides.clear(s.node);\n    },\n  };\n}\n"],"mappings":";;;;;AAoBA,SAAgB,aAAoB,MAAoD;CACtF,MAAM,OAAQ,KAAK,MAA6C;CAChE,OAAO,OAAO,YAAY,MAAM,KAAK,IAAuB,IAAI;AAClE;;;;;;;AAQA,SAAgB,UAAU,MAAY,SAAgD;CACpF,MAAM,OAAiC,CAAC;CACxC,KAAK,MAAM,SAAS,MAAM;EACxB,MAAM,UAAU,iBAAiB,KAAK,QAAQ,OAAO;EACrD,IAAI,QAAQ,MAAM,MAAM,IAAI,CAAC,GAAG,KAAK,SAAS;CAChD;CACA,OAAO;AACT;;AAuBA,SAAgB,UACd,OACA,OACA,UACA,YACa;CACb,MAAM,UAA4B,CAAC;CACnC,MAAM,yBAAS,IAAI,IAAY;CAC/B,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO,QAAQ,KAAK,GAAuB;EAClE,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,IAAI,CAAC,MAAM,MAAM,IAAI,MAAM,+BAA+B,GAAG,0BAA0B;EACvF,MAAM,OAAO,SAAS,IAAI;EAC1B,IAAI,CAAC,MAAM,MAAM,IAAI,MAAM,kBAAkB,GAAG,uBAAuB;EACvE,KAAK,MAAM,SAAS,MAAM,OAAO,IAAI,KAAK;EAC1C,QAAQ,KAAK;GAAE,MAAM;GAAI;GAAM;GAAM,UAAU,KAAK;GAAM,OAAO,CAAC;EAAE,CAAC;CACvE;CACA,IAAI,YAAY;CAChB,OAAO;EACL,QAAQ,CAAC,GAAG,MAAM;EAClB,KAAK,SAAS;GACZ,KAAK,MAAM,KAAK,SAAS;IACvB,MAAM,OAAO,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO;IAC7C,EAAE,MAAM,OAAO;IACf,EAAE,MAAM,OAAO,WAAW,WAAW,aAAa,IAAI,GAAG,EAAE,QAAQ;IACnE,IAAI,CAAC,WAAW,MAAM,UAAU,IAAI,EAAE,MAAM,EAAE,KAAK;GACrD;GACA,YAAY;EACd;EACA,QAAQ;GACN,KAAK,MAAM,KAAK,SAAS;IACvB,MAAM,EAAE,MAAM,SAAS,EAAE;IACzB,IAAI,SAAS,UAAa,SAAS,QAAW;IAC9C,MAAM,OAAO,MAAM,IAAI,EAAE,IAAI,CAAC,EAAE;IAChC,MAAM,OAAO,EAAE,MAAM,EAAE,MAAM;KAAE,GAAI;KAAiB;IAAK,EAAW,CAAC;IACrE,MAAM,QAAQ,EAAE,MAAM,IAAI;GAC5B;EACF;EACA,UAAU;GACR,IAAI,CAAC,WAAW;GAChB,YAAY;GACZ,KAAK,MAAM,KAAK,SAAS,MAAM,UAAU,MAAM,EAAE,IAAI;EACvD;CACF;AACF"}

package/dist/animation/rig/useRig.js

@@ -1,38 +1,52 @@
-import { createRigSeat as e, seatBinding as t } from "./rigSeat.js";
-import { bindRigOn as n } from "./bindRig.js";
-import { useEffect as r, useMemo as i } from "react";
+import { createRigSeat, seatBinding } from "./rigSeat.js";
+import { bindRigOn } from "./bindRig.js";
+import { useEffect, useMemo } from "react";
+
 //#region src/animation/rig/useRig.ts
-function a(e) {
-	return o(e, null);
+/**
+* A {@link Rig} bound for the component's lifetime, its overrides dropped on
+* unmount. Rebinds — re-reading every node's rest pose — whenever an option's
+* identity changes, so hoist or memoize `skeleton`, `bindings`, and `skins`.
+*/
+function useRig(options) {
+	return useSeatedRig(options, null);
 }
-function o(a, o) {
-	let { scene: s, skeleton: c, bindings: l, skins: u, restPath: d, apply: f, descriptor: p } = a, m = i(() => {
-		let t = o ?? e(c), r = n({
-			scene: s,
-			skeleton: c,
-			bindings: l,
-			skins: u,
-			restPath: d,
-			apply: f,
-			descriptor: p
-		}, t);
-		return t.binding ??= r.binding, {
-			seat: t,
-			...r
+/** {@link useRig} on a seat that outlives a rebind; `null` makes a seat for each binding. */
+function useSeatedRig(options, kept) {
+	const { scene, skeleton, bindings, skins, restPath, apply, descriptor } = options;
+	const made = useMemo(() => {
+		const seat = kept ?? createRigSeat(skeleton);
+		const bound = bindRigOn({
+			scene,
+			skeleton,
+			bindings,
+			skins,
+			restPath,
+			apply,
+			descriptor
+		}, seat);
+		seat.binding ??= bound.binding;
+		return {
+			seat,
+			...bound
 		};
 	}, [
-		s,
-		c,
-		l,
-		u,
-		d,
-		f,
-		p,
-		o
+		scene,
+		skeleton,
+		bindings,
+		skins,
+		restPath,
+		apply,
+		descriptor,
+		kept
 	]);
-	return r(() => (t(m.seat, m.binding), () => m.binding.drop()), [m]), m.rig;
+	useEffect(() => {
+		seatBinding(made.seat, made.binding);
+		return () => made.binding.drop();
+	}, [made]);
+	return made.rig;
 }
-//#endregion
-export { a as useRig, o as useSeatedRig };
 
+//#endregion
+export { useRig, useSeatedRig };
 //# sourceMappingURL=useRig.js.map