@diffenderfer-games/hub 2.0.0-next.0 → 2.0.0-next.2

package/src/input/source-values.ts

@@ -1,116 +1,116 @@
-/**
- * An input's raw 0..1 value from the device state: the strongest of its
- * sources. Keyboard and touch always count; mouse and gamepad only while
- * they are the active pointer.
- */
-import type { DeviceState } from './device-state';
-import { AXIS_DEADZONE } from './gamepad';
-import type { AxisSide, GamepadMapping, InputDef, InputSource, MouseMapping, TouchMapping } from './types';
-
-/** Clamp to 0..1. */
-export function clampUnit(amount: number): number {
-  return Math.min(1, Math.max(0, amount));
-}
-
-/** The pointer's position from screen centre on an axis, as 0..1 on one side. */
-function centreValue(state: DeviceState, axis: 'x' | 'y', side: AxisSide | undefined): number {
-  const fraction = axis === 'x' ? state.pointerX / window.innerWidth : state.pointerY / window.innerHeight;
-  const signed = (fraction - 0.5) * 2;
-  return clampUnit(side === '-' ? -signed : signed);
-}
-
-/** A signed amount read on one side. */
-function onSide(amount: number, side: AxisSide | undefined): number {
-  return side === '-' ? -amount : amount;
-}
-
-function mouseValue(state: DeviceState, mapping: MouseMapping): number {
-  let strongest = 0;
-  if (mapping.button !== undefined && state.heldMouseButtons.has(mapping.button)) {
-    strongest = 1;
-  }
-  if (mapping.dblclick === true && state.isPulseActive('mouse:dbl')) {
-    strongest = 1;
-  }
-  if (mapping.centerAxis !== undefined) {
-    strongest = Math.max(strongest, centreValue(state, mapping.centerAxis, mapping.centerSide));
-  }
-  if (mapping.moveAxis !== undefined) {
-    const moved = mapping.moveAxis === 'x' ? state.movement.dx : state.movement.dy;
-    strongest = Math.max(strongest, clampUnit(onSide(moved, mapping.moveSign) * (mapping.moveScale ?? 0.1)));
-  }
-  if (mapping.wheel !== undefined) {
-    strongest = Math.max(strongest, clampUnit(onSide(state.wheel.dy, mapping.wheel)));
-  }
-  return strongest;
-}
-
-function gamepadValue(state: DeviceState, mapping: GamepadMapping): number {
-  let strongest = 0;
-  for (const pad of state.gamepads) {
-    if (mapping.button !== undefined) {
-      const button = pad.buttons[mapping.button];
-      if (button !== undefined) {
-        strongest = Math.max(strongest, button.value > 0 ? button.value : Number(button.pressed));
-      }
-    }
-    if (mapping.axis !== undefined) {
-      const [axisIndex, half] = mapping.axis;
-      const deflection = pad.axes[axisIndex] ?? 0;
-      const reading = half === '±' ? Math.abs(deflection) : Math.max(0, half === '+' ? deflection : -deflection);
-      if (Math.abs(deflection) > AXIS_DEADZONE) {
-        strongest = Math.max(strongest, clampUnit(reading));
-      }
-    }
-  }
-  return strongest;
-}
-
-function stickValue(state: DeviceState, mapping: TouchMapping): number {
-  const stick = mapping.stick === undefined ? undefined : state.sticks.get(mapping.stick);
-  if (stick === undefined) {
-    return 0;
-  }
-  const readings: Record<NonNullable<TouchMapping['axis']>, number> = {
-    'x+': Math.max(0, stick.outX),
-    'x-': Math.max(0, -stick.outX),
-    'y+': Math.max(0, stick.outY),
-    'y-': Math.max(0, -stick.outY),
-    x: Math.abs(stick.outX),
-    y: Math.abs(stick.outY),
-  };
-  return mapping.axis === undefined ? 0 : readings[mapping.axis];
-}
-
-function touchValue(state: DeviceState, mapping: TouchMapping): number {
-  let strongest = clampUnit(stickValue(state, mapping));
-  if (mapping.button !== undefined && state.pressedVirtualButtons.has(mapping.button)) {
-    strongest = 1;
-  }
-  if (mapping.tap === true && state.isPulseActive('tap')) {
-    strongest = 1;
-  }
-  if (mapping.centerAxis !== undefined) {
-    // The last touch position (touch moves the pointer too).
-    strongest = Math.max(strongest, centreValue(state, mapping.centerAxis, mapping.centerSide));
-  }
-  return strongest;
-}
-
-/** An input's raw value now, given the active pointer. */
-export function readRawValue(state: DeviceState, definition: InputDef, activeSource: InputSource): number {
-  let strongest = 0;
-  if (definition.keys?.some((key) => state.heldKeys.has(key.toLowerCase())) === true) {
-    strongest = 1;
-  }
-  if (definition.mouse !== undefined && activeSource === 'mouse') {
-    strongest = Math.max(strongest, mouseValue(state, definition.mouse));
-  }
-  if (definition.gamepad !== undefined && activeSource === 'gamepad') {
-    strongest = Math.max(strongest, gamepadValue(state, definition.gamepad));
-  }
-  if (definition.touch !== undefined) {
-    strongest = Math.max(strongest, touchValue(state, definition.touch));
-  }
-  return clampUnit(strongest);
-}
+/**
+ * An input's raw 0..1 value from the device state: the strongest of its
+ * sources. Keyboard and touch always count; mouse and gamepad only while
+ * they are the active pointer.
+ */
+import type { DeviceState } from './device-state';
+import { AXIS_DEADZONE } from './gamepad';
+import type { AxisSide, GamepadMapping, InputDef, InputSource, MouseMapping, TouchMapping } from './types';
+
+/** Clamp to 0..1. */
+export function clampUnit(amount: number): number {
+  return Math.min(1, Math.max(0, amount));
+}
+
+/** The pointer's position from screen centre on an axis, as 0..1 on one side. */
+function centreValue(state: DeviceState, axis: 'x' | 'y', side: AxisSide | undefined): number {
+  const fraction = axis === 'x' ? state.pointerX / window.innerWidth : state.pointerY / window.innerHeight;
+  const signed = (fraction - 0.5) * 2;
+  return clampUnit(side === '-' ? -signed : signed);
+}
+
+/** A signed amount read on one side. */
+function onSide(amount: number, side: AxisSide | undefined): number {
+  return side === '-' ? -amount : amount;
+}
+
+function mouseValue(state: DeviceState, mapping: MouseMapping): number {
+  let strongest = 0;
+  if (mapping.button !== undefined && state.heldMouseButtons.has(mapping.button)) {
+    strongest = 1;
+  }
+  if (mapping.dblclick === true && state.isPulseActive('mouse:dbl')) {
+    strongest = 1;
+  }
+  if (mapping.centerAxis !== undefined) {
+    strongest = Math.max(strongest, centreValue(state, mapping.centerAxis, mapping.centerSide));
+  }
+  if (mapping.moveAxis !== undefined) {
+    const moved = mapping.moveAxis === 'x' ? state.movement.dx : state.movement.dy;
+    strongest = Math.max(strongest, clampUnit(onSide(moved, mapping.moveSign) * (mapping.moveScale ?? 0.1)));
+  }
+  if (mapping.wheel !== undefined) {
+    strongest = Math.max(strongest, clampUnit(onSide(state.wheel.dy, mapping.wheel)));
+  }
+  return strongest;
+}
+
+function gamepadValue(state: DeviceState, mapping: GamepadMapping): number {
+  let strongest = 0;
+  for (const pad of state.gamepads) {
+    if (mapping.button !== undefined) {
+      const button = pad.buttons[mapping.button];
+      if (button !== undefined) {
+        strongest = Math.max(strongest, button.value > 0 ? button.value : Number(button.pressed));
+      }
+    }
+    if (mapping.axis !== undefined) {
+      const [axisIndex, half] = mapping.axis;
+      const deflection = pad.axes[axisIndex] ?? 0;
+      const reading = half === '±' ? Math.abs(deflection) : Math.max(0, half === '+' ? deflection : -deflection);
+      if (Math.abs(deflection) > AXIS_DEADZONE) {
+        strongest = Math.max(strongest, clampUnit(reading));
+      }
+    }
+  }
+  return strongest;
+}
+
+function stickValue(state: DeviceState, mapping: TouchMapping): number {
+  const stick = mapping.stick === undefined ? undefined : state.sticks.get(mapping.stick);
+  if (stick === undefined) {
+    return 0;
+  }
+  const readings: Record<NonNullable<TouchMapping['axis']>, number> = {
+    'x+': Math.max(0, stick.outX),
+    'x-': Math.max(0, -stick.outX),
+    'y+': Math.max(0, stick.outY),
+    'y-': Math.max(0, -stick.outY),
+    x: Math.abs(stick.outX),
+    y: Math.abs(stick.outY),
+  };
+  return mapping.axis === undefined ? 0 : readings[mapping.axis];
+}
+
+function touchValue(state: DeviceState, mapping: TouchMapping): number {
+  let strongest = clampUnit(stickValue(state, mapping));
+  if (mapping.button !== undefined && state.pressedVirtualButtons.has(mapping.button)) {
+    strongest = 1;
+  }
+  if (mapping.tap === true && state.isPulseActive('tap')) {
+    strongest = 1;
+  }
+  if (mapping.centerAxis !== undefined) {
+    // The last touch position (touch moves the pointer too).
+    strongest = Math.max(strongest, centreValue(state, mapping.centerAxis, mapping.centerSide));
+  }
+  return strongest;
+}
+
+/** An input's raw value now, given the active pointer. */
+export function readRawValue(state: DeviceState, definition: InputDef, activeSource: InputSource): number {
+  let strongest = 0;
+  if (definition.keys?.some((key) => state.heldKeys.has(key.toLowerCase())) === true) {
+    strongest = 1;
+  }
+  if (definition.mouse !== undefined && activeSource === 'mouse') {
+    strongest = Math.max(strongest, mouseValue(state, definition.mouse));
+  }
+  if (definition.gamepad !== undefined && activeSource === 'gamepad') {
+    strongest = Math.max(strongest, gamepadValue(state, definition.gamepad));
+  }
+  if (definition.touch !== undefined) {
+    strongest = Math.max(strongest, touchValue(state, definition.touch));
+  }
+  return clampUnit(strongest);
+}

