@weasel-js/core 1.10.1 → 1.11.0

package/dist/tools/builtin/bone/boneActions.js

@@ -1,130 +1,156 @@
-import { createSetDataOp as e } from "../../../core/ops/setData.js";
-import { defaultCommitAdapter as t } from "../../../interactions/actions/defaultCommitAdapter.js";
-import { unplaceSkeleton as n } from "../../../animation/rig/rigNode.js";
-import { sceneReach as r } from "./placedRig.js";
-import { ActionDisabledReason as i } from "@weasel-js/routing";
-import { addJoint as a, dropSkinJoints as o, jointAt as s, jointPositions as c, moveJoint as l, removeJoint as u } from "@weasel-js/animator";
+import { createSetDataOp } from "../../../core/ops/setData.js";
+import { defaultCommitAdapter } from "../../../interactions/actions/defaultCommitAdapter.js";
+import { unplaceSkeleton } from "../../../animation/rig/rigNode.js";
+import { sceneReach } from "./placedRig.js";
+import { ActionDisabledReason } from "@weasel-js/routing";
+import { addJoint, dropSkinJoints, jointAt, jointPositions, moveJoint, removeJoint } from "@weasel-js/animator";
+
 //#region src/tools/builtin/bone/boneActions.ts
-var d = { capability: "edits-page" }, f = (e, t) => r(t, e.reachPx()), p = (e, t) => {
-	let n = e.state.active();
-	return n !== null && t.joints.some((e) => e.name === n) ? n : null;
+var eligible = { capability: "edits-page" };
+var reachOf = (env, deps) => sceneReach(deps, env.reachPx());
+var activeIn = (env, skeleton) => {
+	const name = env.state.active();
+	return name !== null && skeleton.joints.some((j) => j.name === name) ? name : null;
 };
-function m(r, i, a, s, c, l = []) {
-	let u = r.get(a);
-	if (!u) return;
-	let d = [e({
-		id: a,
-		from: u.data,
+/** Write `next`, a skeleton in the scene's space, into the rig node, and take `removed`
+*  joints out of the skins under it, as one undo entry. */
+function commitSkeleton(scene, deps, id, next, label, removed = []) {
+	const node = scene.get(id);
+	if (!node) return;
+	const ops = [createSetDataOp({
+		id,
+		from: node.data,
 		to: {
-			...u.data,
-			skeleton: n(s, u.pose)
+			...node.data,
+			skeleton: unplaceSkeleton(next, node.pose)
 		},
-		label: c
-	})], f = (t) => {
-		for (let n of r.childrenOf(t)) {
-			let t = r.get(n)?.data, i = t?.skin && o(t.skin, l);
-			i && i !== t.skin && d.push(e({
-				id: n,
-				from: t,
+		label
+	})];
+	const strip = (parent) => {
+		for (const child of scene.childrenOf(parent)) {
+			const data = scene.get(child)?.data;
+			const kept = data?.skin && dropSkinJoints(data.skin, removed);
+			if (kept && kept !== data.skin) ops.push(createSetDataOp({
+				id: child,
+				from: data,
 				to: {
-					...t,
-					skin: i
+					...data,
+					skin: kept
 				},
-				label: c
-			})), f(n);
+				label
+			}));
+			strip(child);
 		}
 	};
-	l.length > 0 && f(a), i.applyOps ? i.applyOps(d, c) : r.applyBatch(d, c, t(r, i.selection?.adapterMethods));
+	if (removed.length > 0) strip(id);
+	if (deps.applyOps) deps.applyOps(ops, label);
+	else scene.applyBatch(ops, label, defaultCommitAdapter(scene, deps.selection?.adapterMethods));
 }
-function h(e, t) {
+function dragAction(env, editing) {
 	return {
 		id: "bone.drag",
 		label: "Bone — move a joint or draw a bone",
-		eligible: d,
+		eligible,
 		requires: [
 			"view",
 			"selection",
 			"applyOps"
 		],
-		enabled: t,
+		enabled: editing,
 		invoker: {
 			timing: "ongoing",
-			start: ({ deps: t, drag: n, world: r }) => {
-				let i = e.placed();
-				if (!i) return {};
-				let o = n?.start ?? r, u = e.state.active(), d = s(i.skeleton, o.x, o.y, f(e, t)), h = i.skeleton, g = d;
-				if (g === null) {
-					let t = p(e, h);
-					t === null && ({skeleton: h, name: t} = a(h, null, o.x, o.y)), {skeleton: h, name: g} = a(h, t, o.x, o.y);
+			start: ({ deps, drag, world }) => {
+				const at = env.placed();
+				if (!at) return {};
+				const press = drag?.start ?? world;
+				const before = env.state.active();
+				const hit = jointAt(at.skeleton, press.x, press.y, reachOf(env, deps));
+				let origin = at.skeleton;
+				let name = hit;
+				if (name === null) {
+					let parent = activeIn(env, origin);
+					if (parent === null) ({skeleton: origin, name: parent} = addJoint(origin, null, press.x, press.y));
+					({skeleton: origin, name} = addJoint(origin, parent, press.x, press.y));
 				}
-				let _ = g, v = c(h).get(_);
-				return e.state.setActive(_), e.show(h), {
-					onMove: (t) => {
-						e.show(l(h, _, v.x + t.world.x - o.x, v.y + t.world.y - o.y));
+				const joint = name;
+				const from = jointPositions(origin).get(joint);
+				env.state.setActive(joint);
+				env.show(origin);
+				return {
+					onMove: (move) => {
+						env.show(moveJoint(origin, joint, from.x + move.world.x - press.x, from.y + move.world.y - press.y));
 					},
-					onEnd: (n, r) => {
-						let a = e.shown();
-						if (e.show(null), r === "cancel" || !a) {
-							e.state.setActive(u);
+					onEnd: (_end, reason) => {
+						const next = env.shown();
+						env.show(null);
+						if (reason === "cancel" || !next) {
+							env.state.setActive(before);
 							return;
 						}
-						m(e.scene(), t, i.id, a, d === null ? "Add bone" : "Move joint");
+						commitSkeleton(env.scene(), deps, at.id, next, hit === null ? "Add bone" : "Move joint");
 					}
 				};
 			}
 		}
 	};
 }
-function g(e) {
-	let t = () => e.placed() ? !0 : i.NotApplicable, n = () => {
-		let t = e.placed();
-		return t && p(e, t.skeleton) !== null ? !0 : i.NotApplicable;
+/** The bone tool's actions: `bone.drag`, `bone.pick`, `bone.remove`, and `bone.clear`. */
+function createBoneActions(env) {
+	const editing = () => env.placed() ? true : ActionDisabledReason.NotApplicable;
+	const hasActive = () => {
+		const at = env.placed();
+		return at && activeIn(env, at.skeleton) !== null ? true : ActionDisabledReason.NotApplicable;
 	};
 	return [
-		h(e, t),
+		dragAction(env, editing),
 		{
 			id: "bone.pick",
 			label: "Bone — pick the active joint",
-			eligible: d,
+			eligible,
 			requires: ["view"],
-			enabled: t,
+			enabled: editing,
 			invoker: {
 				timing: "immediate",
-				run: (t, n) => {
-					let r = n, i = e.placed();
-					i && r?.pressX !== void 0 && r.pressY !== void 0 && e.state.setActive(s(i.skeleton, r.pressX, r.pressY, f(e, t)));
+				run: (deps, params) => {
+					const p = params;
+					const at = env.placed();
+					if (!at || p?.pressX === void 0 || p.pressY === void 0) return;
+					env.state.setActive(jointAt(at.skeleton, p.pressX, p.pressY, reachOf(env, deps)));
 				}
 			}
 		},
 		{
 			id: "bone.remove",
 			label: "Bone — remove the active joint",
-			eligible: d,
+			eligible,
 			requires: ["selection", "applyOps"],
-			enabled: n,
+			enabled: hasActive,
 			invoker: {
 				timing: "immediate",
-				run: (t) => {
-					let n = e.placed(), r = n && p(e, n.skeleton);
-					if (!n || r == null) return;
-					let i = n.skeleton.joints.find((e) => e.name === r).parent, { skeleton: a, removed: o } = u(n.skeleton, r);
-					m(e.scene(), t, n.id, a, "Remove joint", o), e.state.setActive(i);
+				run: (deps) => {
+					const at = env.placed();
+					const name = at && activeIn(env, at.skeleton);
+					if (!at || name == null) return;
+					const parent = at.skeleton.joints.find((j) => j.name === name).parent;
+					const { skeleton, removed } = removeJoint(at.skeleton, name);
+					commitSkeleton(env.scene(), deps, at.id, skeleton, "Remove joint", removed);
+					env.state.setActive(parent);
 				}
 			}
 		},
 		{
 			id: "bone.clear",
 			label: "Bone — clear the active joint",
-			eligible: d,
-			enabled: n,
+			eligible,
+			enabled: hasActive,
 			invoker: {
 				timing: "immediate",
-				run: () => e.state.setActive(null)
+				run: () => env.state.setActive(null)
 			}
 		}
 	];
 }
-//#endregion
-export { g as createBoneActions };
 
+//#endregion
+export { createBoneActions };
 //# sourceMappingURL=boneActions.js.map

package/dist/tools/builtin/bone/boneActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"boneActions.js","names":["eligible","reachOf","sceneReach","deps","env","activeIn","name","skeleton","j","commitSkeleton","node","scene","id","ops","createSetDataOp","unplaceSkeleton","next","strip","child","parent","data","kept","dropSkinJoints","removed","label","defaultCommitAdapter","dragAction","editing","at","press","drag","world","before","hit","jointAt","origin","addJoint","joint","from","jointPositions","moveJoint","move","reason","createBoneActions","ActionDisabledReason","hasActive","p","params","removeJoint"],"sources":["../../../../src/tools/builtin/bone/boneActions.ts"],"sourcesContent":["import type { Action, ActionDeps, InvocationCtx } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { Op } from '@weasel-js/history';\nimport { createSetDataOp } from 'core/ops/setData';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { defaultCommitAdapter } from 'interactions/actions/defaultCommitAdapter';\nimport { unplaceSkeleton, type RigNodeData } from '../../../animation/rig/rigNode';\nimport { addJoint, dropSkinJoints, jointAt, jointPositions, moveJoint, removeJoint } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\nimport { sceneReach, type PlacedRig } from './placedRig';\nimport type { RigEditState } from './rigEditState';\n\n/** What the bone tool's actions read and write, all of it the tool's own. */\nexport interface BoneEnv {\n  scene(): Scene<unknown, string, unknown>;\n  /** The rig node and its skeleton in the scene's space, or `null` with nothing to edit. */\n  placed(): PlacedRig | null;\n  state: RigEditState;\n  /** Screen px around a joint within which a press takes it. */\n  reachPx(): number;\n  /** Show `skeleton` in place of the document's while a drag shapes it; `null` ends that. */\n  show(skeleton: Skeleton | null): void;\n  shown(): Skeleton | null;\n}\n\nconst eligible = { capability: 'edits-page' } as const;\n\nconst reachOf = (env: BoneEnv, deps: ActionDeps): number => sceneReach(deps, env.reachPx());\n\nconst activeIn = (env: BoneEnv, skeleton: Skeleton): string | null => {\n  const name = env.state.active();\n  return name !== null && skeleton.joints.some((j) => j.name === name) ? name : null;\n};\n\n/** Write `next`, a skeleton in the scene's space, into the rig node, and take `removed`\n *  joints out of the skins under it, as one undo entry. */\nfunction commitSkeleton(\n  scene: Scene<unknown, string, unknown>,\n  deps: ActionDeps,\n  id: NodeId,\n  next: Skeleton,\n  label: string,\n  removed: readonly string[] = [],\n): void {\n  const node = scene.get(id);\n  if (!node) return;\n  const ops: Op[] = [createSetDataOp({\n    id, from: node.data, to: { ...(node.data as object), skeleton: unplaceSkeleton(next, node.pose) }, label,\n  })];\n  const strip = (parent: NodeId): void => {\n    for (const child of scene.childrenOf(parent)) {\n      const data = scene.get(child)?.data as RigNodeData | null | undefined;\n      const kept = data?.skin && dropSkinJoints(data.skin, removed);\n      if (kept && kept !== data.skin) ops.push(createSetDataOp({ id: child, from: data, to: { ...data, skin: kept }, label }));\n      strip(child);\n    }\n  };\n  if (removed.length > 0) strip(id);\n  if (deps.applyOps) deps.applyOps(ops, label);\n  else scene.applyBatch(ops, label, defaultCommitAdapter(scene, deps.selection?.adapterMethods));\n}\n\nfunction dragAction(env: BoneEnv, editing: () => true | ActionDisabledReason): Action {\n  return {\n    id: 'bone.drag',\n    label: 'Bone — move a joint or draw a bone',\n    eligible,\n    requires: ['view', 'selection', 'applyOps'],\n    enabled: editing,\n    invoker: {\n      timing: 'ongoing',\n      start: ({ deps, drag, world }: InvocationCtx) => {\n        const at = env.placed();\n        if (!at) return {};\n        const press = drag?.start ?? world;\n        const before = env.state.active();\n        const hit = jointAt(at.skeleton, press.x, press.y, reachOf(env, deps));\n        let origin = at.skeleton;\n        let name = hit;\n        if (name === null) {\n          let parent = activeIn(env, origin);\n          if (parent === null) ({ skeleton: origin, name: parent } = addJoint(origin, null, press.x, press.y));\n          ({ skeleton: origin, name } = addJoint(origin, parent, press.x, press.y));\n        }\n        const joint = name;\n        const from = jointPositions(origin).get(joint)!;\n        env.state.setActive(joint);\n        env.show(origin);\n        return {\n          onMove: (move: InvocationCtx) => {\n            env.show(moveJoint(origin, joint, from.x + move.world.x - press.x, from.y + move.world.y - press.y));\n          },\n          // The dispatcher hands `onEnd` a context with empty deps.\n          onEnd: (_end: InvocationCtx, reason: 'commit' | 'cancel') => {\n            const next = env.shown();\n            env.show(null);\n            if (reason === 'cancel' || !next) {\n              env.state.setActive(before);\n              return;\n            }\n            commitSkeleton(env.scene(), deps, at.id, next, hit === null ? 'Add bone' : 'Move joint');\n          },\n        };\n      },\n    },\n  };\n}\n\n/** The bone tool's actions: `bone.drag`, `bone.pick`, `bone.remove`, and `bone.clear`. */\nexport function createBoneActions(env: BoneEnv): Action[] {\n  const editing = () => (env.placed() ? true : ActionDisabledReason.NotApplicable);\n  const hasActive = () => {\n    const at = env.placed();\n    return at && activeIn(env, at.skeleton) !== null ? true : ActionDisabledReason.NotApplicable;\n  };\n  return [\n    dragAction(env, editing),\n    {\n      id: 'bone.pick',\n      label: 'Bone — pick the active joint',\n      eligible,\n      requires: ['view'],\n      enabled: editing,\n      invoker: {\n        timing: 'immediate',\n        run: (deps, params) => {\n          const p = params as { pressX?: number; pressY?: number } | undefined;\n          const at = env.placed();\n          if (!at || p?.pressX === undefined || p.pressY === undefined) return;\n          env.state.setActive(jointAt(at.skeleton, p.pressX, p.pressY, reachOf(env, deps)));\n        },\n      },\n    },\n    {\n      id: 'bone.remove',\n      label: 'Bone — remove the active joint',\n      eligible,\n      requires: ['selection', 'applyOps'],\n      // Declining with no joint active leaves Delete to the ambient `delete`.\n      enabled: hasActive,\n      invoker: {\n        timing: 'immediate',\n        run: (deps) => {\n          const at = env.placed();\n          const name = at && activeIn(env, at.skeleton);\n          if (!at || name == null) return;\n          const parent = at.skeleton.joints.find((j) => j.name === name)!.parent;\n          const { skeleton, removed } = removeJoint(at.skeleton, name);\n          commitSkeleton(env.scene(), deps, at.id, skeleton, 'Remove joint', removed);\n          env.state.setActive(parent);\n        },\n      },\n    },\n    {\n      id: 'bone.clear',\n      label: 'Bone — clear the active joint',\n      eligible,\n      enabled: hasActive,\n      invoker: { timing: 'immediate', run: () => env.state.setActive(null) },\n    },\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"boneActions.js","names":[],"sources":["../../../../src/tools/builtin/bone/boneActions.ts"],"sourcesContent":["import type { Action, ActionDeps, InvocationCtx } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { Op } from '@weasel-js/history';\nimport { createSetDataOp } from 'core/ops/setData';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { defaultCommitAdapter } from 'interactions/actions/defaultCommitAdapter';\nimport { unplaceSkeleton, type RigNodeData } from '../../../animation/rig/rigNode';\nimport { addJoint, dropSkinJoints, jointAt, jointPositions, moveJoint, removeJoint } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\nimport { sceneReach, type PlacedRig } from './placedRig';\nimport type { RigEditState } from './rigEditState';\n\n/** What the bone tool's actions read and write, all of it the tool's own. */\nexport interface BoneEnv {\n  scene(): Scene<unknown, string, unknown>;\n  /** The rig node and its skeleton in the scene's space, or `null` with nothing to edit. */\n  placed(): PlacedRig | null;\n  state: RigEditState;\n  /** Screen px around a joint within which a press takes it. */\n  reachPx(): number;\n  /** Show `skeleton` in place of the document's while a drag shapes it; `null` ends that. */\n  show(skeleton: Skeleton | null): void;\n  shown(): Skeleton | null;\n}\n\nconst eligible = { capability: 'edits-page' } as const;\n\nconst reachOf = (env: BoneEnv, deps: ActionDeps): number => sceneReach(deps, env.reachPx());\n\nconst activeIn = (env: BoneEnv, skeleton: Skeleton): string | null => {\n  const name = env.state.active();\n  return name !== null && skeleton.joints.some((j) => j.name === name) ? name : null;\n};\n\n/** Write `next`, a skeleton in the scene's space, into the rig node, and take `removed`\n *  joints out of the skins under it, as one undo entry. */\nfunction commitSkeleton(\n  scene: Scene<unknown, string, unknown>,\n  deps: ActionDeps,\n  id: NodeId,\n  next: Skeleton,\n  label: string,\n  removed: readonly string[] = [],\n): void {\n  const node = scene.get(id);\n  if (!node) return;\n  const ops: Op[] = [createSetDataOp({\n    id, from: node.data, to: { ...(node.data as object), skeleton: unplaceSkeleton(next, node.pose) }, label,\n  })];\n  const strip = (parent: NodeId): void => {\n    for (const child of scene.childrenOf(parent)) {\n      const data = scene.get(child)?.data as RigNodeData | null | undefined;\n      const kept = data?.skin && dropSkinJoints(data.skin, removed);\n      if (kept && kept !== data.skin) ops.push(createSetDataOp({ id: child, from: data, to: { ...data, skin: kept }, label }));\n      strip(child);\n    }\n  };\n  if (removed.length > 0) strip(id);\n  if (deps.applyOps) deps.applyOps(ops, label);\n  else scene.applyBatch(ops, label, defaultCommitAdapter(scene, deps.selection?.adapterMethods));\n}\n\nfunction dragAction(env: BoneEnv, editing: () => true | ActionDisabledReason): Action {\n  return {\n    id: 'bone.drag',\n    label: 'Bone — move a joint or draw a bone',\n    eligible,\n    requires: ['view', 'selection', 'applyOps'],\n    enabled: editing,\n    invoker: {\n      timing: 'ongoing',\n      start: ({ deps, drag, world }: InvocationCtx) => {\n        const at = env.placed();\n        if (!at) return {};\n        const press = drag?.start ?? world;\n        const before = env.state.active();\n        const hit = jointAt(at.skeleton, press.x, press.y, reachOf(env, deps));\n        let origin = at.skeleton;\n        let name = hit;\n        if (name === null) {\n          let parent = activeIn(env, origin);\n          if (parent === null) ({ skeleton: origin, name: parent } = addJoint(origin, null, press.x, press.y));\n          ({ skeleton: origin, name } = addJoint(origin, parent, press.x, press.y));\n        }\n        const joint = name;\n        const from = jointPositions(origin).get(joint)!;\n        env.state.setActive(joint);\n        env.show(origin);\n        return {\n          onMove: (move: InvocationCtx) => {\n            env.show(moveJoint(origin, joint, from.x + move.world.x - press.x, from.y + move.world.y - press.y));\n          },\n          // The dispatcher hands `onEnd` a context with empty deps.\n          onEnd: (_end: InvocationCtx, reason: 'commit' | 'cancel') => {\n            const next = env.shown();\n            env.show(null);\n            if (reason === 'cancel' || !next) {\n              env.state.setActive(before);\n              return;\n            }\n            commitSkeleton(env.scene(), deps, at.id, next, hit === null ? 'Add bone' : 'Move joint');\n          },\n        };\n      },\n    },\n  };\n}\n\n/** The bone tool's actions: `bone.drag`, `bone.pick`, `bone.remove`, and `bone.clear`. */\nexport function createBoneActions(env: BoneEnv): Action[] {\n  const editing = () => (env.placed() ? true : ActionDisabledReason.NotApplicable);\n  const hasActive = () => {\n    const at = env.placed();\n    return at && activeIn(env, at.skeleton) !== null ? true : ActionDisabledReason.NotApplicable;\n  };\n  return [\n    dragAction(env, editing),\n    {\n      id: 'bone.pick',\n      label: 'Bone — pick the active joint',\n      eligible,\n      requires: ['view'],\n      enabled: editing,\n      invoker: {\n        timing: 'immediate',\n        run: (deps, params) => {\n          const p = params as { pressX?: number; pressY?: number } | undefined;\n          const at = env.placed();\n          if (!at || p?.pressX === undefined || p.pressY === undefined) return;\n          env.state.setActive(jointAt(at.skeleton, p.pressX, p.pressY, reachOf(env, deps)));\n        },\n      },\n    },\n    {\n      id: 'bone.remove',\n      label: 'Bone — remove the active joint',\n      eligible,\n      requires: ['selection', 'applyOps'],\n      // Declining with no joint active leaves Delete to the ambient `delete`.\n      enabled: hasActive,\n      invoker: {\n        timing: 'immediate',\n        run: (deps) => {\n          const at = env.placed();\n          const name = at && activeIn(env, at.skeleton);\n          if (!at || name == null) return;\n          const parent = at.skeleton.joints.find((j) => j.name === name)!.parent;\n          const { skeleton, removed } = removeJoint(at.skeleton, name);\n          commitSkeleton(env.scene(), deps, at.id, skeleton, 'Remove joint', removed);\n          env.state.setActive(parent);\n        },\n      },\n    },\n    {\n      id: 'bone.clear',\n      label: 'Bone — clear the active joint',\n      eligible,\n      enabled: hasActive,\n      invoker: { timing: 'immediate', run: () => env.state.setActive(null) },\n    },\n  ];\n}\n"],"mappings":"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"}

package/dist/tools/builtin/bone/boneOverlay.js

@@ -1,58 +1,71 @@
-import { viewToTransform as e } from "../../../core/viewport/view.js";
-import { worldToScreen as t } from "../../../core/viewport/viewTransform.js";
-import { ellipsePath as n, linePath as r } from "@weasel-js/geom";
-import { jointPositions as i } from "@weasel-js/animator";
+import { viewToTransform } from "../../../core/viewport/view.js";
+import { worldToScreen } from "../../../core/viewport/viewTransform.js";
+import { ellipsePath, linePath } from "@weasel-js/geom";
+import { jointPositions } from "@weasel-js/animator";
+
 //#region src/tools/builtin/bone/boneOverlay.ts
-var a = "#4f9cf7", o = "#ffffff", s = 4.5, c = (e, t, r) => n({
-	x: e - r,
-	y: t - r,
+var BONE = "#4f9cf7";
+var JOINT_FILL = "#ffffff";
+var JOINT_RADIUS_PX = 4.5;
+var dot = (x, y, r) => ellipsePath({
+	x: x - r,
+	y: y - r,
 	width: 2 * r,
 	height: 2 * r
 });
-function l(n) {
+/**
+* A screen-space layer drawing a skeleton as bones and joints at a constant size: a line from
+* each joint to its parent, a ring on each joint, and the active joint filled.
+*/
+function createBoneOverlay(source) {
 	return {
-		id: n.id,
+		id: source.id,
 		label: "Bones",
 		space: "screen",
-		subscribe: n.subscribe,
-		draw: (l, u) => {
-			let d = n.skeleton();
-			if (!d || d.joints.length === 0) return [];
-			let f = e(u), p = /* @__PURE__ */ new Map();
-			for (let [e, n] of i(d)) {
-				let [r, i] = t(n.x, n.y, f);
-				p.set(e, {
-					x: r,
-					y: i
+		subscribe: source.subscribe,
+		draw: (_data, view) => {
+			const skeleton = source.skeleton();
+			if (!skeleton || skeleton.joints.length === 0) return [];
+			const t = viewToTransform(view);
+			const at = /* @__PURE__ */ new Map();
+			for (const [name, p] of jointPositions(skeleton)) {
+				const [x, y] = worldToScreen(p.x, p.y, t);
+				at.set(name, {
+					x,
+					y
 				});
 			}
-			let m = [];
-			for (let e of d.joints) e.parent != null && m.push({
-				kind: "path",
-				path: r(p.get(e.parent), p.get(e.name)),
-				stroke: {
-					paint: { color: a },
-					width: 2
-				}
-			});
-			let h = n.active();
-			for (let [e, t] of p) m.push({
+			const out = [];
+			for (const joint of skeleton.joints) {
+				if (joint.parent == null) continue;
+				out.push({
+					kind: "path",
+					path: linePath(at.get(joint.parent), at.get(joint.name)),
+					stroke: {
+						paint: { color: BONE },
+						width: 2
+					}
+				});
+			}
+			const active = source.active();
+			const r = source.jointRadiusPx?.() ?? JOINT_RADIUS_PX;
+			for (const [name, p] of at) out.push({
 				kind: "path",
-				path: c(t.x, t.y, s),
+				path: dot(p.x, p.y, r),
 				fill: { paint: {
 					kind: "solid",
-					color: e === h ? a : o
+					color: name === active ? BONE : JOINT_FILL
 				} },
 				stroke: {
-					paint: { color: a },
+					paint: { color: BONE },
 					width: 1.5
 				}
 			});
-			return m;
+			return out;
 		}
 	};
 }
-//#endregion
-export { l as createBoneOverlay };
 
+//#endregion
+export { JOINT_RADIUS_PX, createBoneOverlay };
 //# sourceMappingURL=boneOverlay.js.map

package/dist/tools/builtin/bone/boneOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"boneOverlay.js","names":["BONE","JOINT_FILL","JOINT_RADIUS_PX","dot","ellipsePath","x","y","createBoneOverlay","source","skeleton","t","viewToTransform","view","at","name","p","jointPositions","worldToScreen","out","joint","linePath","active"],"sources":["../../../../src/tools/builtin/bone/boneOverlay.ts"],"sourcesContent":["import { ellipsePath, linePath } from '@weasel-js/geom';\nimport type { DrawCommand } from '@weasel-js/renderer';\nimport type { RenderLayer } from 'core/layers/render';\nimport { viewToTransform } from 'core/viewport/view';\nimport { worldToScreen } from 'core/viewport/viewTransform';\nimport { jointPositions } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\n\nconst BONE = '#4f9cf7';\nconst JOINT_FILL = '#ffffff';\nconst JOINT_RADIUS_PX = 4.5;\n\nconst dot = (x: number, y: number, r: number) => ellipsePath({ x: x - r, y: y - r, width: 2 * r, height: 2 * r });\n\n/**\n * A screen-space layer drawing a skeleton as bones and joints at a constant size: a line from\n * each joint to its parent, a ring on each joint, and the active joint filled.\n */\nexport function createBoneOverlay(source: {\n  id: string;\n  /** The skeleton to draw, in the scene's space, or `null` for none. */\n  skeleton(): Skeleton | null;\n  active(): string | null;\n  subscribe(fn: () => void): () => void;\n}): RenderLayer<unknown> {\n  return {\n    id: source.id,\n    label: 'Bones',\n    space: 'screen',\n    subscribe: source.subscribe,\n    draw: (_data, view) => {\n      const skeleton = source.skeleton();\n      if (!skeleton || skeleton.joints.length === 0) return [];\n      const t = viewToTransform(view);\n      const at = new Map<string, { x: number; y: number }>();\n      for (const [name, p] of jointPositions(skeleton)) {\n        const [x, y] = worldToScreen(p.x, p.y, t);\n        at.set(name, { x, y });\n      }\n      const out: DrawCommand[] = [];\n      for (const joint of skeleton.joints) {\n        if (joint.parent == null) continue;\n        out.push({\n          kind: 'path',\n          path: linePath(at.get(joint.parent)!, at.get(joint.name)!),\n          stroke: { paint: { color: BONE }, width: 2 },\n        });\n      }\n      const active = source.active();\n      for (const [name, p] of at) {\n        out.push({\n          kind: 'path',\n          path: dot(p.x, p.y, JOINT_RADIUS_PX),\n          fill: { paint: { kind: 'solid', color: name === active ? BONE : JOINT_FILL } },\n          stroke: { paint: { color: BONE }, width: 1.5 },\n        });\n      }\n      return out;\n    },\n  };\n}\n"],"mappings":";;;;;AAQA,IAAMA,IAAO,WACPC,IAAa,WACbC,IAAkB,KAElBC,KAAO,GAAW,GAAW,MAAcC,EAAY;CAAE,GAAGC,IAAI;CAAG,GAAGC,IAAI;CAAG,OAAO,IAAI;CAAG,QAAQ,IAAI;AAAE,CAAC;AAMhH,SAAgBC,EAAkB,GAMT;CACvB,OAAO;EACL,IAAIC,EAAO;EACX,OAAO;EACP,OAAO;EACP,WAAWA,EAAO;EAClB,OAAO,GAAO,MAAS;GACrB,IAAMC,IAAWD,EAAO,SAAS;GACjC,IAAI,CAACC,KAAYA,EAAS,OAAO,WAAW,GAAG,OAAO,CAAC;GACvD,IAAMC,IAAIC,EAAgBC,CAAI,GACxBC,oBAAK,IAAI,IAAsC;GACrD,KAAK,IAAM,CAACC,GAAMC,MAAMC,EAAeP,CAAQ,GAAG;IAChD,IAAM,CAACJ,GAAGC,KAAKW,EAAcF,EAAE,GAAGA,EAAE,GAAGL,CAAC;IACxC,EAAG,IAAII,GAAM;KAAE;KAAG;IAAE,CAAC;GACvB;GACA,IAAMI,IAAqB,CAAC;GAC5B,KAAK,IAAMC,KAASV,EAAS,QAC3B,AAAIU,EAAM,UAAU,QACpBD,EAAI,KAAK;IACP,MAAM;IACN,MAAME,EAASP,EAAG,IAAIM,EAAM,MAAM,GAAIN,EAAG,IAAIM,EAAM,IAAI,CAAE;IACzD,QAAQ;KAAE,OAAO,EAAE,OAAOnB,EAAK;KAAG,OAAO;IAAE;GAC7C,CAAC;GAEH,IAAMqB,IAASb,EAAO,OAAO;GAC7B,KAAK,IAAM,CAACM,GAAMC,MAAMF,GACtB,EAAI,KAAK;IACP,MAAM;IACN,MAAMV,EAAIY,EAAE,GAAGA,EAAE,GAAGb,CAAe;IACnC,MAAM,EAAE,OAAO;KAAE,MAAM;KAAS,OAAOY,MAASO,IAASrB,IAAOC;IAAW,EAAE;IAC7E,QAAQ;KAAE,OAAO,EAAE,OAAOD,EAAK;KAAG,OAAO;IAAI;GAC/C,CAAC;GAEH,OAAOkB;EACT;CACF;AACF"}
+{"version":3,"file":"boneOverlay.js","names":[],"sources":["../../../../src/tools/builtin/bone/boneOverlay.ts"],"sourcesContent":["import { ellipsePath, linePath } from '@weasel-js/geom';\nimport type { DrawCommand } from '@weasel-js/renderer';\nimport type { RenderLayer } from 'core/layers/render';\nimport { viewToTransform } from 'core/viewport/view';\nimport { worldToScreen } from 'core/viewport/viewTransform';\nimport { jointPositions } from '@weasel-js/animator';\nimport type { Skeleton } from '@weasel-js/animator';\n\nconst BONE = '#4f9cf7';\nconst JOINT_FILL = '#ffffff';\nexport const JOINT_RADIUS_PX = 4.5;\n\nconst dot = (x: number, y: number, r: number) => ellipsePath({ x: x - r, y: y - r, width: 2 * r, height: 2 * r });\n\n/**\n * A screen-space layer drawing a skeleton as bones and joints at a constant size: a line from\n * each joint to its parent, a ring on each joint, and the active joint filled.\n */\nexport function createBoneOverlay(source: {\n  id: string;\n  /** The skeleton to draw, in the scene's space, or `null` for none. */\n  skeleton(): Skeleton | null;\n  active(): string | null;\n  subscribe(fn: () => void): () => void;\n  /** Joint dot radius in screen px, read each frame. Default `JOINT_RADIUS_PX`. */\n  jointRadiusPx?: () => number | undefined;\n}): RenderLayer<unknown> {\n  return {\n    id: source.id,\n    label: 'Bones',\n    space: 'screen',\n    subscribe: source.subscribe,\n    draw: (_data, view) => {\n      const skeleton = source.skeleton();\n      if (!skeleton || skeleton.joints.length === 0) return [];\n      const t = viewToTransform(view);\n      const at = new Map<string, { x: number; y: number }>();\n      for (const [name, p] of jointPositions(skeleton)) {\n        const [x, y] = worldToScreen(p.x, p.y, t);\n        at.set(name, { x, y });\n      }\n      const out: DrawCommand[] = [];\n      for (const joint of skeleton.joints) {\n        if (joint.parent == null) continue;\n        out.push({\n          kind: 'path',\n          path: linePath(at.get(joint.parent)!, at.get(joint.name)!),\n          stroke: { paint: { color: BONE }, width: 2 },\n        });\n      }\n      const active = source.active();\n      const r = source.jointRadiusPx?.() ?? JOINT_RADIUS_PX;\n      for (const [name, p] of at) {\n        out.push({\n          kind: 'path',\n          path: dot(p.x, p.y, r),\n          fill: { paint: { kind: 'solid', color: name === active ? BONE : JOINT_FILL } },\n          stroke: { paint: { color: BONE }, width: 1.5 },\n        });\n      }\n      return out;\n    },\n  };\n}\n"],"mappings":";;;;;;AAQA,IAAM,OAAO;AACb,IAAM,aAAa;AACnB,IAAa,kBAAkB;AAE/B,IAAM,OAAO,GAAW,GAAW,MAAc,YAAY;CAAE,GAAG,IAAI;CAAG,GAAG,IAAI;CAAG,OAAO,IAAI;CAAG,QAAQ,IAAI;AAAE,CAAC;;;;;AAMhH,SAAgB,kBAAkB,QAQT;CACvB,OAAO;EACL,IAAI,OAAO;EACX,OAAO;EACP,OAAO;EACP,WAAW,OAAO;EAClB,OAAO,OAAO,SAAS;GACrB,MAAM,WAAW,OAAO,SAAS;GACjC,IAAI,CAAC,YAAY,SAAS,OAAO,WAAW,GAAG,OAAO,CAAC;GACvD,MAAM,IAAI,gBAAgB,IAAI;GAC9B,MAAM,qBAAK,IAAI,IAAsC;GACrD,KAAK,MAAM,CAAC,MAAM,MAAM,eAAe,QAAQ,GAAG;IAChD,MAAM,CAAC,GAAG,KAAK,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC;IACxC,GAAG,IAAI,MAAM;KAAE;KAAG;IAAE,CAAC;GACvB;GACA,MAAM,MAAqB,CAAC;GAC5B,KAAK,MAAM,SAAS,SAAS,QAAQ;IACnC,IAAI,MAAM,UAAU,MAAM;IAC1B,IAAI,KAAK;KACP,MAAM;KACN,MAAM,SAAS,GAAG,IAAI,MAAM,MAAM,GAAI,GAAG,IAAI,MAAM,IAAI,CAAE;KACzD,QAAQ;MAAE,OAAO,EAAE,OAAO,KAAK;MAAG,OAAO;KAAE;IAC7C,CAAC;GACH;GACA,MAAM,SAAS,OAAO,OAAO;GAC7B,MAAM,IAAI,OAAO,gBAAgB,KAAK;GACtC,KAAK,MAAM,CAAC,MAAM,MAAM,IACtB,IAAI,KAAK;IACP,MAAM;IACN,MAAM,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,OAAO;KAAE,MAAM;KAAS,OAAO,SAAS,SAAS,OAAO;IAAW,EAAE;IAC7E,QAAQ;KAAE,OAAO,EAAE,OAAO,KAAK;KAAG,OAAO;IAAI;GAC/C,CAAC;GAEH,OAAO;EACT;CACF;AACF"}

package/dist/tools/builtin/bone/placedRig.js

@@ -1,24 +1,28 @@
-import { placeSkeleton as e } from "../../../animation/rig/rigNode.js";
-import { pxExtent as t } from "@weasel-js/geom";
+import { placeSkeleton } from "../../../animation/rig/rigNode.js";
+import { pxExtent } from "@weasel-js/geom";
+
 //#region src/tools/builtin/bone/placedRig.ts
-var n = { joints: [] };
-function r(t, r) {
-	let i = r === null ? void 0 : t.get(r);
-	if (r === null || !i) return null;
-	let a = i.data?.skeleton ?? n;
+var EMPTY = { joints: [] };
+/** The rig at node `id`, an empty skeleton for a node that has none yet, or `null` when
+*  there is no such node. */
+function placedRig(scene, id) {
+	const node = id === null ? void 0 : scene.get(id);
+	if (id === null || !node) return null;
+	const local = node.data?.skeleton ?? EMPTY;
 	return {
-		id: r,
-		skeleton: e(a, i.pose)
+		id,
+		skeleton: placeSkeleton(local, node.pose)
 	};
 }
-function i(e, n) {
-	let r = t(n, e.view?.get().scale ?? {
+/** `px` screen pixels as a distance in the scene, at the view's current scale. */
+function sceneReach(deps, px) {
+	const e = pxExtent(px, deps.view?.get().scale ?? {
 		x: 1,
 		y: 1
 	});
-	return Math.max(r.x, r.y);
+	return Math.max(e.x, e.y);
 }
-//#endregion
-export { r as placedRig, i as sceneReach };
 
+//#endregion
+export { placedRig, sceneReach };
 //# sourceMappingURL=placedRig.js.map

package/dist/tools/builtin/bone/placedRig.js.map

@@ -1 +1 @@
-{"version":3,"file":"placedRig.js","names":["EMPTY","placedRig","node","id","scene","local","placeSkeleton","sceneReach","e","pxExtent","px","deps"],"sources":["../../../../src/tools/builtin/bone/placedRig.ts"],"sourcesContent":["import { pxExtent } from '@weasel-js/geom';\nimport type { ActionDeps } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport { placeSkeleton, type RigNodeData } from '../../../animation/rig/rigNode';\nimport type { Skeleton } from '@weasel-js/animator';\n\nconst EMPTY: Skeleton = { joints: [] };\n\n/** A rig node and its skeleton in the scene's space, as the rig tools edit and draw it. */\nexport interface PlacedRig {\n  id: NodeId;\n  skeleton: Skeleton;\n}\n\n/** The rig at node `id`, an empty skeleton for a node that has none yet, or `null` when\n *  there is no such node. */\nexport function placedRig(\n  scene: { get(id: NodeId): { pose: unknown; data?: unknown } | undefined },\n  id: NodeId | null,\n): PlacedRig | null {\n  const node = id === null ? undefined : scene.get(id);\n  if (id === null || !node) return null;\n  const local = (node.data as RigNodeData | null | undefined)?.skeleton ?? EMPTY;\n  return { id, skeleton: placeSkeleton(local, node.pose) };\n}\n\n/** `px` screen pixels as a distance in the scene, at the view's current scale. */\nexport function sceneReach(deps: ActionDeps, px: number): number {\n  const e = pxExtent(px, deps.view?.get().scale ?? { x: 1, y: 1 });\n  return Math.max(e.x, e.y);\n}\n"],"mappings":";;;AAMA,IAAMA,IAAkB,EAAE,QAAQ,CAAC,EAAE;AAUrC,SAAgBC,EACd,GACA,GACkB;CAClB,IAAMC,IAAOC,MAAO,OAAO,KAAA,IAAYC,EAAM,IAAID,CAAE;CACnD,IAAIA,MAAO,QAAQ,CAACD,GAAM,OAAO;CACjC,IAAMG,IAASH,EAAK,MAAyC,YAAYF;CACzE,OAAO;EAAE;EAAI,UAAUM,EAAcD,GAAOH,EAAK,IAAI;CAAE;AACzD;AAGA,SAAgBK,EAAW,GAAkB,GAAoB;CAC/D,IAAMC,IAAIC,EAASC,GAAIC,EAAK,MAAM,IAAI,CAAC,CAAC,SAAS;EAAE,GAAG;EAAG,GAAG;CAAE,CAAC;CAC/D,OAAO,KAAK,IAAIH,EAAE,GAAGA,EAAE,CAAC;AAC1B"}
+{"version":3,"file":"placedRig.js","names":[],"sources":["../../../../src/tools/builtin/bone/placedRig.ts"],"sourcesContent":["import { pxExtent } from '@weasel-js/geom';\nimport type { ActionDeps } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport { placeSkeleton, type RigNodeData } from '../../../animation/rig/rigNode';\nimport type { Skeleton } from '@weasel-js/animator';\n\nconst EMPTY: Skeleton = { joints: [] };\n\n/** A rig node and its skeleton in the scene's space, as the rig tools edit and draw it. */\nexport interface PlacedRig {\n  id: NodeId;\n  skeleton: Skeleton;\n}\n\n/** The rig at node `id`, an empty skeleton for a node that has none yet, or `null` when\n *  there is no such node. */\nexport function placedRig(\n  scene: { get(id: NodeId): { pose: unknown; data?: unknown } | undefined },\n  id: NodeId | null,\n): PlacedRig | null {\n  const node = id === null ? undefined : scene.get(id);\n  if (id === null || !node) return null;\n  const local = (node.data as RigNodeData | null | undefined)?.skeleton ?? EMPTY;\n  return { id, skeleton: placeSkeleton(local, node.pose) };\n}\n\n/** `px` screen pixels as a distance in the scene, at the view's current scale. */\nexport function sceneReach(deps: ActionDeps, px: number): number {\n  const e = pxExtent(px, deps.view?.get().scale ?? { x: 1, y: 1 });\n  return Math.max(e.x, e.y);\n}\n"],"mappings":";;;;AAMA,IAAM,QAAkB,EAAE,QAAQ,CAAC,EAAE;;;AAUrC,SAAgB,UACd,OACA,IACkB;CAClB,MAAM,OAAO,OAAO,OAAO,SAAY,MAAM,IAAI,EAAE;CACnD,IAAI,OAAO,QAAQ,CAAC,MAAM,OAAO;CACjC,MAAM,QAAS,KAAK,MAAyC,YAAY;CACzE,OAAO;EAAE;EAAI,UAAU,cAAc,OAAO,KAAK,IAAI;CAAE;AACzD;;AAGA,SAAgB,WAAW,MAAkB,IAAoB;CAC/D,MAAM,IAAI,SAAS,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,SAAS;EAAE,GAAG;EAAG,GAAG;CAAE,CAAC;CAC/D,OAAO,KAAK,IAAI,EAAE,GAAG,EAAE,CAAC;AAC1B"}

package/dist/tools/builtin/bone/rigEditState.js

@@ -1,21 +1,30 @@
-import { createEmitter as e } from "@weasel-js/registry";
+import { createEmitter } from "@weasel-js/registry";
+
 //#region src/tools/builtin/bone/rigEditState.ts
-var t = /* @__PURE__ */ new Map();
-function n() {
-	let n = null, r = t, i = e();
+var NONE = /* @__PURE__ */ new Map();
+/** A `RigEditState` with no joint active. Hand one to both tools so a joint picked with the
+*  bone tool is the one the weight tool paints. */
+function createRigEditState() {
+	let active = null;
+	let painted = NONE;
+	const changed = createEmitter();
 	return {
-		active: () => n,
-		setActive(e) {
-			e !== n && (n = e, i.emit());
+		active: () => active,
+		setActive(joint) {
+			if (joint === active) return;
+			active = joint;
+			changed.emit();
 		},
-		painted: () => r,
-		paint(e) {
-			(e ?? t) !== r && (r = e ?? t, i.emit());
+		painted: () => painted,
+		paint(next) {
+			if ((next ?? NONE) === painted) return;
+			painted = next ?? NONE;
+			changed.emit();
 		},
-		listen: i.subscribe
+		listen: changed.subscribe
 	};
 }
-//#endregion
-export { n as createRigEditState };
 
+//#endregion
+export { createRigEditState };
 //# sourceMappingURL=rigEditState.js.map

package/dist/tools/builtin/bone/rigEditState.js.map

@@ -1 +1 @@
-{"version":3,"file":"rigEditState.js","names":["NONE","createRigEditState","active","painted","changed","createEmitter","joint","next"],"sources":["../../../../src/tools/builtin/bone/rigEditState.ts"],"sourcesContent":["import type { Skin } from '@weasel-js/animator';\nimport { createEmitter } from '@weasel-js/registry';\nimport type { NodeId } from 'core/scene/types';\nimport type { PaintedSkins } from '../../../animation/rig/rigNode';\n\n/** What the bone and weight tools share between gestures: the joint they act on, and the\n *  weights a stroke has painted and not yet written. */\nexport interface RigEditState extends PaintedSkins {\n  /** The active joint's name, or `null`. */\n  active(): string | null;\n  setActive(joint: string | null): void;\n  /** Weights a stroke of the weight tool has painted and not yet written, by node. Empty\n   *  between strokes. `useRigNode` given this state as `painting` binds them as they change. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  /** Replace the painted weights; `null` empties them. */\n  paint(next: ReadonlyMap<NodeId, Skin> | null): void;\n  /** Notified when the active joint or the painted weights change. Returns an unsubscribe. */\n  listen(fn: () => void): () => void;\n}\n\nconst NONE: ReadonlyMap<NodeId, Skin> = new Map();\n\n/** A `RigEditState` with no joint active. Hand one to both tools so a joint picked with the\n *  bone tool is the one the weight tool paints. */\nexport function createRigEditState(): RigEditState {\n  let active: string | null = null;\n  let painted = NONE;\n  const changed = createEmitter();\n  return {\n    active: () => active,\n    setActive(joint) {\n      if (joint === active) return;\n      active = joint;\n      changed.emit();\n    },\n    painted: () => painted,\n    paint(next) {\n      if ((next ?? NONE) === painted) return;\n      painted = next ?? NONE;\n      changed.emit();\n    },\n    listen: changed.subscribe,\n  };\n}\n"],"mappings":";;AAoBA,IAAMA,oBAAkC,IAAI,IAAI;AAIhD,SAAgBC,IAAmC;CACjD,IAAIC,IAAwB,MACxBC,IAAUH,GACRI,IAAUC,EAAc;CAC9B,OAAO;EACL,cAAcH;EACd,UAAU,GAAO;GACf,AAAII,MAAUJ,MACd,IAASI,GACTF,EAAQ,KAAK;EACf;EACA,eAAeD;EACf,MAAM,GAAM;GACV,CAAKI,KAAQP,OAAUG,MACvB,IAAUI,KAAQP,GAClBI,EAAQ,KAAK;EACf;EACA,QAAQA,EAAQ;CAClB;AACF"}
+{"version":3,"file":"rigEditState.js","names":[],"sources":["../../../../src/tools/builtin/bone/rigEditState.ts"],"sourcesContent":["import type { Skin } from '@weasel-js/animator';\nimport { createEmitter } from '@weasel-js/registry';\nimport type { NodeId } from 'core/scene/types';\nimport type { PaintedSkins } from '../../../animation/rig/rigNode';\n\n/** What the bone and weight tools share between gestures: the joint they act on, and the\n *  weights a stroke has painted and not yet written. */\nexport interface RigEditState extends PaintedSkins {\n  /** The active joint's name, or `null`. */\n  active(): string | null;\n  setActive(joint: string | null): void;\n  /** Weights a stroke of the weight tool has painted and not yet written, by node. Empty\n   *  between strokes. `useRigNode` given this state as `painting` binds them as they change. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  /** Replace the painted weights; `null` empties them. */\n  paint(next: ReadonlyMap<NodeId, Skin> | null): void;\n  /** Notified when the active joint or the painted weights change. Returns an unsubscribe. */\n  listen(fn: () => void): () => void;\n}\n\nconst NONE: ReadonlyMap<NodeId, Skin> = new Map();\n\n/** A `RigEditState` with no joint active. Hand one to both tools so a joint picked with the\n *  bone tool is the one the weight tool paints. */\nexport function createRigEditState(): RigEditState {\n  let active: string | null = null;\n  let painted = NONE;\n  const changed = createEmitter();\n  return {\n    active: () => active,\n    setActive(joint) {\n      if (joint === active) return;\n      active = joint;\n      changed.emit();\n    },\n    painted: () => painted,\n    paint(next) {\n      if ((next ?? NONE) === painted) return;\n      painted = next ?? NONE;\n      changed.emit();\n    },\n    listen: changed.subscribe,\n  };\n}\n"],"mappings":";;;AAoBA,IAAM,uBAAkC,IAAI,IAAI;;;AAIhD,SAAgB,qBAAmC;CACjD,IAAI,SAAwB;CAC5B,IAAI,UAAU;CACd,MAAM,UAAU,cAAc;CAC9B,OAAO;EACL,cAAc;EACd,UAAU,OAAO;GACf,IAAI,UAAU,QAAQ;GACtB,SAAS;GACT,QAAQ,KAAK;EACf;EACA,eAAe;EACf,MAAM,MAAM;GACV,KAAK,QAAQ,UAAU,SAAS;GAChC,UAAU,QAAQ;GAClB,QAAQ,KAAK;EACf;EACA,QAAQ,QAAQ;CAClB;AACF"}