Refactor first-person navigation logic and remove explicit pointer lock handling

This commit is contained in:
2026-04-27 18:43:49 +02:00
parent 2d194832aa
commit 1f198aee02
6 changed files with 15 additions and 116 deletions

View File

@@ -510,25 +510,23 @@ export class FirstPersonNavigationController implements NavigationController {
};
private handleMouseMove = (event: MouseEvent) => {
const context = this.context;
if (
!this.pointerLocked ||
context === null ||
context.isInputSuspended() === true ||
context.isCameraDrivenExternally() === true
this.context?.isInputSuspended() === true ||
this.context?.isCameraDrivenExternally() === true
) {
return;
}
const horizontalMouseLookSign =
context.getRuntimeScene().playerStart?.invertMouseCameraHorizontal === true
this.context.getRuntimeScene().playerStart?.invertMouseCameraHorizontal ===
true
? -1
: 1;
const horizontalMovement = event.movementX * horizontalMouseLookSign;
const targetLookResult =
context.handleRuntimeTargetLookInput?.({
this.context?.handleRuntimeTargetLookInput?.({
horizontal: horizontalMovement,
vertical: -event.movementY
}) ?? null;

View File

@@ -969,56 +969,13 @@ export class RuntimeHost {
this.runtimeMessageHandler?.(message);
},
setPlayerControllerTelemetry: (telemetry) => {
const pointerLockReleasedWithEscapeTargetClear =
this.currentPlayerControllerTelemetry?.pointerLocked === true &&
telemetry !== null &&
telemetry.pointerLocked === false &&
this.activeController === this.thirdPersonController &&
this.activeRuntimeTargetReference !== null &&
this.resolveRuntimePlayerInputBindings().keyboard.clearTarget ===
"Escape";
this.currentPlayerControllerTelemetry = telemetry;
this.currentPlayerAudioHooks = telemetry?.hooks.audio ?? null;
if (pointerLockReleasedWithEscapeTargetClear) {
this.clearActiveRuntimeTarget();
this.requestRuntimePointerLock();
}
this.playerControllerTelemetryHandler?.(telemetry);
}
};
}
private requestRuntimePointerLock() {
if (
document.pointerLockElement === this.domElement ||
(this.activeController !== this.firstPersonController &&
this.activeController !== this.thirdPersonController)
) {
return;
}
const pointerLockCapableElement = this.domElement as HTMLCanvasElement & {
requestPointerLock?: () => void | Promise<void>;
};
if (typeof pointerLockCapableElement.requestPointerLock !== "function") {
return;
}
try {
const pointerLockResult = pointerLockCapableElement.requestPointerLock();
if (pointerLockResult instanceof Promise) {
pointerLockResult.catch(() => {});
}
} catch {
// Browser Escape handling can reject immediate recapture; clearing wins.
}
}
private resolvePlayerVolumeState(feetPosition: {
x: number;
y: number;