package/src/input/spatial.ts

@@ -1,47 +1,47 @@
-/**
- * Spatial navigation: from one rectangle, the nearest one strictly in a
- * direction. Shared by navigable groups, the hub menu, the catalog launcher
- * and the on-screen keyboard.
- */
-import type { Direction } from './gamepad';
-import type { Rect } from './types';
-
-/** Centres closer than this on the travel axis don't count as "in that direction". */
-const MIN_TRAVEL_PX = 4;
-
-/** The rectangle of a DOM element. */
-export function rectOf(element: Element): Rect {
-  const bounds = element.getBoundingClientRect();
-  return { x: bounds.left, y: bounds.top, width: bounds.width, height: bounds.height };
-}
-
-/** Index of the rectangle nearest `rects[fromIndex]` strictly in `direction`, or -1. Off-axis distance counts double. */
-export function findNearestInDirection(rects: readonly Rect[], fromIndex: number, direction: Direction): number {
-  const from = rects[fromIndex];
-  if (from === undefined) {
-    return -1;
-  }
-  const fromCentreX = from.x + from.width / 2;
-  const fromCentreY = from.y + from.height / 2;
-  const isVertical = direction === 'up' || direction === 'down';
-  let bestIndex = -1;
-  let bestScore = Infinity;
-  rects.forEach((rect, index) => {
-    if (index === fromIndex) {
-      return;
-    }
-    const dx = rect.x + rect.width / 2 - fromCentreX;
-    const dy = rect.y + rect.height / 2 - fromCentreY;
-    const travel = { up: -dy, down: dy, left: -dx, right: dx }[direction];
-    if (travel <= MIN_TRAVEL_PX) {
-      return;
-    }
-    const across = isVertical ? Math.abs(dx) : Math.abs(dy);
-    const score = travel + across * 2;
-    if (score < bestScore) {
-      bestScore = score;
-      bestIndex = index;
-    }
-  });
-  return bestIndex;
-}
+/**
+ * Spatial navigation: from one rectangle, the nearest one strictly in a
+ * direction. Shared by navigable groups, the hub menu, the catalog launcher
+ * and the on-screen keyboard.
+ */
+import type { Direction } from './gamepad';
+import type { Rect } from './types';
+
+/** Centres closer than this on the travel axis don't count as "in that direction". */
+const MIN_TRAVEL_PX = 4;
+
+/** The rectangle of a DOM element. */
+export function rectOf(element: Element): Rect {
+  const bounds = element.getBoundingClientRect();
+  return { x: bounds.left, y: bounds.top, width: bounds.width, height: bounds.height };
+}
+
+/** Index of the rectangle nearest `rects[fromIndex]` strictly in `direction`, or -1. Off-axis distance counts double. */
+export function findNearestInDirection(rects: readonly Rect[], fromIndex: number, direction: Direction): number {
+  const from = rects[fromIndex];
+  if (from === undefined) {
+    return -1;
+  }
+  const fromCentreX = from.x + from.width / 2;
+  const fromCentreY = from.y + from.height / 2;
+  const isVertical = direction === 'up' || direction === 'down';
+  let bestIndex = -1;
+  let bestScore = Infinity;
+  rects.forEach((rect, index) => {
+    if (index === fromIndex) {
+      return;
+    }
+    const dx = rect.x + rect.width / 2 - fromCentreX;
+    const dy = rect.y + rect.height / 2 - fromCentreY;
+    const travel = { up: -dy, down: dy, left: -dx, right: dx }[direction];
+    if (travel <= MIN_TRAVEL_PX) {
+      return;
+    }
+    const across = isVertical ? Math.abs(dx) : Math.abs(dy);
+    const score = travel + across * 2;
+    if (score < bestScore) {
+      bestScore = score;
+      bestIndex = index;
+    }
+  });
+  return bestIndex;
+}