@weasel-js/core 1.10.0 → 1.11.0

package/dist/tools/builtin/weight/useWeightTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"useWeightTool.js","names":["useWeightTool","ownState","useMemo","createRigEditState","state","options","opts","useLatest","env","placedRig","actions","createWeightActions","overlay","createWeightOverlay","weighedPaths","createBoneOverlay","defineTool","keybinding"],"sources":["../../../../src/tools/builtin/weight/useWeightTool.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { ToolKeybinding } from '@weasel-js/routing';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { defineTool } from '../../overlayBinding';\nimport type { Tool } from '../../overlayBinding';\nimport { createBoneOverlay } from '../bone/boneOverlay';\nimport { placedRig } from '../bone/placedRig';\nimport { createRigEditState, type RigEditState } from '../bone/rigEditState';\nimport { createWeightActions, weighedPaths, type WeightEnv } from './weightActions';\nimport { createWeightOverlay } from './weightOverlay';\n\n/** Options for `useWeightTool`. */\nexport interface UseWeightToolOptions {\n  scene: Scene<unknown, string, unknown>;\n  /** The node whose data holds the skeleton; the tool paints the paths under it. */\n  rig: () => NodeId | null;\n  /** Shared with `useBoneTool`, so both act on one joint. Default: the tool's own. */\n  state?: RigEditState;\n  /** Override the default keybinding (`{ key: 'W' }`). Pass `null` to omit. */\n  keybinding?: ToolKeybinding | null;\n  /** The brush's radius in screen px. Default 24. */\n  radius?: number;\n  /** Screen px around a joint within which a click picks it. Default 10. */\n  reach?: number;\n}\n\n/**\n * Paints how much the active joint weighs each point of the paths under a rig node, into\n * their `data.skin`. A click on a joint makes it the active one. A drag is a round brush:\n * points under it follow the active joint more, the nearer the brush's center, and their\n * other joints give way; with Alt held they follow it less. A click away from any joint is\n * one dab. Every point shows as a dot colored by the active joint's share of it. A stroke is\n * one undo entry, and until it ends its weights are in `state.painted()`, which `useRigNode`\n * binds when given the same `state` as `painting`.\n */\nexport function useWeightTool(options: UseWeightToolOptions): Tool {\n  const ownState = useMemo(() => createRigEditState(), []);\n  const state = options.state ?? ownState;\n  const opts = useLatest({\n    scene: options.scene, rig: options.rig, radius: options.radius ?? 24, reach: options.reach ?? 10,\n  });\n  const env = useMemo((): WeightEnv => ({\n    state,\n    scene: () => opts.current.scene,\n    placed: () => placedRig(opts.current.scene, opts.current.rig()),\n    reachPx: () => opts.current.reach,\n    radiusPx: () => opts.current.radius,\n    painted: state.painted,\n    paint: state.paint,\n  }), [opts, state]);\n\n  const actions = useMemo(() => createWeightActions(env), [env]);\n  const overlay = useMemo(() => [\n    createWeightOverlay({\n      id: 'weight-tool-points',\n      paths: () => weighedPaths(env),\n      active: state.active,\n      subscribe: state.listen,\n    }),\n    createBoneOverlay({\n      id: 'weight-tool-skeleton',\n      skeleton: () => env.placed()?.skeleton ?? null,\n      active: state.active,\n      subscribe: state.listen,\n    }),\n  ], [env, state]);\n\n  const { keybinding } = options;\n  return useMemo(() => defineTool({\n    id: 'weight',\n    capabilities: ['edits-page'],\n    hookName: 'useWeightTool',\n    cursor: 'crosshair',\n    presentation: { label: 'Weight', group: 'shape' },\n    ...(keybinding === null ? {} : { keybinding: keybinding ?? { key: 'W' } }),\n    actions,\n    overlay,\n    onDeactivate: () => env.paint(null),\n    bindings: [\n      { spec: { kind: 'click', mods: { shift: 'optional', alt: 'optional' } }, actionId: 'weight.click' },\n      { spec: { kind: 'drag', mods: { shift: 'optional', alt: 'optional' } }, actionId: 'weight.paint' },\n    ],\n  }), [actions, overlay, keybinding, env]);\n}\n"],"mappings":";;;;;;;;;AAoCA,SAAgBA,EAAc,GAAqC;CACjE,IAAMC,IAAWC,QAAcC,EAAmB,GAAG,CAAC,CAAC,GACjDC,IAAQC,EAAQ,SAASJ,GACzBK,IAAOC,EAAU;EACrB,OAAOF,EAAQ;EAAO,KAAKA,EAAQ;EAAK,QAAQA,EAAQ,UAAU;EAAI,OAAOA,EAAQ,SAAS;CAChG,CAAC,GACKG,IAAMN,SAA0B;EACpC;EACA,aAAaI,EAAK,QAAQ;EAC1B,cAAcG,EAAUH,EAAK,QAAQ,OAAOA,EAAK,QAAQ,IAAI,CAAC;EAC9D,eAAeA,EAAK,QAAQ;EAC5B,gBAAgBA,EAAK,QAAQ;EAC7B,SAASF,EAAM;EACf,OAAOA,EAAM;CACf,IAAI,CAACE,GAAMF,CAAK,CAAC,GAEXM,IAAUR,QAAcS,EAAoBH,CAAG,GAAG,CAACA,CAAG,CAAC,GACvDI,IAAUV,QAAc,CAC5BW,EAAoB;EAClB,IAAI;EACJ,aAAaC,EAAaN,CAAG;EAC7B,QAAQJ,EAAM;EACd,WAAWA,EAAM;CACnB,CAAC,GACDW,EAAkB;EAChB,IAAI;EACJ,gBAAgBP,EAAI,OAAO,CAAC,EAAE,YAAY;EAC1C,QAAQJ,EAAM;EACd,WAAWA,EAAM;CACnB,CAAC,CACH,GAAG,CAACI,GAAKJ,CAAK,CAAC,GAET,EAAE,kBAAeC;CACvB,OAAOH,QAAcc,EAAW;EAC9B,IAAI;EACJ,cAAc,CAAC,YAAY;EAC3B,UAAU;EACV,QAAQ;EACR,cAAc;GAAE,OAAO;GAAU,OAAO;EAAQ;EAChD,GAAIC,MAAe,OAAO,CAAC,IAAI,EAAE,YAAYA,KAAc,EAAE,KAAK,IAAI,EAAE;EACxE;EACA;EACA,oBAAoBT,EAAI,MAAM,IAAI;EAClC,UAAU,CACR;GAAE,MAAM;IAAE,MAAM;IAAS,MAAM;KAAE,OAAO;KAAY,KAAK;IAAW;GAAE;GAAG,UAAU;EAAe,GAClG;GAAE,MAAM;IAAE,MAAM;IAAQ,MAAM;KAAE,OAAO;KAAY,KAAK;IAAW;GAAE;GAAG,UAAU;EAAe,CACnG;CACF,CAAC,GAAG;EAACE;EAASE;EAASK;EAAYT;CAAG,CAAC;AACzC"}
+{"version":3,"file":"useWeightTool.js","names":[],"sources":["../../../../src/tools/builtin/weight/useWeightTool.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport { useKitSettings, useLatest } from '@weasel-js/react';\nimport type { ToolKeybinding } from '@weasel-js/routing';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { defineTool } from '../../overlayBinding';\nimport type { Tool } from '../../overlayBinding';\nimport { createBoneOverlay } from '../bone/boneOverlay';\nimport { placedRig } from '../bone/placedRig';\nimport { createRigEditState, type RigEditState } from '../bone/rigEditState';\nimport { createWeightActions, weighedPaths, type WeightEnv } from './weightActions';\nimport { createWeightOverlay } from './weightOverlay';\nimport { icon } from '../../../icons.gen';\n\n/** Options for `useWeightTool`. */\nexport interface UseWeightToolOptions {\n  scene: Scene<unknown, string, unknown>;\n  /** The node whose data holds the skeleton; the tool paints the paths under it. */\n  rig: () => NodeId | null;\n  /** Shared with `useBoneTool`, so both act on one joint. Default: the tool's own. */\n  state?: RigEditState;\n  /** Override the default keybinding (`{ key: 'W' }`). Pass `null` to omit. */\n  keybinding?: ToolKeybinding | null;\n  /** The brush's radius in screen px. Default 24. */\n  radius?: number;\n  /** Screen px around a joint within which a click picks it. Default 10. */\n  reach?: number;\n}\n\n/**\n * Paints how much the active joint weighs each point of the paths under a rig node, into\n * their `data.skin`. A click on a joint makes it the active one. A drag is a round brush:\n * points under it follow the active joint more, the nearer the brush's center, and their\n * other joints give way; with Alt held they follow it less. A click away from any joint is\n * one dab. Every point shows as a dot colored by the active joint's share of it. A stroke is\n * one undo entry, and until it ends its weights are in `state.painted()`, which `useRigNode`\n * binds when given the same `state` as `painting`.\n */\nexport function useWeightTool(options: UseWeightToolOptions): Tool {\n  const ownState = useMemo(() => createRigEditState(), []);\n  const state = options.state ?? ownState;\n  const opts = useLatest({\n    scene: options.scene, rig: options.rig, radius: options.radius ?? 24, reach: options.reach ?? 10,\n  });\n  const env = useMemo((): WeightEnv => ({\n    state,\n    scene: () => opts.current.scene,\n    placed: () => placedRig(opts.current.scene, opts.current.rig()),\n    reachPx: () => opts.current.reach,\n    radiusPx: () => opts.current.radius,\n    painted: state.painted,\n    paint: state.paint,\n  }), [opts, state]);\n\n  const actions = useMemo(() => createWeightActions(env), [env]);\n  const kitSettings = useKitSettings();\n  const overlay = useMemo(() => [\n    createWeightOverlay({\n      id: 'weight-tool-points',\n      paths: () => weighedPaths(env),\n      active: state.active,\n      subscribe: state.listen,\n      pointRadiusPx: () => kitSettings.get('targets.weightPointRadiusPx'),\n    }),\n    createBoneOverlay({\n      id: 'weight-tool-skeleton',\n      skeleton: () => env.placed()?.skeleton ?? null,\n      active: state.active,\n      subscribe: state.listen,\n      jointRadiusPx: () => kitSettings.get('targets.boneJointRadiusPx'),\n    }),\n  ], [env, state, kitSettings]);\n\n  const { keybinding } = options;\n  return useMemo(() => defineTool({\n    id: 'weight',\n    capabilities: ['edits-page'],\n    hookName: 'useWeightTool',\n    cursor: 'crosshair',\n    presentation: { label: 'Weight', icon: icon('weight'), group: 'shape' },\n    ...(keybinding === null ? {} : { keybinding: keybinding ?? { key: 'W' } }),\n    actions,\n    overlay,\n    onDeactivate: () => env.paint(null),\n    bindings: [\n      { spec: { kind: 'click', mods: { shift: 'optional', alt: 'optional' } }, actionId: 'weight.click' },\n      { spec: { kind: 'drag', mods: { shift: 'optional', alt: 'optional' } }, actionId: 'weight.paint' },\n    ],\n  }), [actions, overlay, keybinding, env]);\n}\n"],"mappings":"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"}

