Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix touch controls. #190

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Fix touch controls. #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f86498
Simplify some conditional logic
Gigabyte5671 Oct 3, 2023
80acc49
Create a custom VirtualJoystick implementation
Gigabyte5671 Oct 8, 2023
87ae17a
Colour the joysticks based on the app's theme
Gigabyte5671 Oct 8, 2023
3b75430
Smooth and clip the virtual joystick inputs
Gigabyte5671 Oct 8, 2023
3c503a6
Ignore keyboard inputs when the touch input is active
Gigabyte5671 Oct 8, 2023
0e78eea
Remove unnecessary `alwaysVisible` setting
Gigabyte5671 Oct 8, 2023
9e581b6
Allow the Renderer's canvas and engine to be accessed from outside th…
Gigabyte5671 Oct 8, 2023
0aaaaa3
Merge branch 'master' into fix/touch-input
Gigabyte5671 Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions src/modules/avatar/controller/inputController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ class ArcRotateCameraCustomInput implements ICameraInput<ArcRotateCamera> {
}
};
element?.addEventListener("keydown", (event) => {
if (this._onKeyDown) {
this._onKeyDown(event);
}
this._onKeyDown?.(event);
}, false);
// Define the keyup event handler.
this._onKeyUp = (event: KeyboardEvent) => {
Expand All @@ -103,9 +101,7 @@ class ArcRotateCameraCustomInput implements ICameraInput<ArcRotateCamera> {
}
};
element?.addEventListener("keyup", (event) => {
if (this._onKeyUp) {
this._onKeyUp(event);
}
this._onKeyUp?.(event);
}, false);
// Prevent keys from getting stuck when the window loses focus.
Tools.RegisterTopRootEvents(window, [
Expand All @@ -124,15 +120,11 @@ class ArcRotateCameraCustomInput implements ICameraInput<ArcRotateCamera> {
if (this._onKeyDown || this._onKeyUp) {
// Remove all event listeners.
element?.removeEventListener("keydown", (event) => {
if (this._onKeyDown) {
this._onKeyDown(event);
}
this._onKeyDown?.(event);
});
this._onKeyDown = undefined;
element?.removeEventListener("keyup", (event) => {
if (this._onKeyUp) {
this._onKeyUp(event);
}
this._onKeyUp?.(event);
});
this._onKeyUp = undefined;
Tools.UnregisterTopRootEvents(window, [
Expand Down Expand Up @@ -188,7 +180,7 @@ export class InputController extends ScriptComponent {
private _avatarRoot: Nullable<Vector3> = null;
private _inputState = new InputState();
private _input: Nullable<IInputHandler> = null;
private _isMobile = false;
private _touchInput: Nullable<IInputHandler | VirtualJoystickInput> = null;

@inspector()
private _defaultCameraTarget = new Vector3(0, 1.7, 0);
Expand Down Expand Up @@ -393,10 +385,6 @@ export class InputController extends ScriptComponent {
this._avatarState.state = State.Idle;
this._avatarState.action = Action.Idle;

// Test if browser is a mobile device.
const regexp = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/iu;
this._isMobile = regexp.test(navigator.userAgent);

this._inputState.onCameraCheckCollisionChangedObservable.add(() => {
if (this._camera) {
this._camera.checkCollisions = this._inputState.cameraCheckCollisions;
Expand Down Expand Up @@ -477,28 +465,29 @@ export class InputController extends ScriptComponent {
}

private _attachControl(): void {
// TODO: Make this configurable as a selected input type, influenced by mobile by default.
if (this._isMobile && !(this._input instanceof VirtualJoystickInput)) {
this._input?.detachControl();
this._input = new VirtualJoystickInput(this._avatarState, this._scene);
this._input.attachControl();
} else if (!(this._input instanceof KeyboardInput)) {
if (!(this._input instanceof KeyboardInput)) {
this._input?.detachControl();
this._input = new KeyboardInput(this._avatarState, this._inputState, this._scene);
this._input.attachControl();
}
if (!(this._touchInput instanceof VirtualJoystickInput)) {
this._touchInput?.detachControl();
this._touchInput = new VirtualJoystickInput(this._avatarState, this._scene);
this._touchInput.attachControl();
}
}

private _detachControl(): void {
if (this._input) {
this._input.detachControl();
this._input = null;
}
this._input?.detachControl();
this._input = null;
this._touchInput?.detachControl();
this._touchInput = null;
}

private _handleInput(delta: number): void {
if (this._input) {
this._input.handleInputs(delta);
const touchActive = this._touchInput?.handleInputs(delta); // Touch input should have control priority, so it must be handled first.
if (!touchActive) {
this._input?.handleInputs(delta);
}
}

Expand Down
Loading
Loading