Add mouse camera inversion support and refactor first-person controller context usage
This commit is contained in:
@@ -198,6 +198,7 @@ import {
|
|||||||
PLAYER_START_GAMEPAD_CAMERA_LOOK_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_GAMEPAD_CAMERA_LOOK_SCENE_DOCUMENT_VERSION,
|
||||||
PLAYER_START_INTERACT_BINDINGS_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_INTERACT_BINDINGS_SCENE_DOCUMENT_VERSION,
|
||||||
PLAYER_START_INPUT_BINDINGS_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_INPUT_BINDINGS_SCENE_DOCUMENT_VERSION,
|
||||||
|
PLAYER_START_MOUSE_INVERT_SCENE_DOCUMENT_VERSION,
|
||||||
PLAYER_START_TARGETING_SETTINGS_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_TARGETING_SETTINGS_SCENE_DOCUMENT_VERSION,
|
||||||
PLAYER_START_NAVIGATION_MODE_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_NAVIGATION_MODE_SCENE_DOCUMENT_VERSION,
|
||||||
PLAYER_START_PAUSE_BINDINGS_SCENE_DOCUMENT_VERSION,
|
PLAYER_START_PAUSE_BINDINGS_SCENE_DOCUMENT_VERSION,
|
||||||
|
|||||||
@@ -510,23 +510,25 @@ export class FirstPersonNavigationController implements NavigationController {
|
|||||||
};
|
};
|
||||||
|
|
||||||
private handleMouseMove = (event: MouseEvent) => {
|
private handleMouseMove = (event: MouseEvent) => {
|
||||||
|
const context = this.context;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!this.pointerLocked ||
|
!this.pointerLocked ||
|
||||||
this.context?.isInputSuspended() === true ||
|
context === null ||
|
||||||
this.context?.isCameraDrivenExternally() === true
|
context.isInputSuspended() === true ||
|
||||||
|
context.isCameraDrivenExternally() === true
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const horizontalMouseLookSign =
|
const horizontalMouseLookSign =
|
||||||
this.context.getRuntimeScene().playerStart?.invertMouseCameraHorizontal ===
|
context.getRuntimeScene().playerStart?.invertMouseCameraHorizontal === true
|
||||||
true
|
|
||||||
? -1
|
? -1
|
||||||
: 1;
|
: 1;
|
||||||
const horizontalMovement = event.movementX * horizontalMouseLookSign;
|
const horizontalMovement = event.movementX * horizontalMouseLookSign;
|
||||||
|
|
||||||
const targetLookResult =
|
const targetLookResult =
|
||||||
this.context?.handleRuntimeTargetLookInput?.({
|
context.handleRuntimeTargetLookInput?.({
|
||||||
horizontal: horizontalMovement,
|
horizontal: horizontalMovement,
|
||||||
vertical: -event.movementY
|
vertical: -event.movementY
|
||||||
}) ?? null;
|
}) ?? null;
|
||||||
|
|||||||
@@ -705,6 +705,7 @@ describe("validateSceneDocument", () => {
|
|||||||
interactionAngleDegrees: Number.NaN,
|
interactionAngleDegrees: Number.NaN,
|
||||||
allowLookInputTargetSwitch: "yes" as unknown as boolean,
|
allowLookInputTargetSwitch: "yes" as unknown as boolean,
|
||||||
targetButtonCyclesActiveTarget: 1 as unknown as boolean,
|
targetButtonCyclesActiveTarget: 1 as unknown as boolean,
|
||||||
|
invertMouseCameraHorizontal: "yes" as unknown as boolean,
|
||||||
movementTemplate: {
|
movementTemplate: {
|
||||||
kind: "invalidTemplate",
|
kind: "invalidTemplate",
|
||||||
moveSpeed: 0,
|
moveSpeed: 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user