package/dist/tools/builtin/weight/weightActions.js

@@ -1,81 +1,105 @@
-import { createSetDataOp as e } from "../../../core/ops/setData.js";
-import { defaultCommitAdapter as t } from "../../../interactions/actions/defaultCommitAdapter.js";
-import { dataRestPath as n } from "../../../animation/rig/skinBinding.js";
-import { sceneReach as r } from "../bone/placedRig.js";
-import { ActionDisabledReason as i } from "@weasel-js/routing";
-import { brushWeights as a, jointAt as o, setWeights as s, skinnable as c } from "@weasel-js/animator";
+import { createSetDataOp } from "../../../core/ops/setData.js";
+import { defaultCommitAdapter } from "../../../interactions/actions/defaultCommitAdapter.js";
+import { dataRestPath } from "../../../animation/rig/skinBinding.js";
+import { sceneReach } from "../bone/placedRig.js";
+import { ActionDisabledReason } from "@weasel-js/routing";
+import { brushWeights, jointAt, setWeights, skinnable } from "@weasel-js/animator";
+
 //#region src/tools/builtin/weight/weightActions.ts
-function l(e) {
-	let t = e.placed();
-	if (!t) return [];
-	let r = e.scene(), i = e.painted(), a = [], o = (e) => {
-		for (let t of r.childrenOf(e)) {
-			let e = r.get(t), s = e && n(e);
-			if (e && s) {
-				let n = i.get(t) ?? e.data?.skin ?? {};
-				a.push({
-					id: t,
-					path: c(s),
-					skin: n
+/** Every path under the rig node, with what `env.painted()` holds for it in place of its
+*  `data.skin`. */
+function weighedPaths(env) {
+	const rig = env.placed();
+	if (!rig) return [];
+	const scene = env.scene();
+	const painted = env.painted();
+	const out = [];
+	const walk = (parent) => {
+		for (const id of scene.childrenOf(parent)) {
+			const node = scene.get(id);
+			const rest = node && dataRestPath(node);
+			if (node && rest) {
+				const skin = painted.get(id) ?? node.data?.skin ?? {};
+				out.push({
+					id,
+					path: skinnable(rest),
+					skin
 				});
 			}
-			o(t);
+			walk(id);
 		}
 	};
-	return o(t.id), a;
+	walk(rig.id);
+	return out;
 }
-var u = { capability: "edits-page" }, d = (e) => {
-	let t = e.state.active();
-	return t !== null && e.placed()?.skeleton.joints.some((e) => e.name === t) ? t : null;
+var eligible = { capability: "edits-page" };
+var activeJoint = (env) => {
+	const name = env.state.active();
+	return name !== null && env.placed()?.skeleton.joints.some((j) => j.name === name) ? name : null;
 };
-function f(e, t, n, i, o, c) {
-	let u = r(t, e.radiusPx()), d = null;
-	for (let { id: t, path: r, skin: f } of l(e)) {
-		let l = a(r.coords, i, o, u, f[n], c);
-		l.size !== 0 && (d ??= new Map(e.painted()), d.set(t, s(f, r.coords.length >> 1, n, l)));
+/** One dab of the brush at `(x, y)`: what `env.painted()` becomes, or `null` if no point moved. */
+function dab(env, deps, joint, x, y, mode) {
+	const radius = sceneReach(deps, env.radiusPx());
+	let next = null;
+	for (const { id, path, skin } of weighedPaths(env)) {
+		const hits = brushWeights(path.coords, x, y, radius, skin[joint], mode);
+		if (hits.size === 0) continue;
+		next ??= new Map(env.painted());
+		next.set(id, setWeights(skin, path.coords.length >> 1, joint, hits));
 	}
-	return d;
+	return next;
 }
-function p(n, r) {
-	let i = n.scene(), a = [];
-	for (let [t, r] of n.painted()) {
-		let n = i.get(t)?.data;
-		n !== void 0 && a.push(e({
-			id: t,
-			from: n,
+/** Write what a stroke painted into each node's `data.skin`, as one undo entry. */
+function commitPainted(env, deps) {
+	const scene = env.scene();
+	const ops = [];
+	for (const [id, skin] of env.painted()) {
+		const data = scene.get(id)?.data;
+		if (data !== void 0) ops.push(createSetDataOp({
+			id,
+			from: data,
 			to: {
-				...n,
-				skin: r
+				...data,
+				skin
 			},
 			label: "Paint weights"
 		}));
 	}
-	a.length > 0 && (r.applyOps ? r.applyOps(a, "Paint weights") : i.applyBatch(a, "Paint weights", t(i, r.selection?.adapterMethods))), n.paint(null);
+	if (ops.length > 0) {
+		if (deps.applyOps) deps.applyOps(ops, "Paint weights");
+		else scene.applyBatch(ops, "Paint weights", defaultCommitAdapter(scene, deps.selection?.adapterMethods));
+	}
+	env.paint(null);
 }
-function m(e) {
+/** The weight tool's actions: `weight.paint` and `weight.click`. */
+function createWeightActions(env) {
+	const editing = () => env.placed() ? true : ActionDisabledReason.NotApplicable;
 	return [{
 		id: "weight.paint",
 		label: "Weight — paint the active joint's weights",
-		eligible: u,
+		eligible,
 		requires: [
 			"view",
 			"selection",
 			"applyOps"
 		],
-		enabled: () => d(e) !== null || i.NotApplicable,
+		enabled: () => activeJoint(env) !== null ? true : ActionDisabledReason.NotApplicable,
 		invoker: {
 			timing: "ongoing",
-			start: ({ deps: t, drag: n, world: r, modifiers: i }) => {
-				let a = d(e);
-				if (a === null) return {};
-				let o = (n, r, i) => {
-					let o = f(e, t, a, n, r, i ? "remove" : "add");
-					o && e.paint(o);
-				}, s = n?.start ?? r;
-				return o(s.x, s.y, i.alt), {
-					onMove: (e) => o(e.world.x, e.world.y, e.modifiers.alt),
-					onEnd: (n, r) => {
-						r === "cancel" ? e.paint(null) : p(e, t);
+			start: ({ deps, drag, world, modifiers }) => {
+				const joint = activeJoint(env);
+				if (joint === null) return {};
+				const stroke = (x, y, alt) => {
+					const next = dab(env, deps, joint, x, y, alt ? "remove" : "add");
+					if (next) env.paint(next);
+				};
+				const press = drag?.start ?? world;
+				stroke(press.x, press.y, modifiers.alt);
+				return {
+					onMove: (move) => stroke(move.world.x, move.world.y, move.modifiers.alt),
+					onEnd: (_end, reason) => {
+						if (reason === "cancel") env.paint(null);
+						else commitPainted(env, deps);
 					}
 				};
 			}
@@ -83,30 +107,34 @@ function m(e) {
 	}, {
 		id: "weight.click",
 		label: "Weight — pick a joint, or dab its weight",
-		eligible: u,
+		eligible,
 		requires: [
 			"view",
 			"selection",
 			"applyOps"
 		],
-		enabled: () => e.placed() ? !0 : i.NotApplicable,
+		enabled: editing,
 		invoker: {
 			timing: "immediate",
-			run: (t, n) => {
-				let i = n, a = e.placed();
-				if (!a || i?.pressX === void 0 || i.pressY === void 0) return;
-				let s = o(a.skeleton, i.pressX, i.pressY, r(t, e.reachPx()));
-				if (s !== null) {
-					e.state.setActive(s);
+			run: (deps, params) => {
+				const p = params;
+				const rig = env.placed();
+				if (!rig || p?.pressX === void 0 || p.pressY === void 0) return;
+				const hit = jointAt(rig.skeleton, p.pressX, p.pressY, sceneReach(deps, env.reachPx()));
+				if (hit !== null) {
+					env.state.setActive(hit);
 					return;
 				}
-				let c = d(e), l = c === null ? null : f(e, t, c, i.pressX, i.pressY, i.mods?.alt ? "remove" : "add");
-				l && (e.paint(l), p(e, t));
+				const joint = activeJoint(env);
+				const next = joint === null ? null : dab(env, deps, joint, p.pressX, p.pressY, p.mods?.alt ? "remove" : "add");
+				if (!next) return;
+				env.paint(next);
+				commitPainted(env, deps);
 			}
 		}
 	}];
 }
-//#endregion
-export { m as createWeightActions, l as weighedPaths };
 
+//#endregion
+export { createWeightActions, weighedPaths };
 //# sourceMappingURL=weightActions.js.map

package/dist/tools/builtin/weight/weightActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"weightActions.js","names":["weighedPaths","rig","env","scene","painted","out","walk","id","parent","node","rest","dataRestPath","skin","skinnable","eligible","activeJoint","name","j","dab","radius","sceneReach","deps","next","hits","brushWeights","path","x","y","joint","mode","setWeights","commitPainted","ops","data","createSetDataOp","defaultCommitAdapter","createWeightActions","ActionDisabledReason","stroke","alt","press","drag","world","modifiers","move","reason","p","params","hit","jointAt"],"sources":["../../../../src/tools/builtin/weight/weightActions.ts"],"sourcesContent":["import type { Action, ActionDeps, InvocationCtx } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { PolygonPath } from '@weasel-js/geom';\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 type { RigNodeData } from '../../../animation/rig/rigNode';\nimport { jointAt } from '@weasel-js/animator';\nimport { skinnable, type Skin } from '@weasel-js/animator';\nimport { dataRestPath } from '../../../animation/rig/skinBinding';\nimport { brushWeights, setWeights } from '@weasel-js/animator';\nimport { sceneReach, type PlacedRig } from '../bone/placedRig';\nimport type { RigEditState } from '../bone/rigEditState';\n\n/** One path under the rig node, where it is drawn, with the weights now showing. */\nexport interface WeighedPath {\n  id: NodeId;\n  path: PolygonPath;\n  skin: Skin;\n}\n\n/** What the weight tool's actions read and write, all of it the tool's own. */\nexport interface WeightEnv {\n  scene(): Scene<unknown, string, unknown>;\n  placed(): PlacedRig | null;\n  state: RigEditState;\n  /** Screen px around a joint within which a click picks it. */\n  reachPx(): number;\n  /** The brush's radius in screen px. */\n  radiusPx(): number;\n  /** Weights a stroke has painted and not yet committed, by node. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  paint(next: ReadonlyMap<NodeId, Skin> | null): void;\n}\n\n/** Every path under the rig node, with what `env.painted()` holds for it in place of its\n *  `data.skin`. */\nexport function weighedPaths(env: Pick<WeightEnv, 'scene' | 'placed' | 'painted'>): WeighedPath[] {\n  const rig = env.placed();\n  if (!rig) return [];\n  const scene = env.scene();\n  const painted = env.painted();\n  const out: WeighedPath[] = [];\n  const walk = (parent: NodeId): void => {\n    for (const id of scene.childrenOf(parent)) {\n      const node = scene.get(id);\n      const rest = node && dataRestPath(node);\n      if (node && rest) {\n        const skin = painted.get(id) ?? (node.data as RigNodeData | null | undefined)?.skin ?? {};\n        out.push({ id, path: skinnable(rest), skin });\n      }\n      walk(id);\n    }\n  };\n  walk(rig.id);\n  return out;\n}\n\nconst eligible = { capability: 'edits-page' } as const;\n\nconst activeJoint = (env: WeightEnv): string | null => {\n  const name = env.state.active();\n  return name !== null && env.placed()?.skeleton.joints.some((j) => j.name === name) ? name : null;\n};\n\n/** One dab of the brush at `(x, y)`: what `env.painted()` becomes, or `null` if no point moved. */\nfunction dab(env: WeightEnv, deps: ActionDeps, joint: string, x: number, y: number, mode: 'add' | 'remove'): Map<NodeId, Skin> | null {\n  const radius = sceneReach(deps, env.radiusPx());\n  let next: Map<NodeId, Skin> | null = null;\n  for (const { id, path, skin } of weighedPaths(env)) {\n    const hits = brushWeights(path.coords, x, y, radius, skin[joint], mode);\n    if (hits.size === 0) continue;\n    next ??= new Map(env.painted());\n    next.set(id, setWeights(skin, path.coords.length >> 1, joint, hits));\n  }\n  return next;\n}\n\n/** Write what a stroke painted into each node's `data.skin`, as one undo entry. */\nfunction commitPainted(env: WeightEnv, deps: ActionDeps): void {\n  const scene = env.scene();\n  const ops: Op[] = [];\n  for (const [id, skin] of env.painted()) {\n    const data = scene.get(id)?.data;\n    if (data !== undefined) ops.push(createSetDataOp({ id, from: data, to: { ...(data as object), skin }, label: 'Paint weights' }));\n  }\n  if (ops.length > 0) {\n    if (deps.applyOps) deps.applyOps(ops, 'Paint weights');\n    else scene.applyBatch(ops, 'Paint weights', defaultCommitAdapter(scene, deps.selection?.adapterMethods));\n  }\n  env.paint(null);\n}\n\n/** The weight tool's actions: `weight.paint` and `weight.click`. */\nexport function createWeightActions(env: WeightEnv): Action[] {\n  const editing = () => (env.placed() ? true : ActionDisabledReason.NotApplicable);\n  return [\n    {\n      id: 'weight.paint',\n      label: 'Weight — paint the active joint\\'s weights',\n      eligible,\n      requires: ['view', 'selection', 'applyOps'],\n      enabled: () => (activeJoint(env) !== null ? true : ActionDisabledReason.NotApplicable),\n      invoker: {\n        timing: 'ongoing',\n        start: ({ deps, drag, world, modifiers }: InvocationCtx) => {\n          const joint = activeJoint(env);\n          if (joint === null) return {};\n          const stroke = (x: number, y: number, alt: boolean): void => {\n            const next = dab(env, deps, joint, x, y, alt ? 'remove' : 'add');\n            if (next) env.paint(next);\n          };\n          const press = drag?.start ?? world;\n          stroke(press.x, press.y, modifiers.alt);\n          return {\n            onMove: (move: InvocationCtx) => stroke(move.world.x, move.world.y, move.modifiers.alt),\n            // The dispatcher hands `onEnd` a context with empty deps.\n            onEnd: (_end: InvocationCtx, reason: 'commit' | 'cancel') => {\n              if (reason === 'cancel') env.paint(null);\n              else commitPainted(env, deps);\n            },\n          };\n        },\n      },\n    },\n    {\n      id: 'weight.click',\n      label: 'Weight — pick a joint, or dab its weight',\n      eligible,\n      requires: ['view', 'selection', 'applyOps'],\n      enabled: editing,\n      invoker: {\n        timing: 'immediate',\n        run: (deps, params) => {\n          const p = params as { pressX?: number; pressY?: number; mods?: { alt?: boolean } } | undefined;\n          const rig = env.placed();\n          if (!rig || p?.pressX === undefined || p.pressY === undefined) return;\n          const hit = jointAt(rig.skeleton, p.pressX, p.pressY, sceneReach(deps, env.reachPx()));\n          if (hit !== null) {\n            env.state.setActive(hit);\n            return;\n          }\n          const joint = activeJoint(env);\n          const next = joint === null ? null : dab(env, deps, joint, p.pressX, p.pressY, p.mods?.alt ? 'remove' : 'add');\n          if (!next) return;\n          env.paint(next);\n          commitPainted(env, deps);\n        },\n      },\n    },\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"weightActions.js","names":[],"sources":["../../../../src/tools/builtin/weight/weightActions.ts"],"sourcesContent":["import type { Action, ActionDeps, InvocationCtx } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { PolygonPath } from '@weasel-js/geom';\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 type { RigNodeData } from '../../../animation/rig/rigNode';\nimport { jointAt } from '@weasel-js/animator';\nimport { skinnable, type Skin } from '@weasel-js/animator';\nimport { dataRestPath } from '../../../animation/rig/skinBinding';\nimport { brushWeights, setWeights } from '@weasel-js/animator';\nimport { sceneReach, type PlacedRig } from '../bone/placedRig';\nimport type { RigEditState } from '../bone/rigEditState';\n\n/** One path under the rig node, where it is drawn, with the weights now showing. */\nexport interface WeighedPath {\n  id: NodeId;\n  path: PolygonPath;\n  skin: Skin;\n}\n\n/** What the weight tool's actions read and write, all of it the tool's own. */\nexport interface WeightEnv {\n  scene(): Scene<unknown, string, unknown>;\n  placed(): PlacedRig | null;\n  state: RigEditState;\n  /** Screen px around a joint within which a click picks it. */\n  reachPx(): number;\n  /** The brush's radius in screen px. */\n  radiusPx(): number;\n  /** Weights a stroke has painted and not yet committed, by node. */\n  painted(): ReadonlyMap<NodeId, Skin>;\n  paint(next: ReadonlyMap<NodeId, Skin> | null): void;\n}\n\n/** Every path under the rig node, with what `env.painted()` holds for it in place of its\n *  `data.skin`. */\nexport function weighedPaths(env: Pick<WeightEnv, 'scene' | 'placed' | 'painted'>): WeighedPath[] {\n  const rig = env.placed();\n  if (!rig) return [];\n  const scene = env.scene();\n  const painted = env.painted();\n  const out: WeighedPath[] = [];\n  const walk = (parent: NodeId): void => {\n    for (const id of scene.childrenOf(parent)) {\n      const node = scene.get(id);\n      const rest = node && dataRestPath(node);\n      if (node && rest) {\n        const skin = painted.get(id) ?? (node.data as RigNodeData | null | undefined)?.skin ?? {};\n        out.push({ id, path: skinnable(rest), skin });\n      }\n      walk(id);\n    }\n  };\n  walk(rig.id);\n  return out;\n}\n\nconst eligible = { capability: 'edits-page' } as const;\n\nconst activeJoint = (env: WeightEnv): string | null => {\n  const name = env.state.active();\n  return name !== null && env.placed()?.skeleton.joints.some((j) => j.name === name) ? name : null;\n};\n\n/** One dab of the brush at `(x, y)`: what `env.painted()` becomes, or `null` if no point moved. */\nfunction dab(env: WeightEnv, deps: ActionDeps, joint: string, x: number, y: number, mode: 'add' | 'remove'): Map<NodeId, Skin> | null {\n  const radius = sceneReach(deps, env.radiusPx());\n  let next: Map<NodeId, Skin> | null = null;\n  for (const { id, path, skin } of weighedPaths(env)) {\n    const hits = brushWeights(path.coords, x, y, radius, skin[joint], mode);\n    if (hits.size === 0) continue;\n    next ??= new Map(env.painted());\n    next.set(id, setWeights(skin, path.coords.length >> 1, joint, hits));\n  }\n  return next;\n}\n\n/** Write what a stroke painted into each node's `data.skin`, as one undo entry. */\nfunction commitPainted(env: WeightEnv, deps: ActionDeps): void {\n  const scene = env.scene();\n  const ops: Op[] = [];\n  for (const [id, skin] of env.painted()) {\n    const data = scene.get(id)?.data;\n    if (data !== undefined) ops.push(createSetDataOp({ id, from: data, to: { ...(data as object), skin }, label: 'Paint weights' }));\n  }\n  if (ops.length > 0) {\n    if (deps.applyOps) deps.applyOps(ops, 'Paint weights');\n    else scene.applyBatch(ops, 'Paint weights', defaultCommitAdapter(scene, deps.selection?.adapterMethods));\n  }\n  env.paint(null);\n}\n\n/** The weight tool's actions: `weight.paint` and `weight.click`. */\nexport function createWeightActions(env: WeightEnv): Action[] {\n  const editing = () => (env.placed() ? true : ActionDisabledReason.NotApplicable);\n  return [\n    {\n      id: 'weight.paint',\n      label: 'Weight — paint the active joint\\'s weights',\n      eligible,\n      requires: ['view', 'selection', 'applyOps'],\n      enabled: () => (activeJoint(env) !== null ? true : ActionDisabledReason.NotApplicable),\n      invoker: {\n        timing: 'ongoing',\n        start: ({ deps, drag, world, modifiers }: InvocationCtx) => {\n          const joint = activeJoint(env);\n          if (joint === null) return {};\n          const stroke = (x: number, y: number, alt: boolean): void => {\n            const next = dab(env, deps, joint, x, y, alt ? 'remove' : 'add');\n            if (next) env.paint(next);\n          };\n          const press = drag?.start ?? world;\n          stroke(press.x, press.y, modifiers.alt);\n          return {\n            onMove: (move: InvocationCtx) => stroke(move.world.x, move.world.y, move.modifiers.alt),\n            // The dispatcher hands `onEnd` a context with empty deps.\n            onEnd: (_end: InvocationCtx, reason: 'commit' | 'cancel') => {\n              if (reason === 'cancel') env.paint(null);\n              else commitPainted(env, deps);\n            },\n          };\n        },\n      },\n    },\n    {\n      id: 'weight.click',\n      label: 'Weight — pick a joint, or dab its weight',\n      eligible,\n      requires: ['view', 'selection', 'applyOps'],\n      enabled: editing,\n      invoker: {\n        timing: 'immediate',\n        run: (deps, params) => {\n          const p = params as { pressX?: number; pressY?: number; mods?: { alt?: boolean } } | undefined;\n          const rig = env.placed();\n          if (!rig || p?.pressX === undefined || p.pressY === undefined) return;\n          const hit = jointAt(rig.skeleton, p.pressX, p.pressY, sceneReach(deps, env.reachPx()));\n          if (hit !== null) {\n            env.state.setActive(hit);\n            return;\n          }\n          const joint = activeJoint(env);\n          const next = joint === null ? null : dab(env, deps, joint, p.pressX, p.pressY, p.mods?.alt ? 'remove' : 'add');\n          if (!next) return;\n          env.paint(next);\n          commitPainted(env, deps);\n        },\n      },\n    },\n  ];\n}\n"],"mappings":"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"}

package/dist/tools/builtin/weight/weightOverlay.js

@@ -1,61 +1,78 @@
-import { viewToTransform as e } from "../../../core/viewport/view.js";
-import { worldToScreen as t } from "../../../core/viewport/viewTransform.js";
-import { ellipsePath as n } from "@weasel-js/geom";
+import { viewToTransform } from "../../../core/viewport/view.js";
+import { worldToScreen } from "../../../core/viewport/viewTransform.js";
+import { ellipsePath } from "@weasel-js/geom";
+
 //#region src/tools/builtin/weight/weightOverlay.ts
-var r = 3.5, i = "#10161d", a = [
+var POINT_RADIUS_PX = 3.5;
+var RIM = "#10161d";
+/** No weight, and all of it. */
+var COLD = [
 	31,
 	111,
 	139
-], o = [
+];
+var HOT = [
 	255,
 	138,
 	61
-], s = "#8a94a3", c = (e) => {
-	let t = a.map((t, n) => Math.round(t + (o[n] - t) * e));
-	return `rgb(${t[0]}, ${t[1]}, ${t[2]})`;
+];
+var IDLE = "#8a94a3";
+var mix = (w) => {
+	const c = COLD.map((v, k) => Math.round(v + (HOT[k] - v) * w));
+	return `rgb(${c[0]}, ${c[1]}, ${c[2]})`;
 };
-function l(a) {
+/**
+* A screen-space layer drawing a dot on every point of every path under a rig, anchors and
+* curve handles alike, colored by how much the active joint weighs it. With no joint active
+* the dots are gray.
+*/
+function createWeightOverlay(source) {
 	return {
-		id: a.id,
+		id: source.id,
 		label: "Weights",
 		space: "screen",
-		subscribe: a.subscribe,
-		draw: (o, l) => {
-			let u = e(l), d = a.active(), f = [];
-			for (let { path: e, skin: o } of a.paths()) {
-				let a = d === null ? void 0 : o[d], l;
-				if (d !== null) {
-					l = Array(e.coords.length >> 1).fill(0);
-					for (let e in o) o[e].forEach((e, t) => {
-						t < l.length && (l[t] += e);
+		subscribe: source.subscribe,
+		draw: (_data, view) => {
+			const t = viewToTransform(view);
+			const active = source.active();
+			const r = source.pointRadiusPx?.() ?? POINT_RADIUS_PX;
+			const out = [];
+			for (const { path, skin } of source.paths()) {
+				const weights = active === null ? void 0 : skin[active];
+				let total;
+				if (active !== null) {
+					total = new Array(path.coords.length >> 1).fill(0);
+					for (const joint in skin) skin[joint].forEach((w, i) => {
+						if (i < total.length) total[i] += w;
 					});
 				}
-				for (let o = 0; 2 * o + 1 < e.coords.length; o++) {
-					let [p, m] = t(e.coords[2 * o], e.coords[2 * o + 1], u), h = l && l[o] > 0 ? (a?.[o] ?? 0) / l[o] : 0;
-					f.push({
+				for (let i = 0; 2 * i + 1 < path.coords.length; i++) {
+					const [x, y] = worldToScreen(path.coords[2 * i], path.coords[2 * i + 1], t);
+					const share = total && total[i] > 0 ? (weights?.[i] ?? 0) / total[i] : 0;
+					out.push({
 						kind: "path",
-						path: n({
-							x: p - r,
-							y: m - r,
+						path: ellipsePath({
+							x: x - r,
+							y: y - r,
 							width: 2 * r,
 							height: 2 * r
 						}),
 						fill: { paint: {
 							kind: "solid",
-							color: d === null ? s : c(h)
+							color: active === null ? IDLE : mix(share)
 						} },
 						stroke: {
-							paint: { color: i },
+							paint: { color: RIM },
 							width: 1
 						}
 					});
 				}
 			}
-			return f;
+			return out;
 		}
 	};
 }
-//#endregion
-export { l as createWeightOverlay };
 
+//#endregion
+export { POINT_RADIUS_PX, createWeightOverlay };
 //# sourceMappingURL=weightOverlay.js.map

package/dist/tools/builtin/weight/weightOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"weightOverlay.js","names":["POINT_RADIUS_PX","RIM","COLD","HOT","IDLE","mix","c","v","k","w","createWeightOverlay","source","t","viewToTransform","view","active","out","weights","skin","total","path","joint","i","x","y","worldToScreen","share","ellipsePath"],"sources":["../../../../src/tools/builtin/weight/weightOverlay.ts"],"sourcesContent":["import { ellipsePath } 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 type { WeighedPath } from './weightActions';\n\nconst POINT_RADIUS_PX = 3.5;\nconst RIM = '#10161d';\n/** No weight, and all of it. */\nconst COLD = [0x1f, 0x6f, 0x8b];\nconst HOT = [0xff, 0x8a, 0x3d];\nconst IDLE = '#8a94a3';\n\nconst mix = (w: number): string => {\n  const c = COLD.map((v, k) => Math.round(v + (HOT[k] - v) * w));\n  return `rgb(${c[0]}, ${c[1]}, ${c[2]})`;\n};\n\n/**\n * A screen-space layer drawing a dot on every point of every path under a rig, anchors and\n * curve handles alike, colored by how much the active joint weighs it. With no joint active\n * the dots are gray.\n */\nexport function createWeightOverlay(source: {\n  id: string;\n  paths(): readonly WeighedPath[];\n  active(): string | null;\n  subscribe(fn: () => void): () => void;\n}): RenderLayer<unknown> {\n  return {\n    id: source.id,\n    label: 'Weights',\n    space: 'screen',\n    subscribe: source.subscribe,\n    draw: (_data, view) => {\n      const t = viewToTransform(view);\n      const active = source.active();\n      const out: DrawCommand[] = [];\n      for (const { path, skin } of source.paths()) {\n        const weights = active === null ? undefined : skin[active];\n        let total: number[] | undefined;\n        if (active !== null) {\n          total = new Array<number>(path.coords.length >> 1).fill(0);\n          for (const joint in skin) skin[joint].forEach((w, i) => { if (i < total!.length) total![i] += w; });\n        }\n        for (let i = 0; 2 * i + 1 < path.coords.length; i++) {\n          const [x, y] = worldToScreen(path.coords[2 * i], path.coords[2 * i + 1], t);\n          const share = total && total[i] > 0 ? (weights?.[i] ?? 0) / total[i] : 0;\n          out.push({\n            kind: 'path',\n            path: ellipsePath({ x: x - POINT_RADIUS_PX, y: y - POINT_RADIUS_PX, width: 2 * POINT_RADIUS_PX, height: 2 * POINT_RADIUS_PX }),\n            fill: { paint: { kind: 'solid', color: active === null ? IDLE : mix(share) } },\n            stroke: { paint: { color: RIM }, width: 1 },\n          });\n        }\n      }\n      return out;\n    },\n  };\n}\n"],"mappings":";;;;AAOA,IAAMA,IAAkB,KAClBC,IAAM,WAENC,IAAO;CAAC;CAAM;CAAM;AAAI,GACxBC,IAAM;CAAC;CAAM;CAAM;AAAI,GACvBC,IAAO,WAEPC,KAAO,MAAsB;CACjC,IAAMC,IAAIJ,EAAK,KAAK,GAAG,MAAM,KAAK,MAAMK,KAAKJ,EAAIK,KAAKD,KAAKE,CAAC,CAAC;CAC7D,OAAO,OAAOH,EAAE,GAAG,IAAIA,EAAE,GAAG,IAAIA,EAAE,GAAG;AACvC;AAOA,SAAgBI,EAAoB,GAKX;CACvB,OAAO;EACL,IAAIC,EAAO;EACX,OAAO;EACP,OAAO;EACP,WAAWA,EAAO;EAClB,OAAO,GAAO,MAAS;GACrB,IAAMC,IAAIC,EAAgBC,CAAI,GACxBC,IAASJ,EAAO,OAAO,GACvBK,IAAqB,CAAC;GAC5B,KAAK,IAAM,EAAE,SAAM,aAAUL,EAAO,MAAM,GAAG;IAC3C,IAAMM,IAAUF,MAAW,OAAO,KAAA,IAAYG,EAAKH,IAC/CI;IACJ,IAAIJ,MAAW,MAAM;KACnB,IAAY,MAAcK,EAAK,OAAO,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;KACzD,KAAK,IAAMC,KAASH,GAAM,EAAKG,EAAM,CAAC,SAAS,GAAG,MAAM;MAAE,AAAIC,IAAIH,EAAO,WAAQ,EAAOG,MAAMb;KAAG,CAAC;IACpG;IACA,KAAK,IAAIa,IAAI,GAAG,IAAIA,IAAI,IAAIF,EAAK,OAAO,QAAQ,KAAK;KACnD,IAAM,CAACG,GAAGC,KAAKC,EAAcL,EAAK,OAAO,IAAIE,IAAIF,EAAK,OAAO,IAAIE,IAAI,IAAIV,CAAC,GACpEc,IAAQP,KAASA,EAAMG,KAAK,KAAKL,IAAUK,MAAM,KAAKH,EAAMG,KAAK;KACvE,EAAI,KAAK;MACP,MAAM;MACN,MAAMK,EAAY;OAAE,GAAGJ,IAAIvB;OAAiB,GAAGwB,IAAIxB;OAAiB,OAAO,IAAIA;OAAiB,QAAQ,IAAIA;MAAgB,CAAC;MAC7H,MAAM,EAAE,OAAO;OAAE,MAAM;OAAS,OAAOe,MAAW,OAAOX,IAAOC,EAAIqB,CAAK;MAAE,EAAE;MAC7E,QAAQ;OAAE,OAAO,EAAE,OAAOzB,EAAI;OAAG,OAAO;MAAE;KAC5C,CAAC;IACH;GACF;GACA,OAAOe;EACT;CACF;AACF"}
+{"version":3,"file":"weightOverlay.js","names":[],"sources":["../../../../src/tools/builtin/weight/weightOverlay.ts"],"sourcesContent":["import { ellipsePath } 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 type { WeighedPath } from './weightActions';\n\nexport const POINT_RADIUS_PX = 3.5;\nconst RIM = '#10161d';\n/** No weight, and all of it. */\nconst COLD = [0x1f, 0x6f, 0x8b];\nconst HOT = [0xff, 0x8a, 0x3d];\nconst IDLE = '#8a94a3';\n\nconst mix = (w: number): string => {\n  const c = COLD.map((v, k) => Math.round(v + (HOT[k] - v) * w));\n  return `rgb(${c[0]}, ${c[1]}, ${c[2]})`;\n};\n\n/**\n * A screen-space layer drawing a dot on every point of every path under a rig, anchors and\n * curve handles alike, colored by how much the active joint weighs it. With no joint active\n * the dots are gray.\n */\nexport function createWeightOverlay(source: {\n  id: string;\n  paths(): readonly WeighedPath[];\n  active(): string | null;\n  subscribe(fn: () => void): () => void;\n  /** Point dot radius in screen px, read each frame. Default `POINT_RADIUS_PX`. */\n  pointRadiusPx?: () => number | undefined;\n}): RenderLayer<unknown> {\n  return {\n    id: source.id,\n    label: 'Weights',\n    space: 'screen',\n    subscribe: source.subscribe,\n    draw: (_data, view) => {\n      const t = viewToTransform(view);\n      const active = source.active();\n      const r = source.pointRadiusPx?.() ?? POINT_RADIUS_PX;\n      const out: DrawCommand[] = [];\n      for (const { path, skin } of source.paths()) {\n        const weights = active === null ? undefined : skin[active];\n        let total: number[] | undefined;\n        if (active !== null) {\n          total = new Array<number>(path.coords.length >> 1).fill(0);\n          for (const joint in skin) skin[joint].forEach((w, i) => { if (i < total!.length) total![i] += w; });\n        }\n        for (let i = 0; 2 * i + 1 < path.coords.length; i++) {\n          const [x, y] = worldToScreen(path.coords[2 * i], path.coords[2 * i + 1], t);\n          const share = total && total[i] > 0 ? (weights?.[i] ?? 0) / total[i] : 0;\n          out.push({\n            kind: 'path',\n            path: ellipsePath({ x: x - r, y: y - r, width: 2 * r, height: 2 * r }),\n            fill: { paint: { kind: 'solid', color: active === null ? IDLE : mix(share) } },\n            stroke: { paint: { color: RIM }, width: 1 },\n          });\n        }\n      }\n      return out;\n    },\n  };\n}\n"],"mappings":";;;;;AAOA,IAAa,kBAAkB;AAC/B,IAAM,MAAM;;AAEZ,IAAM,OAAO;CAAC;CAAM;CAAM;AAAI;AAC9B,IAAM,MAAM;CAAC;CAAM;CAAM;AAAI;AAC7B,IAAM,OAAO;AAEb,IAAM,OAAO,MAAsB;CACjC,MAAM,IAAI,KAAK,KAAK,GAAG,MAAM,KAAK,MAAM,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC;CAC7D,OAAO,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG;AACvC;;;;;;AAOA,SAAgB,oBAAoB,QAOX;CACvB,OAAO;EACL,IAAI,OAAO;EACX,OAAO;EACP,OAAO;EACP,WAAW,OAAO;EAClB,OAAO,OAAO,SAAS;GACrB,MAAM,IAAI,gBAAgB,IAAI;GAC9B,MAAM,SAAS,OAAO,OAAO;GAC7B,MAAM,IAAI,OAAO,gBAAgB,KAAK;GACtC,MAAM,MAAqB,CAAC;GAC5B,KAAK,MAAM,EAAE,MAAM,UAAU,OAAO,MAAM,GAAG;IAC3C,MAAM,UAAU,WAAW,OAAO,SAAY,KAAK;IACnD,IAAI;IACJ,IAAI,WAAW,MAAM;KACnB,QAAQ,IAAI,MAAc,KAAK,OAAO,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;KACzD,KAAK,MAAM,SAAS,MAAM,KAAK,MAAM,CAAC,SAAS,GAAG,MAAM;MAAE,IAAI,IAAI,MAAO,QAAQ,MAAO,MAAM;KAAG,CAAC;IACpG;IACA,KAAK,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,OAAO,QAAQ,KAAK;KACnD,MAAM,CAAC,GAAG,KAAK,cAAc,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,IAAI,CAAC;KAC1E,MAAM,QAAQ,SAAS,MAAM,KAAK,KAAK,UAAU,MAAM,KAAK,MAAM,KAAK;KACvE,IAAI,KAAK;MACP,MAAM;MACN,MAAM,YAAY;OAAE,GAAG,IAAI;OAAG,GAAG,IAAI;OAAG,OAAO,IAAI;OAAG,QAAQ,IAAI;MAAE,CAAC;MACrE,MAAM,EAAE,OAAO;OAAE,MAAM;OAAS,OAAO,WAAW,OAAO,OAAO,IAAI,KAAK;MAAE,EAAE;MAC7E,QAAQ;OAAE,OAAO,EAAE,OAAO,IAAI;OAAG,OAAO;MAAE;KAC5C,CAAC;IACH;GACF;GACA,OAAO;EACT;CACF;AACF"}

package/dist/tools/overlayBinding.js

@@ -1,8 +1,10 @@
-import { defineTool as e } from "@weasel-js/routing";
-import { useTools as t } from "@weasel-js/routing/react";
+import { defineTool } from "@weasel-js/routing";
+import { useTools } from "@weasel-js/routing/react";
+
 //#region src/tools/overlayBinding.ts
-var n = t;
-//#endregion
-export { e as defineTool, n as useTools };
+/** Routing's `useTools`, typed for `RenderLayer` overlays. */
+var useTools$1 = useTools;
 
+//#endregion
+export { defineTool, useTools$1 as useTools };
 //# sourceMappingURL=overlayBinding.js.map

package/dist/tools/overlayBinding.js.map

@@ -1 +1 @@
-{"version":3,"file":"overlayBinding.js","names":["useTools","routingUseTools","useTools$1","useTools","defineTool"],"sources":["../../src/tools/overlayBinding.ts"],"sourcesContent":["/**\n * The routing types that carry an overlay, bound to the kit's `RenderLayer`.\n *\n * `@weasel-js/routing` never reads an overlay — it collects the live ones and\n * hands them back in scope order — so it leaves the element type open. What a\n * weasel canvas draws is a `RenderLayer`, and every kit call site should see\n * that rather than `unknown`, so core binds the parameter once, here, and\n * re-exports these names under the ones they have always had.\n */\nimport type { RenderLayer } from 'core/layers/render';\nimport { useTools as routingUseTools, useContributions as routingUseContributions } from '@weasel-js/routing/react';\nimport type {\n  Contribution as RoutingContribution,\n  ContributionChrome as RoutingContributionChrome,\n  Tool as RoutingTool,\n  ToolDef as RoutingToolDef,\n} from '@weasel-js/routing';\nimport type {\n  ToolsApi as RoutingToolsApi,\n  UseToolsOptions as RoutingUseToolsOptions,\n  ContributionsApi as RoutingContributionsApi,\n  UseContributionsOptions as RoutingUseContributionsOptions,\n} from '@weasel-js/routing/react';\n\n/** What a canvas overlay is, at this layer. */\nexport type Overlay = RenderLayer<unknown>;\n\ndeclare module '@weasel-js/routing' {\n  interface OverlaySchema { overlay: RenderLayer<unknown> }\n}\n\n/** Routing's `Contribution`, with overlays typed as `RenderLayer`. */\nexport type Contribution = RoutingContribution<Overlay>;\n/** Routing's `ContributionChrome`, with overlays typed as `RenderLayer`. */\nexport type ContributionChrome = RoutingContributionChrome<Overlay>;\n/** Routing's `Tool`, with overlays typed as `RenderLayer`. */\nexport type Tool = RoutingTool<Overlay>;\n/** The same type as `Tool`, kept for code that imports it by this name. */\nexport type AnyTool = Tool;\n/** Routing's `ToolDef` (what `defineTool` takes), with overlays typed as `RenderLayer`. */\nexport type ToolDef = RoutingToolDef<Overlay>;\n/** Routing's `ToolsApi`, with overlays typed as `RenderLayer`. */\nexport type ToolsApi = RoutingToolsApi<Overlay>;\n/** Routing's `UseToolsOptions`, with overlays typed as `RenderLayer`. */\nexport type UseToolsOptions = RoutingUseToolsOptions<Overlay>;\nexport type ContributionsApi = RoutingContributionsApi<Overlay>;\nexport type UseContributionsOptions = RoutingUseContributionsOptions<Overlay>;\n\n// Routing's own authoring functions: the `OverlaySchema` merge above makes\n// their overlay default `Overlay`, so there is one `defineTool`, not a wrapper.\nexport { defineTool } from '@weasel-js/routing';\n/** Routing's `useTools`, typed for `RenderLayer` overlays. */\nexport const useTools: (opts: UseToolsOptions) => ToolsApi = routingUseTools;\nexport const useContributions: (opts: UseContributionsOptions) => ContributionsApi =\n  routingUseContributions;\n"],"mappings":";;;AAoDA,IAAaA,IAAgDC"}
+{"version":3,"file":"overlayBinding.js","names":["useTools","routingUseTools"],"sources":["../../src/tools/overlayBinding.ts"],"sourcesContent":["/**\n * The routing types that carry an overlay, bound to the kit's `RenderLayer`.\n *\n * `@weasel-js/routing` never reads an overlay — it collects the live ones and\n * hands them back in scope order — so it leaves the element type open. What a\n * weasel canvas draws is a `RenderLayer`, and every kit call site should see\n * that rather than `unknown`, so core binds the parameter once, here, and\n * re-exports these names under the ones they have always had.\n */\nimport type { RenderLayer } from 'core/layers/render';\nimport { useTools as routingUseTools, useContributions as routingUseContributions } from '@weasel-js/routing/react';\nimport type {\n  Contribution as RoutingContribution,\n  ContributionChrome as RoutingContributionChrome,\n  Tool as RoutingTool,\n  ToolDef as RoutingToolDef,\n} from '@weasel-js/routing';\nimport type {\n  ToolsApi as RoutingToolsApi,\n  UseToolsOptions as RoutingUseToolsOptions,\n  ContributionsApi as RoutingContributionsApi,\n  UseContributionsOptions as RoutingUseContributionsOptions,\n} from '@weasel-js/routing/react';\n\n/** What a canvas overlay is, at this layer. */\nexport type Overlay = RenderLayer<unknown>;\n\ndeclare module '@weasel-js/routing' {\n  interface OverlaySchema { overlay: RenderLayer<unknown> }\n}\n\n/** Routing's `Contribution`, with overlays typed as `RenderLayer`. */\nexport type Contribution = RoutingContribution<Overlay>;\n/** Routing's `ContributionChrome`, with overlays typed as `RenderLayer`. */\nexport type ContributionChrome = RoutingContributionChrome<Overlay>;\n/** Routing's `Tool`, with overlays typed as `RenderLayer`. */\nexport type Tool = RoutingTool<Overlay>;\n/** The same type as `Tool`, kept for code that imports it by this name. */\nexport type AnyTool = Tool;\n/** Routing's `ToolDef` (what `defineTool` takes), with overlays typed as `RenderLayer`. */\nexport type ToolDef = RoutingToolDef<Overlay>;\n/** Routing's `ToolsApi`, with overlays typed as `RenderLayer`. */\nexport type ToolsApi = RoutingToolsApi<Overlay>;\n/** Routing's `UseToolsOptions`, with overlays typed as `RenderLayer`. */\nexport type UseToolsOptions = RoutingUseToolsOptions<Overlay>;\nexport type ContributionsApi = RoutingContributionsApi<Overlay>;\nexport type UseContributionsOptions = RoutingUseContributionsOptions<Overlay>;\n\n// Routing's own authoring functions: the `OverlaySchema` merge above makes\n// their overlay default `Overlay`, so there is one `defineTool`, not a wrapper.\nexport { defineTool } from '@weasel-js/routing';\n/** Routing's `useTools`, typed for `RenderLayer` overlays. */\nexport const useTools: (opts: UseToolsOptions) => ToolsApi = routingUseTools;\nexport const useContributions: (opts: UseContributionsOptions) => ContributionsApi =\n  routingUseContributions;\n"],"mappings":";;;;;AAoDA,IAAaA,aAAgDC"}

package/dist/tools/useKeybindings.js

@@ -1,56 +1,72 @@
-import { buildToolActivateBindings as e, makeToolActivateAction as t } from "../interactions/actions/defaults/toolActivate.js";
-import { makeToolResetToDefaultAction as n } from "../interactions/actions/defaults/toolResetToDefault.js";
-import { useEffect as r, useRef as i } from "react";
-import { useLatest as a } from "@weasel-js/react";
-import { useActionsRegistry as o } from "@weasel-js/routing/react";
-import { eligibleForMode as s } from "@weasel-js/modes";
+import { buildToolActivateBindings, makeToolActivateAction } from "../interactions/actions/defaults/toolActivate.js";
+import { makeToolResetToDefaultAction } from "../interactions/actions/defaults/toolResetToDefault.js";
+import { useEffect, useRef } from "react";
+import { useLatest } from "@weasel-js/react";
+import { useActionsRegistry } from "@weasel-js/routing/react";
+import { eligibleForMode } from "@weasel-js/modes";
+
 //#region src/tools/useKeybindings.ts
-function c(c, l = {}) {
-	let u = a(c), d = a(l), f = i(c.active), p = o(), { disable: m = !1 } = l;
-	r(() => {
-		if (m || !p || Object.keys(u.current.registry).length === 0) return;
-		let r = [], i = u.current.registry;
-		for (let e in i) {
-			let t = i[e].keybinding;
-			if (!t) continue;
-			let n = typeof t.key == "string" ? [t.key] : t.key;
-			for (let i of n) i && r.push({
-				toolId: e,
-				keyOpts: {
-					...t,
-					key: i
-				}
-			});
+/** Wire the single-key tool-activation shortcuts (V, P, T, …) and Escape to
+*  return to the default tool. Activation is gated on what the active mode
+*  allows, so a key cannot reach a tool the palette greys out. */
+function useKeybindings(tools, options = {}) {
+	const toolsRef = useLatest(tools);
+	const optionsRef = useLatest(options);
+	const initialActiveRef = useRef(tools.active);
+	const registry = useActionsRegistry();
+	const { disable = false } = options;
+	useEffect(() => {
+		if (disable) return;
+		if (!registry) return;
+		if (Object.keys(toolsRef.current.registry).length === 0) return;
+		const specs = [];
+		const allTools = toolsRef.current.registry;
+		for (const toolId in allTools) {
+			const binding = allTools[toolId].keybinding;
+			if (!binding) continue;
+			const keys = typeof binding.key === "string" ? [binding.key] : binding.key;
+			for (const key of keys) {
+				if (!key) continue;
+				specs.push({
+					toolId,
+					keyOpts: {
+						...binding,
+						key
+					}
+				});
+			}
 		}
-		let a = [];
-		if (r.length > 0) {
-			let n = e(r);
-			a.push(p.register(t(n, (e) => {
-				let t = d.current.modes;
-				if (!t) return !0;
-				let n = u.current.registry[e]?.eligibility.capabilities;
-				return s(t.current(), n ?? []);
+		const unregisters = [];
+		if (specs.length > 0) {
+			const bindings = buildToolActivateBindings(specs);
+			unregisters.push(registry.register(makeToolActivateAction(bindings, (toolId) => {
+				const modes = optionsRef.current.modes;
+				if (!modes) return true;
+				const tags = toolsRef.current.registry[toolId]?.eligibility.capabilities;
+				return eligibleForMode(modes.current(), tags ?? []);
 			})));
 		}
-		return a.push(p.register(n(() => {
-			let e = d.current.defaultTool;
-			if (e === null) return null;
-			let t = e ?? f.current;
-			if (!t) return null;
-			let n = u.current;
-			return !n.has(t) || n.active === t ? null : t;
-		}))), () => {
-			for (let e of a) e();
+		unregisters.push(registry.register(makeToolResetToDefaultAction(() => {
+			const opt = optionsRef.current.defaultTool;
+			if (opt === null) return null;
+			const target = opt ?? initialActiveRef.current;
+			if (!target) return null;
+			const api = toolsRef.current;
+			if (!api.has(target) || api.active === target) return null;
+			return target;
+		})));
+		return () => {
+			for (const u of unregisters) u();
 		};
 	}, [
-		p,
-		c,
-		u,
-		d,
-		m
+		registry,
+		tools,
+		toolsRef,
+		optionsRef,
+		disable
 	]);
 }
-//#endregion
-export { c as useKeybindings };
 
+//#endregion
+export { useKeybindings };
 //# sourceMappingURL=useKeybindings.js.map