@benev/tact 0.1.0-3 → 0.1.0-4

package/s/demo/ui/theater/virtual/view.ts

@@ -0,0 +1,31 @@
+
+import {html} from "lit"
+import {cssReset, view} from "@e280/sly"
+import styleCss from "./style.css.js"
+import {Hub} from "../../../../core/hub/hub.js"
+import {NubStick} from "../../../../nubs/stick/component.js"
+import {VirtualDevice} from "../../../game/parts/virtual-device.js"
+import {DeviceSkin} from "../../../../deck/parts/device-skins/device-skin.js"
+
+export const VirtualDeviceView = view(use => (
+		hub: Hub<any>,
+		device: VirtualDevice,
+		_deviceSkin: DeviceSkin,
+	) => {
+
+	use.styles(cssReset, styleCss)
+	use.attrs.string.device = "virtual"
+
+	const unplug = () => hub.unplug(device)
+
+	return html`
+		<div class=box>
+			${NubStick.view(device)}
+
+			<button @click="${device.shimmyPrevious}">👈</button>
+			<button @click="${unplug}">💀</button>
+			<button @click="${device.shimmyNext}">👉</button>
+		</div>
+	`
+})
+

package/s/demo/ui/utils/loader.ts

@@ -0,0 +1,5 @@
+
+import {makeLoader} from "@e280/sly"
+
+export const loader = makeLoader()
+

package/s/index.html.ts

