@typeonce/ritmo-browser 0.12.0 → 0.14.0

package/dist/Touch.d.ts

@@ -1,17 +1,32 @@
 /**
- * Touch controls over one element: a floating stick, buttons (some of which
- * aim by dragging: tap to use, drag to aim, release to fire), and an optional
- * swipe area that reports how far a finger moved, for turning or camera
- * control (Genshin Impact style: move on the left, swipe anywhere to look).
+ * Touch controls over one element: named floating sticks, buttons (some of
+ * which aim by dragging: tap to use, drag to aim, release to fire), and an
+ * optional swipe area that reports how far a finger moved, for turning or
+ * camera control (Genshin Impact style: move on the left, swipe anywhere to
+ * look).
+ *
+ * A stick's key is the vector it drives and a button's key is the action it
+ * reports, so a twin-stick shooter declares `move` and `aim` sticks and
+ * reads `vectors.move` and `vectors.aim`. Use a stick for a direction the
+ * player holds and changes continuously (walking, aiming a stream of shots);
+ * use a button with `aimRadius` for a direction picked once per use (aim a
+ * throw, release to fire), which reports the aim on the release.
  *
  * The layout is a function of the element's size, so controls stay anchored
  * to corners on any screen. Each finger belongs to the first control it lands
- * on: a button when it lands inside one, otherwise the stick when it lands in
- * the stick's region (the stick then appears under the thumb), otherwise the
- * swipe area when it lands in its region. Fingers that land elsewhere are
- * ignored, and a control keeps its finger until it lifts.
+ * on: a button when it lands inside one, otherwise the first free stick (in
+ * the layout's key order) whose region contains it (the stick then appears
+ * under the thumb), otherwise the swipe area when it lands in its region.
+ * Fingers that land elsewhere are ignored, and a control keeps its finger
+ * until it lifts, so two thumbs drive two sticks at once.
+ *
+ * A control the game hides (a stick for walking while the player drives) is
+ * `null` in the layout. The layout is read again on every snapshot and every
+ * new touch, so a control turning `null` under a held finger releases at
+ * once, as a cancel, and that finger does nothing until it lifts: a thumb
+ * resting on the walking stick does not keep walking a car.
  *
- * Games read one snapshot per update, like keyboard actions: the stick's
+ * Games read one snapshot per update, like keyboard actions: each stick's
  * vector, and per button `held`/`pressed`/`released` edges that survive taps
  * shorter than a frame, plus the drag `aim`, which is still reported on the
  * release. A touch the browser cancels (a system gesture, the window losing
@@ -29,18 +44,19 @@
  * @example
  * ```ts
  * const touch = Touch.actions(canvas, window, ({ width, height }) => ({
- *   // `vector` names the action the stick drives, so it merges into `Controls`.
- *   stick: { region: { left: 0, top: 0, width: width / 2, height }, radius: 60, vector: "move" },
- *   buttons: {
- *     attack: { center: { x: width - 90, y: height - 90 }, radius: 55, aimRadius: 80 },
- *     dash: { center: { x: width - 200, y: height - 60 }, radius: 36 }
- *   }
+ *   // Each stick drives the vector named like its key, so it merges into `Controls`.
+ *   sticks: {
+ *     move: { region: { left: 0, top: 0, width: width / 2, height }, radius: 56 },
+ *     aim: { region: { left: width / 2, top: 0, width: width / 2, height }, radius: 56 }
+ *   },
+ *   buttons: { dash: { center: { x: width - 84, y: height - 150 }, radius: 36 } }
  * }))
  *
  * // Once per update:
  * const { vectors, actions } = touch.snapshot()
  * move(vectors.move)
- * if (actions.attack.released && !actions.attack.cancelled) fire(actions.attack.aim)
+ * if (vectors.aim.active) shoot(vectors.aim)
+ * if (actions.dash.pressed) dash()
  * ```
  *
  * For tests and headless runs, `scripted(...)` plays a timeline of stick
@@ -61,17 +77,24 @@ export interface Rect {
     readonly width: number;
     readonly height: number;
 }
-/** The floating stick of a {@link Layout}. */
-export interface StickZone<V extends string = never> {
+/** One floating stick of a {@link Layout}; it drives the vector named like its key in `sticks`. */
+export interface StickZone {
     /** Where a touch starts the stick. The stick is centered where the thumb lands. */
     readonly region: Rect;
     /** Drag distance in CSS pixels for full tilt. */
     readonly radius: number;
     /** Fraction of `radius` that reads as zero. Defaults to 0.15. */
     readonly deadZone?: number;
-    /** The vector action the stick drives (`"move"`), reported in the snapshot's `vectors`. */
-    readonly vector?: V;
+    /** Not a setting: a stick drives the vector named by its key in `Layout.sticks`. */
+    readonly vector?: "a stick drives the vector named by its key in sticks: remove vector";
 }
+/**
+ * The zone of the stick named `K` in a {@link Layout}: a {@link StickZone}
+ * (`null` while the stick is hidden), or an error naming the cause when a
+ * button has the same name (a name is either a vector a stick drives or an
+ * action a button reports).
+ */
+export type StickNamed<K extends string, B extends string> = K extends B ? `${K} names both a stick and a button: give them different names` : StickZone | null;
 /** A round on-screen button of a {@link Layout}; it reports the action named like its key. */
 export interface ButtonZone {
     readonly center: Position;
@@ -84,17 +107,31 @@ export interface ButtonZone {
 }
 /** The swipe area of a {@link Layout}. */
 export interface SwipeZone {
-    /** Where a touch that is not on a button or the stick starts a swipe. */
+    /** Where a touch that is not on a button or a stick starts a swipe. */
     readonly region: Rect;
 }
 /**
  * The touch controls, returned by the layout function {@link actions} calls
- * with the element's size. The button names are fixed by the first layout.
+ * with the element's size. The stick and button names are fixed by the
+ * first layout; a control the game hides keeps its name with a `null` zone.
  */
 export interface Layout<B extends string, V extends string = never> {
-    readonly stick: StickZone<V>;
+    /**
+     * The floating sticks, each keyed by the vector it drives (`move`, `aim`);
+     * `{}` for buttons only. A finger that is not on a button goes to the
+     * first stick, in key order, that is free and whose region contains it,
+     * so where regions overlap the earlier key wins. `null` hides a stick:
+     * it takes no finger and reports a resting vector.
+     */
+    readonly sticks: {
+        readonly [K in V]: StickNamed<K, B>;
+    };
+    /**
+     * The buttons, each keyed by the action it reports. `null` hides a
+     * button: it takes no finger and reports nothing held.
+     */
     readonly buttons: {
-        readonly [K in B]: ButtonZone;
+        readonly [K in B]: ButtonZone | null;
     };
     /** Optional: fingers here report their movement, for turning or looking around. */
     readonly swipe?: SwipeZone;
@@ -104,12 +141,14 @@ export interface Size {
     readonly width: number;
     readonly height: number;
 }
-/** The stick's state in a snapshot. */
-export interface Stick {
+/**
+ * One stick's state: its vector (tilt with the dead zone removed, zero at
+ * rest, length 1 at full tilt), plus whether a thumb is on it. It is a
+ * `Controls.Vector`, so `Controls` merges it like any vector.
+ */
+export interface StickState extends Vector {
     /** Whether a thumb is on the stick. */
     readonly active: boolean;
-    /** Tilt with the dead zone removed: zero at rest, length 1 at full tilt. */
-    readonly vector: Vector;
 }
 /** One button's state: its action's edges, plus the drag aim and whether the release was cancelled. */
 export interface ButtonState extends ActionState {
@@ -130,35 +169,38 @@ export interface Swipe {
     readonly delta: Vector;
 }
 /**
- * The controls' state. Each button is an action named like it, and the
- * stick drives the vector action its layout names, so the snapshot has the
- * same core as the other devices' (`actions`, `vectors`, and `used`) and
- * `Controls` can merge it.
+ * The controls' state. Each button is an action named like it and each
+ * stick a vector named like it, so the snapshot has the same core as the
+ * other devices' (`actions`, `vectors`, and `used`) and `Controls` can
+ * merge it.
  */
 export interface Snapshot<B extends string, V extends string = never> {
-    readonly stick: Stick;
     readonly actions: {
         readonly [K in B]: ButtonState;
     };
-    /** The vector action the stick drives, when the layout names one: the stick's vector. */
+    /** Each stick's vector, and whether a thumb is on it. */
     readonly vectors: {
-        readonly [K in V]: Vector;
+        readonly [K in V]: StickState;
     };
     readonly swipe: Swipe;
     /**
-     * A button was pressed in this window or is held, or a finger is on the
+     * A button was pressed in this window or is held, or a finger is on a
      * stick or the swipe area: the player is using the touch controls.
      */
     readonly used: boolean;
 }
+/** Where a held stick was centered and where its knob is drawn (on the rim at most). */
+export interface StickView {
+    readonly origin: Position;
+    readonly knob: Position;
+}
 /** Live control positions for drawing, in CSS pixels. Reading it consumes nothing. */
 export interface View<B extends string, V extends string = never> {
     readonly layout: Layout<B, V>;
-    /** Where the stick was centered and where the thumb is, while it is held. */
-    readonly stick: {
-        readonly origin: Position;
-        readonly knob: Position;
-    } | null;
+    /** Each stick while a thumb holds it, `null` otherwise. */
+    readonly sticks: {
+        readonly [K in V]: StickView | null;
+    };
     readonly buttons: {
         readonly [K in B]: {
             readonly held: boolean;
@@ -215,34 +257,42 @@ export interface ActionsOptions {
 }
 /** The names a layout's controls report, for {@link idle} and {@link scripted}. */
 export interface Names<B extends string, V extends string = never> {
+    /** The layout's button keys: the actions they report. */
     readonly buttons: ReadonlyArray<B>;
-    /** The vector action the stick drives, as the layout's `stick.vector`. */
-    readonly vector?: V;
+    /** The layout's stick keys: the vectors they drive (`[]` for buttons only). */
+    readonly sticks: ReadonlyArray<V>;
 }
+/** Rejects a name given both as a stick and as a button. */
+export type DistinctNames<B extends string, V extends string> = [B & V] extends [never] ? unknown : `${B & V} names both a stick and a button: give them different names`;
 /**
  * A snapshot with nothing held, for initializing an input resource before
- * the first capture: pass the layout's button names and stick vector, as
- * `Touch.idle({ buttons: ["attack", "dash"], vector: "move" })`.
+ * the first capture: pass the layout's button and stick names, as
+ * `Touch.idle({ buttons: ["dash"], sticks: ["move", "aim"] })`.
  */
-export declare const idle: <const B extends string, const V extends string = never>(names: Names<B, V>) => Snapshot<B, V>;
+export declare const idle: <const B extends string, const V extends string = never>(names: Names<B, V> & DistinctNames<B, V>) => Snapshot<B, V>;
 /**
  * Starts tracking touches over `target` with the controls `layout` returns
- * for the element's current size (it is read again on every new touch, so a
- * resize takes effect at the next touch). `blurHost` (usually `window`)
- * cancels held controls when the page loses focus. Use `Pointer.actions`
- * for mouse and pen input.
+ * for the element's current size. The layout is read again on every
+ * snapshot and every new touch, so a resize or a control the game hides
+ * (`null`) takes effect at once; keep it cheap, since it runs every update.
+ * A held control that turns `null` releases with `cancelled: true`, and its
+ * finger does nothing until it lifts. `blurHost` (usually `window`) cancels
+ * held controls when the page loses focus. Use `Pointer.actions` for mouse
+ * and pen input.
  */
 export declare const actions: <const B extends string, const V extends string = never>(target: TouchTarget, blurHost: BlurHost, layout: (size: Size) => Layout<B, V>, options?: ActionsOptions) => Actions<B, V>;
 /**
- * Control changes applied just before one snapshot, in this order: the stick
+ * Control changes applied just before one snapshot, in this order: the sticks
  * and swipe, presses, aims, releases. `frame` is the snapshot's index, counting from 0 at
  * the first `snapshot()` call. A button pressed and released in one frame is a
  * tap shorter than a frame.
  */
-export interface TimelineEntry<B extends string> {
+export interface TimelineEntry<B extends string, V extends string = never> {
     readonly frame: number;
-    /** The stick's vector from this frame on; `null` lifts the thumb. */
-    readonly stick?: Vector | null;
+    /** Stick vectors from this frame on, by stick name; `null` lifts the thumb. */
+    readonly sticks?: {
+        readonly [K in V]?: Vector | null;
+    };
     /** A swipe of this many CSS pixels reported by this frame's snapshot only. */
     readonly swipe?: Vector;
     readonly press?: ReadonlyArray<B>;
@@ -255,16 +305,16 @@ export interface TimelineEntry<B extends string> {
     readonly cancel?: ReadonlyArray<B>;
 }
 /** Control changes by snapshot index. Plain data, so it round-trips through JSON. */
-export type Timeline<B extends string> = ReadonlyArray<TimelineEntry<B>>;
+export type Timeline<B extends string, V extends string = never> = ReadonlyArray<TimelineEntry<B, V>>;
 /** Touch controls driven by a timeline instead of an element. */
 export interface Scripted<B extends string, V extends string = never> extends Actions<B, V> {
     /** Number of snapshots taken so far, which is the next frame index. */
     readonly frames: () => number;
 }
 /**
- * Plays `timeline` over controls with `names` (the buttons, and the vector
- * action the stick drives): before the snapshot at index `frame`, every
+ * Plays `timeline` over controls with `names` (the buttons, and the sticks
+ * by the vectors they drive): before the snapshot at index `frame`, every
  * entry for that frame is applied. Vectors longer than 1 are clamped.
  */
-export declare const scripted: <const B extends string, const V extends string = never>(names: Names<B, V>, timeline: Timeline<NoInfer<B>>) => Scripted<B, V>;
+export declare const scripted: <const B extends string, const V extends string = never>(names: Names<B, V> & DistinctNames<B, V>, timeline: Timeline<NoInfer<B>, NoInfer<V>>) => Scripted<B, V>;
 //# sourceMappingURL=Touch.d.ts.map

package/dist/Touch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Touch.d.ts","sourceRoot":"","sources":["../src/Touch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Touch.d.ts","sourceRoot":"","sources":["../src/Touch.ts"],"names":[],"mappings":"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"}

package/dist/Touch.js

@@ -1,19 +1,20 @@
 import { anyUsed } from "./internal/used.js";
-const snapshotOf = (vector, stick, actions, swipe) => ({
-    stick,
-    actions,
-    vectors: (vector === undefined ? {} : { [vector]: stick.vector }),
-    swipe,
-    used: stick.active || swipe.active || anyUsed(actions)
-});
+const snapshotOf = (vectors, actions, swipe) => {
+    let held = false;
+    for (const name in vectors)
+        held ||= vectors[name].active;
+    return { actions, vectors, swipe, used: held || swipe.active || anyUsed(actions) };
+};
 const zero = { x: 0, y: 0 };
+const resting = { x: 0, y: 0, active: false };
 const released = () => ({ held: false, pressed: false, released: false, aim: null, cancelled: false });
+const byName = (names, value) => Object.fromEntries(names.map((name) => [name, value(name)]));
 /**
  * A snapshot with nothing held, for initializing an input resource before
- * the first capture: pass the layout's button names and stick vector, as
- * `Touch.idle({ buttons: ["attack", "dash"], vector: "move" })`.
+ * the first capture: pass the layout's button and stick names, as
+ * `Touch.idle({ buttons: ["dash"], sticks: ["move", "aim"] })`.
  */
-export const idle = (names) => snapshotOf(names.vector, { active: false, vector: zero }, Object.fromEntries(names.buttons.map((button) => [button, released()])), { active: false, delta: zero });
+export const idle = (names) => snapshotOf(byName(names.sticks, () => resting), byName(names.buttons, released), { active: false, delta: zero });
 /** `offset / radius`, clamped to length 1, with the inner `deadZone` fraction mapped to zero. */
 const tilt = (offset, radius, deadZone) => {
     const length = Math.sqrt(offset.x * offset.x + offset.y * offset.y);
@@ -64,10 +65,13 @@ const lift = (track, cancelled) => {
 };
 /**
  * Starts tracking touches over `target` with the controls `layout` returns
- * for the element's current size (it is read again on every new touch, so a
- * resize takes effect at the next touch). `blurHost` (usually `window`)
- * cancels held controls when the page loses focus. Use `Pointer.actions`
- * for mouse and pen input.
+ * for the element's current size. The layout is read again on every
+ * snapshot and every new touch, so a resize or a control the game hides
+ * (`null`) takes effect at once; keep it cheap, since it runs every update.
+ * A held control that turns `null` releases with `cancelled: true`, and its
+ * finger does nothing until it lifts. `blurHost` (usually `window`) cancels
+ * held controls when the page loses focus. Use `Pointer.actions` for mouse
+ * and pen input.
  */
 export const actions = (target, blurHost, layout, options = {}) => {
     const pointerTypes = options.pointerTypes ?? ["touch"];
@@ -76,9 +80,13 @@ export const actions = (target, blurHost, layout, options = {}) => {
         return { width: rect.width, height: rect.height };
     };
     let current = layout(sizeOf());
+    /** The stick zones of the current layout; names that clash with a button do not compile. */
+    const zoneOf = (name) => current.sticks[name];
     const names = Object.keys(current.buttons);
+    const stickNames = Object.keys(current.sticks);
     const buttons = makeButtonTracks(names);
-    let stick;
+    /** The finger and positions of each held stick. */
+    const sticks = new Map();
     /** Which button each finger holds. */
     const fingers = new Map();
     let swipe;
@@ -89,6 +97,31 @@ export const actions = (target, blurHost, layout, options = {}) => {
         return { x: event.clientX - rect.left, y: event.clientY - rect.top };
     };
     const tracked = (event) => pointerTypes.includes(event.pointerType);
+    const stickOf = (pointerId) => {
+        for (const [name, stick] of sticks)
+            if (stick.pointerId === pointerId)
+                return name;
+        return undefined;
+    };
+    /**
+     * Reads the layout again and lets go of the controls it hides: a held
+     * button releases as a cancel, and its finger, like a hidden stick's or
+     * swipe's, is forgotten, so it does nothing until it lifts.
+     */
+    const relayout = () => {
+        current = layout(sizeOf());
+        for (const [pointerId, name] of fingers) {
+            if (current.buttons[name] !== null)
+                continue;
+            fingers.delete(pointerId);
+            lift(buttons.get(name), true);
+        }
+        for (const name of sticks.keys())
+            if (zoneOf(name) === null)
+                sticks.delete(name);
+        if (current.swipe === undefined)
+            swipe = undefined;
+    };
     const onDown = (event) => {
         if (!tracked(event))
             return;
@@ -96,11 +129,13 @@ export const actions = (target, blurHost, layout, options = {}) => {
         // A pointer id that comes down again without an up in between (the up
         // was lost) releases what it held first, as a cancel.
         end(event, true);
-        current = layout(sizeOf());
+        relayout();
         const at = locate(event);
         for (const name of names) {
             const zone = current.buttons[name];
             const button = buttons.get(name);
+            if (zone === null)
+                continue;
             const dx = at.x - zone.center.x;
             const dy = at.y - zone.center.y;
             if (button.held || dx * dx + dy * dy > zone.radius * zone.radius)
@@ -110,8 +145,11 @@ export const actions = (target, blurHost, layout, options = {}) => {
             target.setPointerCapture?.(event.pointerId);
             return;
         }
-        if (stick === undefined && inside(current.stick.region, at)) {
-            stick = { pointerId: event.pointerId, origin: at, knob: at };
+        for (const name of stickNames) {
+            const zone = zoneOf(name);
+            if (zone === null || sticks.has(name) || !inside(zone.region, at))
+                continue;
+            sticks.set(name, { pointerId: event.pointerId, origin: at, knob: at });
             target.setPointerCapture?.(event.pointerId);
             return;
         }
@@ -124,8 +162,9 @@ export const actions = (target, blurHost, layout, options = {}) => {
         if (!tracked(event))
             return;
         const at = locate(event);
-        if (stick !== undefined && stick.pointerId === event.pointerId) {
-            stick.knob = at;
+        const stick = stickOf(event.pointerId);
+        if (stick !== undefined) {
+            sticks.get(stick).knob = at;
             return;
         }
         if (swipe !== undefined && swipe.pointerId === event.pointerId) {
@@ -134,14 +173,16 @@ export const actions = (target, blurHost, layout, options = {}) => {
             return;
         }
         const name = fingers.get(event.pointerId);
-        if (name !== undefined)
-            buttons.get(name).aim = aimOf(current.buttons[name], at);
+        const zone = name === undefined ? null : current.buttons[name];
+        if (name !== undefined && zone !== null)
+            buttons.get(name).aim = aimOf(zone, at);
     };
     const end = (event, cancelled) => {
         if (!tracked(event))
             return;
-        if (stick !== undefined && stick.pointerId === event.pointerId) {
-            stick = undefined;
+        const stick = stickOf(event.pointerId);
+        if (stick !== undefined) {
+            sticks.delete(stick);
             return;
         }
         if (swipe !== undefined && swipe.pointerId === event.pointerId) {
@@ -153,14 +194,15 @@ export const actions = (target, blurHost, layout, options = {}) => {
             return;
         fingers.delete(event.pointerId);
         const button = buttons.get(name);
-        if (!cancelled)
-            button.aim = aimOf(current.buttons[name], locate(event));
+        const zone = current.buttons[name];
+        if (!cancelled && zone !== null)
+            button.aim = aimOf(zone, locate(event));
         lift(button, cancelled);
     };
     const onUp = (event) => end(event, false);
     const onCancel = (event) => end(event, true);
     const onBlur = () => {
-        stick = undefined;
+        sticks.clear();
         swipe = undefined;
         fingers.clear();
         for (const button of buttons.values())
@@ -174,36 +216,43 @@ export const actions = (target, blurHost, layout, options = {}) => {
     target.addEventListener("pointerup", onUp);
     target.addEventListener("pointercancel", onCancel);
     blurHost.addEventListener("blur", onBlur);
-    const stickState = () => {
-        if (stick === undefined)
-            return { active: false, vector: zero };
+    const stickState = (name) => {
+        const stick = sticks.get(name);
+        const zone = zoneOf(name);
+        if (stick === undefined || zone === null)
+            return resting;
         const offset = { x: stick.knob.x - stick.origin.x, y: stick.knob.y - stick.origin.y };
-        return { active: true, vector: tilt(offset, current.stick.radius, current.stick.deadZone ?? 0.15) };
+        const vector = tilt(offset, zone.radius, zone.deadZone ?? 0.15);
+        return { x: vector.x, y: vector.y, active: true };
+    };
+    const stickView = (name) => {
+        const stick = sticks.get(name);
+        const zone = zoneOf(name);
+        if (stick === undefined || zone === null)
+            return null;
+        const radius = zone.radius;
+        const offset = { x: stick.knob.x - stick.origin.x, y: stick.knob.y - stick.origin.y };
+        const length = Math.sqrt(offset.x * offset.x + offset.y * offset.y);
+        const scale = length > radius ? radius / length : 1;
+        return { origin: stick.origin, knob: { x: stick.origin.x + offset.x * scale, y: stick.origin.y + offset.y * scale } };
     };
     return {
         snapshot() {
-            const snapshot = snapshotOf(current.stick.vector, stickState(), Object.fromEntries(names.map((name) => [name, buttonSnapshot(buttons.get(name))])), { active: swipe !== undefined, delta: swiped });
+            relayout();
+            const snapshot = snapshotOf(byName(stickNames, stickState), byName(names, (name) => buttonSnapshot(buttons.get(name))), { active: swipe !== undefined, delta: swiped });
             for (const button of buttons.values())
                 startWindow(button);
             swiped = zero;
             return snapshot;
         },
         view() {
-            const radius = current.stick.radius;
             return {
                 layout: current,
-                stick: stick === undefined
-                    ? null
-                    : (() => {
-                        const offset = { x: stick.knob.x - stick.origin.x, y: stick.knob.y - stick.origin.y };
-                        const length = Math.sqrt(offset.x * offset.x + offset.y * offset.y);
-                        const scale = length > radius ? radius / length : 1;
-                        return { origin: stick.origin, knob: { x: stick.origin.x + offset.x * scale, y: stick.origin.y + offset.y * scale } };
-                    })(),
-                buttons: Object.fromEntries(names.map((name) => {
+                sticks: byName(stickNames, stickView),
+                buttons: byName(names, (name) => {
                     const button = buttons.get(name);
-                    return [name, { held: button.held, aim: button.held ? button.aim : null }];
-                }))
+                    return { held: button.held, aim: button.held ? button.aim : null };
+                })
             };
         },
         dispose() {
@@ -218,12 +267,13 @@ export const actions = (target, blurHost, layout, options = {}) => {
     };
 };
 /**
- * Plays `timeline` over controls with `names` (the buttons, and the vector
- * action the stick drives): before the snapshot at index `frame`, every
+ * Plays `timeline` over controls with `names` (the buttons, and the sticks
+ * by the vectors they drive): before the snapshot at index `frame`, every
  * entry for that frame is applied. Vectors longer than 1 are clamped.
  */
 export const scripted = (names, timeline) => {
     const buttons = names.buttons;
+    const stickNames = names.sticks;
     const byFrame = new Map();
     for (const entry of timeline) {
         const entries = byFrame.get(entry.frame);
@@ -237,11 +287,12 @@ export const scripted = (names, timeline) => {
         return length <= 1 ? vector : { x: vector.x / length, y: vector.y / length };
     };
     const tracks = makeButtonTracks(buttons);
-    let stick = null;
+    /** Each held stick's vector. */
+    const sticks = new Map();
     let frame = 0;
     const layout = {
-        stick: { region: { left: 0, top: 0, width: 0, height: 0 }, radius: 1, ...(names.vector === undefined ? {} : { vector: names.vector }) },
-        buttons: Object.fromEntries(buttons.map((button) => [button, { center: zero, radius: 0 }]))
+        sticks: byName(stickNames, () => ({ region: { left: 0, top: 0, width: 0, height: 0 }, radius: 1 })),
+        buttons: byName(buttons, () => ({ center: zero, radius: 0 }))
     };
     return {
         snapshot() {
@@ -254,8 +305,14 @@ export const scripted = (names, timeline) => {
                     swipe.x += entry.swipe.x;
                     swipe.y += entry.swipe.y;
                 }
-                if (entry.stick !== undefined)
-                    stick = entry.stick === null ? null : clamp(entry.stick);
+                for (const [name, vector] of Object.entries(entry.sticks ?? {})) {
+                    if (vector === undefined || !stickNames.includes(name))
+                        continue;
+                    if (vector === null)
+                        sticks.delete(name);
+                    else
+                        sticks.set(name, clamp(vector));
+                }
                 for (const name of entry.press ?? [])
                     press(tracks.get(name), null);
                 for (const [name, aim] of Object.entries(entry.aim ?? {})) {
@@ -269,16 +326,19 @@ export const scripted = (names, timeline) => {
                     lift(tracks.get(name), true);
             }
             frame += 1;
-            return snapshotOf(names.vector, { active: stick !== null, vector: stick ?? zero }, Object.fromEntries(buttons.map((name) => [name, buttonSnapshot(tracks.get(name))])), { active: swipe.active, delta: { x: swipe.x, y: swipe.y } });
+            return snapshotOf(byName(stickNames, (name) => {
+                const vector = sticks.get(name);
+                return vector === undefined ? resting : { x: vector.x, y: vector.y, active: true };
+            }), byName(buttons, (name) => buttonSnapshot(tracks.get(name))), { active: swipe.active, delta: { x: swipe.x, y: swipe.y } });
         },
         view() {
             return {
                 layout,
-                stick: null,
-                buttons: Object.fromEntries(buttons.map((name) => {
+                sticks: byName(stickNames, () => null),
+                buttons: byName(buttons, (name) => {
                     const track = tracks.get(name);
-                    return [name, { held: track.held, aim: track.held ? track.aim : null }];
-                }))
+                    return { held: track.held, aim: track.held ? track.aim : null };
+                })
             };
         },
         dispose() { },