@pmndrs/viverse 0.2.1 → 0.2.2

package/dist/{input → action}/screen-joystick.js

@@ -1,24 +1,29 @@
-import { MoveForwardAction, MoveBackwardAction, MoveLeftAction, MoveRightAction, RunAction } from './index.js';
+import { MoveForwardAction, MoveBackwardAction, MoveLeftAction, MoveRightAction, RunAction, } from './index.js';
 const DefaultDeadZonePx = 24;
 const DefaultRunDistancePx = 46;
 const JoystickRadius = 56;
-export class ScreenJoystickInput {
-    abortController = new AbortController();
+export class ScreenJoystickLocomotionActionBindings {
+    abortSignal;
     root;
     handle;
     pointerId;
-    forwardWriter = MoveForwardAction.createWriter(this.abortController.signal);
-    backwardWriter = MoveBackwardAction.createWriter(this.abortController.signal);
-    leftWriter = MoveLeftAction.createWriter(this.abortController.signal);
-    rightWriter = MoveRightAction.createWriter(this.abortController.signal);
-    runWriter = RunAction.createWriter(this.abortController.signal);
-    options = {};
-    constructor(domElement) {
-        const parent = domElement.parentElement ?? domElement;
-        const joy = document.createElement('div');
-        joy.className = 'viverse-joystick mobile-only';
-        parent.appendChild(joy);
-        this.root = joy;
+    forwardWriter;
+    backwardWriter;
+    leftWriter;
+    rightWriter;
+    runWriter;
+    //options
+    runDistancePx;
+    deadZonePx;
+    constructor(domElement, abortSignal) {
+        this.abortSignal = abortSignal;
+        this.forwardWriter = MoveForwardAction.createWriter(this.abortSignal);
+        this.backwardWriter = MoveBackwardAction.createWriter(this.abortSignal);
+        this.leftWriter = MoveLeftAction.createWriter(this.abortSignal);
+        this.rightWriter = MoveRightAction.createWriter(this.abortSignal);
+        this.runWriter = RunAction.createWriter(this.abortSignal);
+        this.root = document.createElement('div');
+        this.root.className = 'viverse-joystick mobile-only';
         this.root.style.position = 'absolute';
         this.root.style.bottom = '24px';
         this.root.style.left = '24px';
@@ -31,10 +36,12 @@ export class ScreenJoystickInput {
         this.root.style.userSelect = 'none';
         this.root.style.setProperty('-webkit-user-select', 'none');
         this.root.style.setProperty('-webkit-touch-callout', 'none');
-        const handle = document.createElement('div');
-        handle.className = 'viverse-joystick-handle';
-        joy.appendChild(handle);
-        this.handle = handle;
+        const parent = domElement.parentElement ?? domElement;
+        parent.appendChild(this.root);
+        this.abortSignal.addEventListener('abort', () => this.root.remove(), { once: true });
+        this.handle = document.createElement('div');
+        this.handle.className = 'viverse-joystick-handle';
+        this.root.appendChild(this.handle);
         this.handle.style.position = 'absolute';
         this.handle.style.left = '50%';
         this.handle.style.top = '50%';
@@ -55,9 +62,9 @@ export class ScreenJoystickInput {
             }
             e.preventDefault();
             e.stopPropagation();
-            joy.setPointerCapture(e.pointerId);
+            this.root.setPointerCapture(e.pointerId);
             this.pointerId = e.pointerId;
-            const rect = joy.getBoundingClientRect();
+            const rect = this.root.getBoundingClientRect();
             const joyCenterX = rect.left + rect.width / 2;
             const joyCenterY = rect.top + rect.height / 2;
             this.updateHandle(e.clientX - joyCenterX, e.clientY - joyCenterY);
@@ -68,7 +75,7 @@ export class ScreenJoystickInput {
             }
             e.preventDefault();
             e.stopPropagation();
-            const rect = joy.getBoundingClientRect();
+            const rect = this.root.getBoundingClientRect();
             const joyCenterX = rect.left + rect.width / 2;
             const joyCenterY = rect.top + rect.height / 2;
             this.updateHandle(e.clientX - joyCenterX, e.clientY - joyCenterY);
@@ -78,26 +85,22 @@ export class ScreenJoystickInput {
                 return;
             }
             this.pointerId = undefined;
-            joy.releasePointerCapture(e.pointerId);
+            this.root.releasePointerCapture(e.pointerId);
             e.preventDefault();
             this.resetHandle();
         };
-        joy.addEventListener('pointerdown', onPointerDown, { signal: this.abortController.signal });
-        joy.addEventListener('pointermove', onPointerMove, { signal: this.abortController.signal });
-        joy.addEventListener('pointerup', onPointerEnd, { signal: this.abortController.signal });
-        joy.addEventListener('pointercancel', onPointerEnd, { signal: this.abortController.signal });
-    }
-    dispose() {
-        this.abortController.abort();
-        this.root.remove();
+        this.root.addEventListener('pointerdown', onPointerDown, { signal: this.abortSignal });
+        this.root.addEventListener('pointermove', onPointerMove, { signal: this.abortSignal });
+        this.root.addEventListener('pointerup', onPointerEnd, { signal: this.abortSignal });
+        this.root.addEventListener('pointercancel', onPointerEnd, { signal: this.abortSignal });
     }
     updateHandle(dx, dy) {
         const distanceToCenter = Math.hypot(dx, dy) || 1;
         const clampedX = (dx / distanceToCenter) * Math.min(distanceToCenter, JoystickRadius);
         const clampedY = (dy / distanceToCenter) * Math.min(distanceToCenter, JoystickRadius);
         this.handle.style.transform = `translate(-50%,-50%) translate(${clampedX}px, ${clampedY}px)`;
-        const deadZone = this.options.deadZonePx ?? DefaultDeadZonePx;
-        const runDistance = this.options.runDistancePx ?? DefaultRunDistancePx;
+        const deadZone = this.deadZonePx ?? DefaultDeadZonePx;
+        const runDistance = this.runDistancePx ?? DefaultRunDistancePx;
         const moveY = distanceToCenter <= deadZone ? 0 : -clampedY / JoystickRadius;
         const moveX = distanceToCenter <= deadZone ? 0 : clampedX / JoystickRadius;
         this.forwardWriter.write(Math.max(0, moveY));

package/dist/action/screen-jump-button.d.ts

@@ -0,0 +1,6 @@
+export declare const defaultScreenButtonStyles: Partial<CSSStyleDeclaration>;
+export declare const jumpButtonImage = "url(\"data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%2024%2024%22%20fill=%22none%22%20stroke=%22%23444%22%20stroke-width=%222%22%20stroke-linecap=%22round%22%20stroke-linejoin=%22round%22%3E%3Cpolyline%20points=%2218%2015%2012%209%206%2015%22/%3E%3C/svg%3E\")";
+export declare class ScreenButtonJumpActionBindings {
+    readonly root: HTMLDivElement;
+    constructor(domElement: HTMLElement, abortSignal: AbortSignal);
+}

package/dist/action/screen-jump-button.js

@@ -0,0 +1,32 @@
+import { JumpAction } from './index.js';
+import { PointerButtonActionBinding } from './pointer.js';
+export const defaultScreenButtonStyles = {
+    position: 'absolute',
+    bottom: '32px',
+    right: '126px',
+    minWidth: '64px',
+    height: '64px',
+    borderRadius: '9999px',
+    pointerEvents: 'auto',
+    touchAction: 'none',
+    userSelect: 'none',
+    background: 'rgba(255,255,255,0.3)',
+    backgroundRepeat: 'no-repeat',
+    backgroundPosition: 'center',
+    backgroundSize: '50%',
+};
+Object.assign(defaultScreenButtonStyles, { '-webkit-user-select': 'none' });
+export const jumpButtonImage = 'url("data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%2024%2024%22%20fill=%22none%22%20stroke=%22%23444%22%20stroke-width=%222%22%20stroke-linecap=%22round%22%20stroke-linejoin=%22round%22%3E%3Cpolyline%20points=%2218%2015%2012%209%206%2015%22/%3E%3C/svg%3E")';
+export class ScreenButtonJumpActionBindings {
+    root;
+    constructor(domElement, abortSignal) {
+        const parent = domElement.parentElement ?? domElement;
+        this.root = document.createElement('div');
+        this.root.className = 'viverse-button viverse-jump mobile-only';
+        parent.appendChild(this.root);
+        abortSignal.addEventListener('abort', () => this.root.remove(), { once: true });
+        Object.assign(this.root.style, defaultScreenButtonStyles);
+        new PointerButtonActionBinding(JumpAction, this.root, abortSignal);
+        this.root.addEventListener('pointerdown', (e) => e.stopPropagation(), { signal: abortSignal });
+    }
+}

package/dist/camera.d.ts

@@ -1,6 +1,6 @@
 import { Object3D, Vector3, Vector3Tuple, Ray } from 'three';
-export declare const FirstPersonCharacterCameraBehavior: SimpleCharacterCameraBehaviorOptions;
-export type SimpleCharacterCameraBehaviorOptions = {
+export declare const FirstPersonCharacterCameraBehavior: CharacterCameraBehaviorOptions;
+export type CharacterCameraBehaviorOptions = {
     /**
      * @default true
      */
@@ -73,6 +73,6 @@ export declare class CharacterCameraBehavior {
     /**
      * @param delta in seconds
      */
-    update(camera: Object3D, target: Object3D, deltaTime: number, raycast?: (ray: Ray, far: number) => number | undefined, options?: SimpleCharacterCameraBehaviorOptions): void;
+    update(camera: Object3D, target: Object3D, deltaTime: number, raycast?: (ray: Ray, far: number) => number | undefined, options?: CharacterCameraBehaviorOptions): void;
     dispose(): void;
 }

package/dist/camera.js

@@ -1,6 +1,6 @@
 import { Vector3, Euler, Ray, Quaternion } from 'three';
 import { clamp } from 'three/src/math/MathUtils.js';
-import { RotatePitchAction, RotateYawAction, ZoomAction } from './input/index.js';
+import { RotatePitchAction, RotateYawAction, ZoomAction } from './action/index.js';
 export const FirstPersonCharacterCameraBehavior = {
     characterBaseOffset: [0, 1.6, 0],
     zoom: { maxDistance: 0, minDistance: 0 },
@@ -77,7 +77,7 @@ export class CharacterCameraBehavior {
         characterWorldPosition.add(chracterBaseOffsetHelper);
         camera.getWorldPosition(deltaHelper);
         deltaHelper.sub(characterWorldPosition);
-        // apply rotation input to rotationYaw and rotationPitch if not disabled or first update
+        // apply rotation actions to rotationYaw and rotationPitch if not disabled or first update
         let rotationOptions = options.rotation ?? true;
         if (!this.firstUpdate && rotationOptions !== false) {
             rotationOptions = rotationOptions === true ? {} : rotationOptions;
@@ -96,7 +96,7 @@ export class CharacterCameraBehavior {
         camera.rotation.set(this.rotationPitch, this.rotationYaw, 0, 'YXZ');
         rayHelper.direction.set(0, 0, 1).applyEuler(camera.rotation);
         rayHelper.origin.copy(characterWorldPosition);
-        // apply zoom input to zoomDistance if not disabled or first update
+        // apply zoom action to zoomDistance if not disabled or first update
         let zoomOptions = options.zoom ?? true;
         if (!this.firstUpdate && zoomOptions !== false) {
             zoomOptions = zoomOptions === true ? {} : zoomOptions;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './utils.js';
-export * from './input/index.js';
+export * from './action/index.js';
 export * from './utils.js';
 export * from './camera.js';
 export * from './physics/index.js';

package/dist/index.js

@@ -1,5 +1,5 @@
 export * from './utils.js';
-export * from './input/index.js';
+export * from './action/index.js';
 export * from './utils.js';
 export * from './camera.js';
 export * from './physics/index.js';

package/dist/simple-character/apply-input-options.d.ts

@@ -1,2 +1,2 @@
-import { SimpleCharacterInputOptions } from './index.js';
-export declare function applySimpleCharacterInputOptions(inputs: Array<unknown>, options?: SimpleCharacterInputOptions): void;
+import { SimpleCharacterActionBindingOptions } from './index.js';
+export declare function applySimpleCharacterActionBindingOptions(actionBindingsList: Array<unknown>, options?: SimpleCharacterActionBindingOptions): void;

package/dist/simple-character/apply-input-options.js

@@ -1,28 +1,34 @@
-import { DefaultJumpKeys, DefaultMoveBackwardKeys, DefaultMoveForwardKeys, DefaultMoveLeftKeys, DefaultMoveRightKeys, DefaultRunKeys, LocomotionKeyboardInput, } from '../input/keyboard.js';
-import { PointerCaptureInput } from '../input/pointer-capture.js';
-import { PointerLockInput } from '../input/pointer-lock.js';
-import { ScreenJoystickInput } from '../input/screen-joystick.js';
-export function applySimpleCharacterInputOptions(inputs, options) {
-    for (const input of inputs) {
-        if (input instanceof ScreenJoystickInput) {
-            input.options.deadZonePx = options?.screenJoystickDeadZonePx;
-            input.options.runDistancePx = options?.screenJoystickRunDistancePx;
+import { DefaultJumpKeys, DefaultMoveBackwardKeys, DefaultMoveForwardKeys, DefaultMoveLeftKeys, DefaultMoveRightKeys, DefaultRunKeys, KeyboardLocomotionActionBindings, } from '../action/keyboard.js';
+import { PointerCaptureRotateZoomActionBindings } from '../action/pointer-capture.js';
+import { PointerLockRotateZoomActionBindings } from '../action/pointer-lock.js';
+import { ScreenJoystickLocomotionActionBindings } from '../action/screen-joystick.js';
+export function applySimpleCharacterActionBindingOptions(actionBindingsList, options) {
+    for (const actionBindings of actionBindingsList) {
+        if (actionBindings instanceof ScreenJoystickLocomotionActionBindings) {
+            actionBindings.deadZonePx = options?.screenJoystickDeadZonePx;
+            actionBindings.runDistancePx = options?.screenJoystickRunDistancePx;
         }
-        if (input instanceof PointerCaptureInput) {
-            input.options.rotationSpeed = options?.pointerCaptureRotationSpeed;
-            input.options.zoomSpeed = options?.pointerCaptureZoomSpeed;
+        if (actionBindings instanceof PointerCaptureRotateZoomActionBindings) {
+            actionBindings.rotationSpeed = options?.pointerCaptureRotationSpeed;
+            actionBindings.zoomSpeed = options?.pointerCaptureZoomSpeed;
         }
-        if (input instanceof PointerLockInput) {
-            input.options.rotationSpeed = options?.pointerLockRotationSpeed;
-            input.options.zoomSpeed = options?.pointerLockZoomSpeed;
+        if (actionBindings instanceof PointerLockRotateZoomActionBindings) {
+            actionBindings.rotationSpeed = options?.pointerLockRotationSpeed;
+            actionBindings.zoomSpeed = options?.pointerLockZoomSpeed;
         }
-        if (input instanceof LocomotionKeyboardInput) {
-            input.forward.options.keys = options?.keyboardMoveForwardKeys ?? DefaultMoveForwardKeys;
-            input.backward.options.keys = options?.keyboardMoveBackwardKeys ?? DefaultMoveBackwardKeys;
-            input.left.options.keys = options?.keyboardMoveLeftKeys ?? DefaultMoveLeftKeys;
-            input.right.options.keys = options?.keyboardMoveRightKeys ?? DefaultMoveRightKeys;
-            input.run.options.keys = options?.keyboardRunKeys ?? DefaultRunKeys;
-            input.jump.options.keys = options?.keyboardJumpKeys ?? DefaultJumpKeys;
+        if (actionBindings instanceof KeyboardLocomotionActionBindings) {
+            actionBindings.moveForwardBinding.keys = options?.keyboardMoveForwardKeys ?? DefaultMoveForwardKeys;
+            actionBindings.moveBackwardBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
+            actionBindings.moveBackwardBinding.keys = options?.keyboardMoveBackwardKeys ?? DefaultMoveBackwardKeys;
+            actionBindings.moveBackwardBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
+            actionBindings.moveLeftBinding.keys = options?.keyboardMoveLeftKeys ?? DefaultMoveLeftKeys;
+            actionBindings.moveLeftBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
+            actionBindings.moveRightBinding.keys = options?.keyboardMoveRightKeys ?? DefaultMoveRightKeys;
+            actionBindings.moveRightBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
+            actionBindings.runBinding.keys = options?.keyboardRunKeys ?? DefaultRunKeys;
+            actionBindings.runBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
+            actionBindings.jumpBinding.keys = options?.keyboardJumpKeys ?? DefaultJumpKeys;
+            actionBindings.jumpBinding.requiresPointerLock = options?.keyboardRequiresPointerLock;
         }
     }
 }

package/dist/simple-character/index.d.ts

@@ -1,6 +1,6 @@
 import { Group, Object3D, Object3DEventMap, AnimationAction } from 'three';
 import { CharacterAnimationOptions } from '../animation/index.js';
-import { CharacterCameraBehavior, SimpleCharacterCameraBehaviorOptions } from '../camera.js';
+import { CharacterCameraBehavior, CharacterCameraBehaviorOptions } from '../camera.js';
 import { CharacterModelOptions, CharacterModel } from '../model/index.js';
 import { BvhCharacterPhysicsOptions, BvhCharacterPhysics, BvhPhysicsWorld } from '../physics/index.js';
 export type SimpleCharacterState = {
@@ -51,7 +51,7 @@ export type SimpleCharacterAnimationOptions = {
     /**
      * @default "movement"
      */
-    yawRotationBasdOn?: 'camera' | 'movement';
+    yawRotationBasedOn?: 'camera' | 'movement';
     /**
      * @default 10
      */
@@ -61,13 +61,14 @@ export type SimpleCharacterAnimationOptions = {
      */
     crossFadeDuration?: number;
 };
-export type SimpleCharacterInputOptions = {
+export type SimpleCharacterActionBindingOptions = {
     screenJoystickRunDistancePx?: number;
     screenJoystickDeadZonePx?: number;
     pointerCaptureRotationSpeed?: number;
     pointerCaptureZoomSpeed?: number;
     pointerLockRotationSpeed?: number;
     pointerLockZoomSpeed?: number;
+    keyboardRequiresPointerLock?: boolean;
     keyboardMoveForwardKeys?: Array<string>;
     keyboardMoveBackwardKeys?: Array<string>;
     keyboardMoveLeftKeys?: Array<string>;
@@ -76,16 +77,24 @@ export type SimpleCharacterInputOptions = {
     keyboardJumpKeys?: Array<string>;
 };
 export type SimpleCharacterOptions = {
+    /**
+     * @deprecated use actionBindings instead
+     */
     readonly input?: ReadonlyArray<{
-        new (domElement: HTMLElement): {
-            dispose(): void;
-        };
+        new (domElement: HTMLElement, abortSignal: AbortSignal): any;
+    }>;
+    readonly actionBindings?: ReadonlyArray<{
+        new (domElement: HTMLElement, abortSignal: AbortSignal): any;
     }>;
-    inputOptions?: SimpleCharacterInputOptions;
+    /**
+     * @deprecated use actionBindingOptions instead
+     */
+    inputOptions?: SimpleCharacterActionBindingOptions;
+    actionBindingOptions?: SimpleCharacterActionBindingOptions;
     movement?: SimpleCharacterMovementOptions;
     readonly model?: CharacterModelOptions | boolean;
     physics?: BvhCharacterPhysicsOptions;
-    cameraBehavior?: SimpleCharacterCameraBehaviorOptions;
+    cameraBehavior?: CharacterCameraBehaviorOptions;
     readonly animation?: SimpleCharacterAnimationOptions;
 };
 export declare class SimpleCharacter extends Group<Object3DEventMap & {
@@ -103,7 +112,6 @@ export declare class SimpleCharacter extends Group<Object3DEventMap & {
     private readonly updateTimeline;
     private readonly graph;
     private readonly abortController;
-    private readonly inputs;
     lastJump: number;
     readonly abortSignal: AbortSignal;
     constructor(camera: Object3D, world: BvhPhysicsWorld, domElement: HTMLElement, options?: SimpleCharacterOptions);

package/dist/simple-character/index.js

@@ -1,20 +1,20 @@
 import { VRM, VRMUtils } from '@pixiv/three-vrm';
 import { runTimeline, GraphTimeline } from '@pmndrs/timeline';
 import { Group, Vector3 } from 'three';
+import { applySimpleCharacterActionBindingOptions } from './apply-input-options.js';
+import { KeyboardLocomotionActionBindings, PointerCaptureRotateZoomActionBindings, ScreenJoystickLocomotionActionBindings, ScreenButtonJumpActionBindings, } from '../action/index.js';
 import { CharacterCameraBehavior } from '../camera.js';
-import { LocomotionKeyboardInput, PointerCaptureInput, ScreenJoystickInput, ScreenJumpButtonInput, } from '../input/index.js';
 import { loadCharacterModel, flattenCharacterModelOptions, } from '../model/index.js';
 import { BvhCharacterPhysics } from '../physics/index.js';
+import { shouldJump } from '../utils.js';
 import { loadSimpleCharacterJumpDownState } from './state/jump-down.js';
 import { loadSimpleCharacterJumpForwardAction, loadSimpleCharacterJumpForwardState } from './state/jump-forward.js';
 import { loadSimpleCharacterJumpLoopState } from './state/jump-loop.js';
 import { loadSimpleCharacterJumpStartState } from './state/jump-start.js';
 import { loadSimpleCharacterJumpUpAction, loadSimpleCharacterJumpUpState } from './state/jump-up.js';
 import { loadSimpleCharacterMovingState } from './state/movement.js';
-import { updateSimpleCharacterInputVelocity } from './update-input-velocity.js';
+import { updateSimpleCharacterVelocity } from './update-input-velocity.js';
 import { updateSimpleCharacterRotation } from './update-rotation.js';
-import { shouldJump } from '../utils.js';
-import { applySimpleCharacterInputOptions } from './apply-input-options.js';
 export class SimpleCharacter extends Group {
     camera;
     world;
@@ -27,7 +27,6 @@ export class SimpleCharacter extends Group {
     updateTimeline;
     graph = new GraphTimeline('moving');
     abortController = new AbortController();
-    inputs;
     lastJump = 0;
     abortSignal = this.abortController.signal;
     constructor(camera, world, domElement, options = {}) {
@@ -35,8 +34,14 @@ export class SimpleCharacter extends Group {
         this.camera = camera;
         this.world = world;
         this.options = options;
-        this.inputs = (options.input ?? [ScreenJoystickInput, ScreenJumpButtonInput, PointerCaptureInput, LocomotionKeyboardInput]).map((Input) => new Input(domElement));
-        applySimpleCharacterInputOptions(this.inputs, options.inputOptions);
+        const actionBindingsList = (options.actionBindings ??
+            options.input ?? [
+            ScreenJoystickLocomotionActionBindings,
+            ScreenButtonJumpActionBindings,
+            PointerCaptureRotateZoomActionBindings,
+            KeyboardLocomotionActionBindings,
+        ]).map((ActionBindings) => new ActionBindings(domElement, this.abortController.signal));
+        applySimpleCharacterActionBindingOptions(actionBindingsList, options.actionBindingOptions ?? options.inputOptions);
         // camera behavior
         this.cameraBehavior = new CharacterCameraBehavior();
         // physics
@@ -81,7 +86,7 @@ export class SimpleCharacter extends Group {
         if (this.model != null) {
             updateSimpleCharacterRotation(delta, this.physics, this.camera, this.model, this.options.animation);
         }
-        updateSimpleCharacterInputVelocity(this.camera, this.physics, this.options.movement);
+        updateSimpleCharacterVelocity(this.camera, this.physics, this.options.movement);
         this.updateTimeline?.(undefined, delta);
         this.model?.mixer.update(delta);
         if (this.model instanceof VRM) {
@@ -94,7 +99,6 @@ export class SimpleCharacter extends Group {
         this.abortController.abort();
         this.parent?.remove(this);
         this.model?.scene.dispatchEvent({ type: 'dispose' });
-        this.inputs.forEach((input) => input.dispose());
         this.cameraBehavior.dispose();
         VRMUtils.deepDispose(this);
     }

package/dist/simple-character/state/jump-start.js

@@ -1,5 +1,5 @@
 import { action, timePassed } from '@pmndrs/timeline';
-import { RunAction } from '../../input/index.js';
+import { RunAction } from '../../action/index.js';
 import { startAnimation } from '../../utils.js';
 import { DefaultCrossFadeDuration, DefaultJumDelay } from '../defaults.js';
 export async function loadSimpleCharacterJumpStartState(jumpUp, jumpForward, state, options) {

package/dist/simple-character/state/movement.js

@@ -1,7 +1,7 @@
 import { action } from '@pmndrs/timeline';
+import { RunAction } from '../../action/index.js';
 import { IdleAnimationUrl, RunAnimationUrl, WalkAnimationUrl } from '../../animation/default.js';
 import { flattenCharacterAnimationOptions, loadCharacterAnimation } from '../../animation/index.js';
-import { RunAction } from '../../input/index.js';
 import { shouldJump, startAnimation } from '../../utils.js';
 import { DefaultCrossFadeDuration } from '../defaults.js';
 export async function loadSimpleCharacterMovingState(state, options) {

package/dist/simple-character/update-input-velocity.d.ts

@@ -1,4 +1,4 @@
 import { Object3D } from 'three';
 import type { SimpleCharacterMovementOptions } from './index.js';
 import type { BvhCharacterPhysics } from '../physics/index.js';
-export declare function updateSimpleCharacterInputVelocity(camera: Object3D, physics: BvhCharacterPhysics, options?: SimpleCharacterMovementOptions): void;
+export declare function updateSimpleCharacterVelocity(camera: Object3D, physics: BvhCharacterPhysics, options?: SimpleCharacterMovementOptions): void;

package/dist/simple-character/update-input-velocity.js

@@ -1,8 +1,8 @@
 import { Euler, Quaternion } from 'three';
-import { RunAction, MoveLeftAction, MoveRightAction, MoveForwardAction, MoveBackwardAction } from '../input/index.js';
+import { RunAction, MoveLeftAction, MoveRightAction, MoveForwardAction, MoveBackwardAction } from '../action/index.js';
 const cameraEuler = new Euler();
 const cameraRotation = new Quaternion();
-export function updateSimpleCharacterInputVelocity(camera, physics, options) {
+export function updateSimpleCharacterVelocity(camera, physics, options) {
     cameraEuler.setFromQuaternion(camera.getWorldQuaternion(cameraRotation), 'YXZ');
     cameraEuler.x = 0;
     cameraEuler.z = 0;

package/dist/simple-character/update-rotation.js

@@ -7,7 +7,7 @@ const inputDirection = new Vector3();
 const quaternion = new Quaternion();
 export function updateSimpleCharacterRotation(delta, physics, camera, model, options) {
     // Character yaw rotation logic
-    const basedOn = options?.yawRotationBasdOn ?? 'movement';
+    const basedOn = options?.yawRotationBasedOn ?? 'movement';
     // compute goalTargetEuler
     if (basedOn === 'camera') {
         goalTargetEuler.setFromQuaternion(camera.getWorldQuaternion(quaternion), 'YXZ');

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { JumpAction } from './input/index.js';
+import { JumpAction } from './action/index.js';
 export function getIsMobileMediaQuery() {
     if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') {
         return undefined;

package/package.json

@@ -21,7 +21,7 @@
   "peerDependencies": {
     "three": "*"
   },
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "dependencies": {
     "@pixiv/three-vrm": "^3.4.2",

package/dist/input/keyboard.d.ts

@@ -1,39 +0,0 @@
-import { EventAction, StateAction } from './index.js';
-export declare class KeyboardInput {
-    private readonly domElement;
-    private readonly abortController;
-    options: Partial<{
-        keys: Array<string>;
-    }>;
-    abortSignal: AbortSignal;
-    private readonly pressedKeys;
-    constructor(domElement: HTMLElement);
-    bindEvent(action: EventAction): void;
-    bindValue(action: StateAction<boolean>): void;
-    bindValue<T>(action: StateAction<T>, map: (value: boolean) => T): void;
-    dispose(): void;
-}
-export type LocomotionKeyboardInputOptions = {
-    keyboardMoveForwardKeys?: Array<string>;
-    keyboardMoveBackwardKeys?: Array<string>;
-    keyboardMoveLeftKeys?: Array<string>;
-    keyboardMoveRightKeys?: Array<string>;
-    keyboardRunKeys?: Array<string>;
-    keyboardJumpKeys?: Array<string>;
-};
-export declare const DefaultMoveForwardKeys: string[];
-export declare const DefaultMoveBackwardKeys: string[];
-export declare const DefaultMoveLeftKeys: string[];
-export declare const DefaultMoveRightKeys: string[];
-export declare const DefaultRunKeys: string[];
-export declare const DefaultJumpKeys: string[];
-export declare class LocomotionKeyboardInput {
-    forward: KeyboardInput;
-    left: KeyboardInput;
-    right: KeyboardInput;
-    backward: KeyboardInput;
-    jump: KeyboardInput;
-    run: KeyboardInput;
-    constructor(domElement: HTMLElement);
-    dispose(): void;
-}

package/dist/input/keyboard.js

@@ -1,96 +0,0 @@
-import { JumpAction, MoveBackwardAction, MoveForwardAction, MoveLeftAction, MoveRightAction, RunAction, } from './index.js';
-export class KeyboardInput {
-    domElement;
-    abortController = new AbortController();
-    options = {};
-    abortSignal = this.abortController.signal;
-    pressedKeys = new Set();
-    constructor(domElement) {
-        this.domElement = domElement;
-    }
-    bindEvent(action) {
-        const isWatched = (e) => this.options.keys == null || this.options.keys.length === 0 || this.options.keys.includes(e.code);
-        this.domElement.addEventListener('keydown', (e) => {
-            if (!isWatched(e) || e.repeat) {
-                return;
-            }
-            action.emit({});
-        }, { signal: this.abortController.signal });
-    }
-    bindValue(action, map) {
-        const writer = action.createWriter(this.abortSignal);
-        const isWatched = (e) => this.options.keys == null || this.options.keys.length === 0 || this.options.keys.includes(e.code);
-        let isPressed = false;
-        const write = (value) => {
-            if (isPressed === value) {
-                return;
-            }
-            isPressed = value;
-            writer.write(map?.(value) ?? value);
-        };
-        this.domElement.tabIndex = 0;
-        this.domElement.addEventListener('keydown', (e) => {
-            if (!isWatched(e)) {
-                return;
-            }
-            const wasEmpty = this.pressedKeys.size === 0;
-            this.pressedKeys.add(e.code);
-            if (wasEmpty && this.pressedKeys.size > 0) {
-                write(true);
-            }
-        }, { signal: this.abortController.signal });
-        this.domElement.addEventListener('keyup', (e) => {
-            if (!isWatched(e)) {
-                return;
-            }
-            if (this.pressedKeys.delete(e.code) && this.pressedKeys.size === 0) {
-                write(false);
-            }
-        }, { signal: this.abortController.signal });
-        // Handle focus loss to clear pressed keys
-        this.domElement.addEventListener('blur', () => {
-            if (this.pressedKeys.size > 0) {
-                this.pressedKeys.clear();
-                write(false);
-            }
-        }, { signal: this.abortController.signal });
-    }
-    dispose() {
-        this.abortController.abort();
-    }
-}
-export const DefaultMoveForwardKeys = ['KeyW'];
-export const DefaultMoveBackwardKeys = ['KeyS'];
-export const DefaultMoveLeftKeys = ['KeyA'];
-export const DefaultMoveRightKeys = ['KeyD'];
-export const DefaultRunKeys = ['ShiftRight', 'ShiftLeft'];
-export const DefaultJumpKeys = ['Space'];
-export class LocomotionKeyboardInput {
-    forward;
-    left;
-    right;
-    backward;
-    jump;
-    run;
-    constructor(domElement) {
-        this.forward = new KeyboardInput(domElement);
-        this.forward.options.keys = DefaultMoveForwardKeys;
-        this.forward.bindValue(MoveForwardAction, (isPressed) => (isPressed ? 1 : 0));
-        this.left = new KeyboardInput(domElement);
-        this.left.options.keys = DefaultMoveLeftKeys;
-        this.left.bindValue(MoveLeftAction, (isPressed) => (isPressed ? 1 : 0));
-        this.right = new KeyboardInput(domElement);
-        this.right.options.keys = DefaultMoveRightKeys;
-        this.right.bindValue(MoveRightAction, (isPressed) => (isPressed ? 1 : 0));
-        this.backward = new KeyboardInput(domElement);
-        this.backward.options.keys = DefaultMoveBackwardKeys;
-        this.backward.bindValue(MoveBackwardAction, (isPressed) => (isPressed ? 1 : 0));
-        this.jump = new KeyboardInput(domElement);
-        this.jump.options.keys = DefaultJumpKeys;
-        this.jump.bindEvent(JumpAction);
-        this.run = new KeyboardInput(domElement);
-        this.run.options.keys = DefaultRunKeys;
-        this.run.bindValue(RunAction);
-    }
-    dispose() { }
-}

package/dist/input/pointer-capture.d.ts

@@ -1,15 +0,0 @@
-/**
- * @requires to manually execute `domElement.setPointerCapture(pointerId)` on pointerdown
- */
-export declare class PointerCaptureInput {
-    private readonly domElement;
-    private readonly abortController;
-    private activePointers;
-    private lastPinchDist;
-    options: {
-        rotationSpeed?: number;
-        zoomSpeed?: number;
-    };
-    constructor(domElement: HTMLElement);
-    dispose(): void;
-}