@@ -12,9 +12,6 @@ export default ssg.page(import.meta.url, async orb => ({
 	css: "demo/main.css",
 	dark: true,
 	favicon,
-	head: html`
-		<meta data-version="${orb.packageVersion()}" />
-	`,
 
 	socialCard: {
 		title,
@@ -28,15 +25,28 @@ export default ssg.page(import.meta.url, async orb => ({
 		<header>
 			<h1>
 				<strong>@benev/tact</strong>
-				<span>v${orb.packageVersion()}</span>
+				<small>v${orb.packageVersion()}</small>
 			</h1>
 			<div class=deets>
-				<a href="https://github.com/benevolent-games/tact">github</a>
-				<a href="https://benevolent.games/">benevolent.games</a>
+				<p><em>"from keypress to couch co-op"</em></p>
+				<p>
+					tact is a user input toolkit for the web. it's good at customizable keybindings, and multiple gamepad support.
+					see <a href="https://github.com/benevolent-games/tact">github</a>,
+					see <a href="https://benevolent.games/">benevolent.games</a>.
+				</p>
 			</div>
 		</header>
 
 		<tact-demo></tact-demo>
+
+		<section>
+			<h3>controls</h3>
+			<ul>
+				<li><strong>keyboard</strong> wasd, left-bracket, right-bracket, backslash.</li>
+				<li><strong>gamepad</strong> thumbsticks, hold beta/gamma and press bumpers or dpad left/right.</li>
+				<li><strong>virtual</strong> use your mouse to press the little buttons.</li>
+			</ul>
+		</section>
 	`,
 }))
 

package/s/index.ts

@@ -1,6 +1,8 @@
 
 export * from "./core/index.js"
+export * from "./deck/index.js"
+export * from "./nubs/index.js"
+export * as nubs from "./nubs/index.js"
 
 export * from "./utils/gamepads.js"
-export * from "./utils/split-axis.js"
 

package/s/nubs/components.ts

@@ -0,0 +1,14 @@
+
+import {dom} from "@e280/sly"
+import {NubLookpad} from "./lookpad/component.js"
+import {NubStick} from "./stick/component.js"
+import {NubVpad} from "./vpad/component.js"
+
+export const nubs = () => ({
+	NubLookpad,
+	NubStick,
+	NubVpad,
+})
+
+export const registerNubs = () => dom.register(nubs())
+

package/s/nubs/index.ts

@@ -0,0 +1,6 @@
+
+export * from "./lookpad/component.js"
+export * from "./stick/component.js"
+export * from "./vpad/component.js"
+export * from "./components.js"
+

package/s/nubs/lookpad/component.ts

@@ -0,0 +1,45 @@
+
+import {dom, view} from "@e280/sly"
+import {styles} from "./styles.js"
+
+const NubLookpadView = view(use => () => {
+	use.name("nub-lookpad")
+	use.styles(styles)
+
+	const $captured = use.signal<number | undefined>(undefined)
+
+	use.mount(() => dom.events(use.element, {
+		pointerdown: (event: PointerEvent) => {
+			event.preventDefault()
+			if ($captured.value)
+				use.element.releasePointerCapture($captured.value)
+
+			use.element.setPointerCapture(event.pointerId)
+			$captured.value = event.pointerId
+			// onPointerDrag(event)
+		},
+
+		pointermove: [{passive: false}, (event: PointerEvent) => {
+			event.preventDefault()
+			if (event.pointerId === $captured.value) {
+				// onPointerDrag(event)
+			}
+		}],
+
+		pointerup: (event: PointerEvent) => {
+			event.preventDefault()
+			if (event.pointerId === $captured.value) {
+				use.element.releasePointerCapture($captured.value)
+				$captured.value = undefined
+				// onPointerDrag(event)
+			}
+		},
+	}))
+})
+
+export class NubLookpad extends (
+	NubLookpadView
+		.component()
+		.props(() => [])
+) {}
+

package/s/nubs/stick/component.ts

@@ -0,0 +1,115 @@
+
+import {html} from "lit"
+import {coalesce, nap} from "@e280/stz"
+import {Scalar, Vec2} from "@benev/math"
+import {BaseElement, cssReset, dom, view} from "@e280/sly"
+
+import styleCss from "./style.css.js"
+import {circularClamp} from "../../utils/circular-clamp.js"
+import {StickDevice} from "../../core/devices/standard/stick.js"
+
+const NubStickView = view(use => ({$vector}: StickDevice) => {
+	use.name("nub-stick")
+	use.css(cssReset, styleCss)
+
+	const range = use.once(() => new Vec2(0.2, 0.8))
+	const $captured = use.signal<number | undefined>(undefined)
+
+	use.mount(() => {
+		function recalc(event: PointerEvent) {
+			const rect = use.element.getBoundingClientRect()
+			const vector = $vector.get()
+			vector.x = Scalar.remap(event.clientX, rect.left, rect.right, -1, 1)
+			vector.y = Scalar.remap(event.clientY, rect.top, rect.bottom, -1, 1)
+			vector.set(circularClamp(vector, range))
+			$vector.publish()
+		}
+
+		function release() {
+			if ($captured.value === undefined) return
+			$vector.get().set_(0, 0)
+			$vector.publish()
+
+			// fix for ridiculous firefox bug,
+			// where our captured pointerup was clicking outside buttons
+			nap(0).then(() => {
+				if ($captured.value === undefined) return
+				use.element.releasePointerCapture($captured.value)
+				$captured.value = undefined
+			})
+		}
+
+		return coalesce(
+
+			// fix for ridiculous firefox bug
+			dom.events(document.body, {
+				click: [{capture: true}, (event: Event) => {
+					if ($captured.value === undefined) return
+					event.preventDefault()
+					event.stopPropagation()
+				}],
+			}),
+
+			dom.events(use.element, {
+				pointerdown: (event: PointerEvent) => {
+					if ($captured.value === undefined) {
+						$captured.value = event.pointerId
+						use.element.setPointerCapture($captured.value)
+						recalc(event)
+					}
+				},
+				pointermove: [{}, (event: PointerEvent) => {
+					if ($captured.value !== undefined)
+						recalc(event)
+				}],
+				pointerup: release,
+				pointercancel: release,
+			})
+		)
+	})
+
+	const vector = $vector.get()
+	const innerstyle = `width: ${range.x * 100}%;`
+	const outerstyle = `width: ${range.y * 100}%;`
+
+	const framestyle = (factor: number) => {
+		const f = factor * 0.5
+		const x = f * vector.x * 100
+		const y = f * vector.y * 100
+		return `
+			transform-origin: center center;
+			transform: translate(${x}%, ${y}%);
+		`
+	}
+
+	return html`
+ 		<div class=frame>
+ 			<div class=inner style="${innerstyle}"></div>
+ 		</div>
+
+ 		<div class=frame>
+ 			<div class=outer style="${outerstyle}"></div>
+ 		</div>
+
+ 		<div class=frame>
+ 			<div class=stickbase></div>
+ 		</div>
+
+ 		<div class=frame style="${framestyle(0.5)}">
+ 			<div class=stickunder></div>
+ 		</div>
+
+ 		<div class=frame style="${framestyle(1.0)}">
+ 			<div class=stick></div>
+ 		</div>
+	`
+})
+
+export class NubStick extends (
+	NubStickView
+		.component(class extends BaseElement {
+			readonly device = new StickDevice()
+		})
+		.props(el => [el.device])
+) {}
+

package/s/nubs/stick/style.css.ts

@@ -0,0 +1,70 @@
+
+import {css} from "lit"
+export default css`
+
+:host {
+	--nub-size: 60%;
+	--nub-color: #fff8;
+
+	position: relative;
+	display: block;
+
+	cursor: default;
+	user-select: none;
+
+	width: 6em;
+	height: auto;
+	aspect-ratio: 1 / 1;
+
+	background: #0008;
+	border-radius: 100%;
+	outline: 1px solid color-mix(in srgb, transparent, var(--nub-color) 10%);
+}
+
+:host * {
+	pointer-events: none;
+}
+
+.frame {
+	position: absolute;
+	inset: 0;
+	margin: auto;
+
+	width: 100%;
+	height: auto;
+	aspect-ratio: 1 / 1;
+
+	> div {
+		position: absolute;
+		inset: 0;
+		margin: auto;
+		width: var(--nub-size);
+		height: auto;
+		aspect-ratio: 1 / 1;
+		border-radius: 100%;
+	}
+}
+
+.inner {
+	outline: 1px solid color-mix(in srgb, transparent, var(--nub-color) 10%);
+}
+
+.outer {
+	outline: 1px solid color-mix(in srgb, transparent, var(--nub-color) 10%);
+}
+
+.stickbase {
+	display: none;
+	background: color-mix(in srgb, transparent, var(--nub-color) 25%);
+}
+
+.stickunder {
+	background: color-mix(in srgb, transparent, var(--nub-color) 50%);
+}
+
+.stick {
+	background: #fff8;
+}
+
+`
+

package/s/nubs/{virtual-gamepad/view.ts → vpad/component.ts}

@@ -1,18 +1,18 @@
 
 import {html} from "lit"
-import {view} from "@e280/sly"
+import {BaseElement, view} from "@e280/sly"
 import {ev, MapG} from "@e280/stz"
 
 import stylesCss from "./styles.css.js"
 
-import {NubStick} from "../stick/view.js"
+import {NubStick} from "../stick/component.js"
 import {GamepadInputs} from "./utils/gamepad-inputs.js"
 import {touchTracking} from "./utils/touch-tracking.js"
-import {VirtualGamepadController} from "../../core/controllers/standard/virtual-gamepad.js"
+import {VpadDevice} from "../../core/devices/standard/vpad.js"
 import {preventDefaultTouchShenanigans} from "./utils/prevent-default-touch-shenanigans.js"
 
-export const VirtualGamepad = view(use => (controller: VirtualGamepadController) => {
-	use.name("virtual-gamepad")
+const NubVpadView = view(use => (device: VpadDevice) => {
+	use.name("nub-vpad")
 	use.css(stylesCss)
 
 	const buttons = use.once(() => new Set<HTMLButtonElement>())
@@ -38,11 +38,11 @@ export const VirtualGamepad = view(use => (controller: VirtualGamepadController)
 		buttons,
 		touchdown: button => {
 			const code = codes.require(button)
-			controller.setSample(code, 1)
+			device.setSample(code, 1)
 		},
 		touchup: button => {
 			const code = codes.require(button)
-			controller.setSample(code, 0)
+			device.setSample(code, 0)
 		},
 	}))
 
@@ -121,19 +121,29 @@ export const VirtualGamepad = view(use => (controller: VirtualGamepadController)
 			<div class="left side">
 				${renderLeftShoulder()}
 				${renderDPad()}
-				${NubStick
+				${NubStick.view
+					.props(device.stickLeft)
 					.attr("class", "stick")
-					.props(controller.stickLeft)}
+					.render()}
 			</div>
 
 			<div class="right side">
 				${renderRightShoulder()}
 				${renderButtonPad()}
-				${NubStick
+				${NubStick.view
+					.props(device.stickRight)
 					.attr("class", "stick")
-					.props(controller.stickRight)}
+					.render()}
 			</div>
 		</div>
 	`
 })
 
+export class NubVpad extends (
+	NubVpadView
+		.component(class extends BaseElement {
+			readonly device = new VpadDevice()
+		})
+		.props(el => [el.device])
+) {}
+

package/s/nubs/{virtual-gamepad → vpad}/styles.css.ts

@@ -131,3 +131,4 @@ button {
 }
 
 `
+

package/s/utils/circular-clamp.ts

@@ -0,0 +1,15 @@
+
+import {Scalar, Vec2, Xy} from "@benev/math"
+
+export function circularClamp(vector: Xy, range: Vec2) {
+	const v = Vec2.from(vector)
+	const distance = v.distance_(0, 0)
+	const modifiedDistance = Scalar.remap(
+		distance,
+		range.x, range.y,
+		0, 1,
+		true,
+	)
+	return v.normalize().multiplyBy(modifiedDistance)
+}
+

package/s/utils/dispensers.ts

@@ -0,0 +1,20 @@
+
+import {Dispenser, range} from "@e280/stz"
+
+const palette = (n: number) => range(n).map(i => {
+	const d = (i * (360 / n)) + 180
+	return `hsl(${d % 360}deg, 100%, 50%)`
+})
+
+export class ColorDispenser extends Dispenser<string> {
+	constructor() {
+		super(() => palette(12))
+	}
+}
+
+export class LetterDispenser extends Dispenser<string> {
+	constructor() {
+		super(() => [..."abcdefghijklmnopqrstuvwxyz"])
+	}
+}
+

package/s/utils/split-axis.ts

@@ -1,7 +1,15 @@
 
+import {Xy} from "@benev/math"
+
 export function splitAxis(n: number) {
 	return (n >= 0)
-		? [0, n]
-		: [Math.abs(n), 0]
+		? [n, 0]
+		: [0, Math.abs(n)]
+}
+
+export function splitVector(vector: Xy) {
+	const [right, left] = splitAxis(vector.x)
+	const [down, up] = splitAxis(vector.y)
+	return {up, down, left, right}
 }
 

package/x/core/bindings/action.d.ts

@@ -1,7 +1,9 @@
 export declare class Action {
     #private;
-    static update(action: Action, value: number): void;
+    on: import("@e280/stz").Sub<[Action]>;
+    onDown: import("@e280/stz").Sub<[Action]>;
     get value(): number;
+    set value(v: number);
     get previous(): number;
     get changed(): boolean;
     get pressed(): boolean;

package/x/core/bindings/action.js

@@ -1,12 +1,20 @@
+import { sub } from "@e280/stz";
 import { isPressed } from "./parts/is-pressed.js";
 export class Action {
+    on = sub();
+    onDown = sub();
     #value = 0;
     #previous = 0;
-    static update(action, value) {
-        action.#previous = action.#value;
-        action.#value = value;
+    get value() {
+        return this.#value;
+    }
+    set value(v) {
+        this.#previous = this.#value;
+        this.#value = v;
+        this.on.publish(this);
+        if (this.down)
+            this.onDown.publish(this);
     }
-    get value() { return this.#value; }
     get previous() { return this.#previous; }
     get changed() { return this.#value !== this.#previous; }
     get pressed() { return isPressed(this.#value); }

package/x/core/bindings/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../s/core/bindings/action.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAE/C,MAAM,OAAO,MAAM;IAClB,MAAM,GAAG,CAAC,CAAA;IACV,SAAS,GAAG,CAAC,CAAA;IAEb,MAAM,CAAC,MAAM,CAAC,MAAc,EAAE,KAAa;QAC1C,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;QAChC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAA,CAAC,CAAC;IAClC,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACxC,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACvD,IAAI,OAAO,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC1E,IAAI,EAAE,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;CACxE"}
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../s/core/bindings/action.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAC7B,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAE/C,MAAM,OAAO,MAAM;IAClB,EAAE,GAAG,GAAG,EAAY,CAAA;IACpB,MAAM,GAAG,GAAG,EAAY,CAAA;IAExB,MAAM,GAAG,CAAC,CAAA;IACV,SAAS,GAAG,CAAC,CAAA;IAEb,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,MAAM,CAAA;IACnB,CAAC;IAED,IAAI,KAAK,CAAC,CAAS;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;QAEf,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACxC,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACvD,IAAI,OAAO,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC1E,IAAI,EAAE,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;CACxE"}

package/x/core/bindings/parts/defaults.js

@@ -10,7 +10,9 @@ function defaultCodeSettings() {
     return {
         scale: 1,
         invert: false,
-        deadzone: 0.2,
+        range: null,
+        bottom: null,
+        top: null,
         timing: ["direct"],
     };
 }

package/x/core/bindings/parts/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/defaults.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,UAAU,gBAAgB,CAAC,CAAC,EAAC,EAAC,QAAQ,CAAO;IAClD,OAAO;QACN,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,CAAC;KAC1C,CAAA;AACF,CAAC;AAED,SAAS,mBAAmB;IAC3B,OAAO;QACN,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,GAAG;QACb,MAAM,EAAE,CAAC,QAAQ,CAAC;KAClB,CAAA;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAiC,EAAE;IAClE,OAAO;QACN,GAAG,mBAAmB,EAAE;QACxB,GAAG,OAAO;KACV,CAAA;AACF,CAAC"}
+{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/defaults.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,UAAU,gBAAgB,CAAC,CAAC,EAAC,EAAC,QAAQ,CAAO;IAClD,OAAO;QACN,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,CAAC;KAC1C,CAAA;AACF,CAAC;AAED,SAAS,mBAAmB;IAC3B,OAAO;QACN,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,QAAQ,CAAC;KAClB,CAAA;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAiC,EAAE;IAClE,OAAO;QACN,GAAG,mBAAmB,EAAE;QACxB,GAAG,OAAO;KACV,CAAA;AACF,CAAC"}

package/x/core/bindings/parts/lens-algo.js

@@ -2,15 +2,22 @@ import { pipe } from "@e280/stz";
 import { Scalar } from "@benev/math";
 import { isPressed } from "./is-pressed.js";
 import { defaultHoldTime } from "./defaults.js";
-export const lensAlgo = (now, state, v) => pipe(v).line(function deadzone(value) {
-    if (value < state.settings.deadzone)
-        return 0;
-    if (value > 1)
-        return value;
-    return Scalar.remap(value, state.settings.deadzone, 1, 0, 1);
+export const lensAlgo = (now, state, v) => pipe(v).line(function clippings(value) {
+    const { settings } = state;
+    if (settings.range) {
+        const [bottom, top] = settings.range;
+        value = Scalar.isBetween(value, bottom, top)
+            ? Scalar.remap(value, bottom, top, 0, 1, true)
+            : 0;
+    }
+    if (settings.bottom)
+        value = Math.max(settings.bottom, value);
+    if (settings.top)
+        value = Math.min(settings.top, value);
+    return value;
 }, function inversion(value) {
     return state.settings.invert
-        ? value * -1
+        ? 1 - value
         : value;
 }, function scaling(value) {
     return state.settings.scale * value;

package/x/core/bindings/parts/lens-algo.js.map

@@ -1 +1 @@
-{"version":3,"file":"lens-algo.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/lens-algo.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAElC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAA;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,GAAW,EACX,KAAgB,EAChB,CAAS,EACR,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAEjB,SAAS,QAAQ,CAAC,KAAK;IACtB,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ;QAClC,OAAO,CAAC,CAAA;IAET,IAAI,KAAK,GAAG,CAAC;QACZ,OAAO,KAAK,CAAA;IAEb,OAAO,MAAM,CAAC,KAAK,CAClB,KAAK,EACL,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAC1B,CAAC,EAAE,CAAC,CACJ,CAAA;AACF,CAAC,EAED,SAAS,SAAS,CAAC,KAAK;IACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM;QAC3B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACZ,CAAC,CAAC,KAAK,CAAA;AACT,CAAC,EAED,SAAS,OAAO,CAAC,KAAK;IACrB,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;AACpC,CAAC,EAED,SAAS,MAAM,CAAC,KAAK;IACpB,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAA;IAExB,MAAM,QAAQ,GAAG,CAChB,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC9B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CACrB,IAAI,eAAe,CAAA;IAEpB,MAAM,gBAAgB,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAA;IACxE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACzE,MAAM,SAAS,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAA;IAErD,IAAI,gBAAgB;QACnB,KAAK,CAAC,SAAS,GAAG,GAAG,CAAA;IAEtB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;IAEvB,QAAQ,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,KAAK,QAAQ;YACZ,OAAO,KAAK,CAAA;QAEb,KAAK,KAAK;YACT,OAAO,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC;gBACvC,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAA;QAEL,KAAK,MAAM;YACV,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;gBACrC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,CAAC,CAAA;QAEL;YACC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;AACF,CAAC,CACD,CAAA"}
+{"version":3,"file":"lens-algo.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/lens-algo.ts"],"names":[],"mappings":"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"}

package/x/core/bindings/resolver.d.ts

@@ -1,8 +1,9 @@
-import { SampleMap } from "../controllers/types.js";
+import { SampleMap } from "./sample-map.js";
 import { Actions, Bindings } from "./types.js";
 export declare class Resolver<B extends Bindings> {
     #private;
-    readonly bindings: B;
-    constructor(bindings: B, modes: Set<keyof B>);
-    poll(now: number, samples: SampleMap): Actions<B>;
+    bindings: B;
+    readonly actions: Actions<B>;
+    constructor(bindings: B);
+    resolve(now: number, modes: Set<keyof B>, sampleMap: SampleMap): Actions<B>;
 }

package/x/core/bindings/resolver.js

@@ -1,37 +1,39 @@
 import { MapG, pub, obMap } from "@e280/stz";
 import { Action } from "./action.js";
+import { SampleMap } from "./sample-map.js";
 import { lensAlgo } from "./parts/lens-algo.js";
 import { tmax, tmin } from "../../utils/quick-math.js";
 import { defaultCodeState } from "./parts/defaults.js";
 export class Resolver {
     bindings;
-    #actions;
+    actions;
+    #modes = new Set();
+    #sampleMap = new SampleMap();
     #now = 0;
-    #samples = new Map();
     #codeStates = new MapG();
     #update = pub();
-    constructor(bindings, modes) {
+    constructor(bindings) {
         this.bindings = bindings;
-        this.#actions = obMap(bindings, (bracket, mode) => obMap(bracket, atom => {
+        this.actions = obMap(bindings, (bracket, mode) => obMap(bracket, atom => {
             const action = new Action();
             this.#update.subscribe(() => {
-                const value = modes.has(mode)
+                action.value = this.#modes.has(mode)
                     ? this.#resolveAtom()(atom)
                     : 0;
-                Action.update(action, value);
             });
             return action;
         }));
     }
-    poll(now, samples) {
+    resolve(now, modes, sampleMap) {
         this.#now = now;
-        this.#samples = samples;
+        this.#modes = modes;
+        this.#sampleMap = sampleMap;
         this.#update();
-        return this.#actions;
+        return this.actions;
     }
     #resolveCode(count, code, settings) {
         const state = this.#codeStates.guarantee(count, () => defaultCodeState(["code", code, settings]));
-        const value = this.#samples.get(code) ?? 0;
+        const value = this.#sampleMap.get(code) ?? 0;
         return lensAlgo(this.#now, state, value);
     }
     #resolveAtom = (context = { count: 0 }) => (atom) => {