Skip to content

Commit ad92850

Browse files
committed
feat: Refactor input handling by organizing input types and devices into dedicated modules
1 parent 2b3e957 commit ad92850

File tree

14 files changed

+22
-22
lines changed

14 files changed

+22
-22
lines changed

src/core/Game.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { JsonSchema } from "@/core/ecs/JsonSchema";
1212
import { Entity, EntityType } from "@/core/ecs/Entity";
1313
import { SystemConstructor } from "@/core/ecs/System";
1414
import { GameStateConstructor } from "@/core/GameState";
15-
import { GameCommandConstructor } from "@/core/input/GameCommand";
15+
import { GameCommandConstructor } from "@/core/input/commands/GameCommand";
1616
import { Savegame } from "@/core/model/Savegame";
1717

1818
export interface GameConfiguration {

src/core/input/Input.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Vector } from "@/core/math/geometry/Vector";
22
import { InputChannel } from "@/core/input/InputChannel";
3-
import { GamepadInputType } from "@/core/input/GamepadInput";
4-
import { KeyboardInputType } from "@/core/input/KeyboardInput";
5-
import { MouseInputType } from "@/core/input/MouseInput";
6-
import { SwipeInputType } from "@/core/input/SwipeInput";
7-
import { TouchInputType } from "@/core/input/TouchInput";
3+
import { GamepadInputType } from "@/core/input/gamepad/GamepadInput";
4+
import { KeyboardInputType } from "@/core/input/keyboard/KeyboardInput";
5+
import { MouseInputType } from "@/core/input/mouse/MouseInput";
6+
import { SwipeInputType } from "@/core/input/touchpad/SwipeInput";
7+
import { TouchInputType } from "@/core/input/touchpad/TouchInput";
88

99
export type InputType = GamepadInputType | KeyboardInputType | MouseInputType | TouchInputType | SwipeInputType;
1010

src/core/input/InputDevice.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { GameError } from "@/core/GameError";
22
import { Input, InputTypeMap } from "@/core/input/Input";
33
import { InputState, InputStateType } from "@/core/input/InputState";
44
import { InputChannel, InputChannelType } from "@/core/input/InputChannel";
5-
import { GamepadConfig, GamepadDevice } from "@/core/input/GamepadDevice";
6-
import { GamepadInputType } from "@/core/input/GamepadInput";
7-
import { KeyboardDevice } from "@/core/input/KeyboardDevice";
8-
import { KeyboardInputType } from "@/core/input/KeyboardInput";
9-
import { MouseDevice } from "@/core/input/MouseDevice";
10-
import { MouseInputType } from "@/core/input/MouseInput";
11-
import { TouchpadDevice } from "@/core/input/TouchpadDevice";
12-
import { SwipeInputType } from "@/core/input/SwipeInput";
13-
import { TouchInputType } from "@/core/input/TouchInput";
14-
import { GameCommand, GameCommandConstructor } from "@/core/input/GameCommand";
5+
import { GamepadConfig, GamepadDevice } from "@/core/input/gamepad/GamepadDevice";
6+
import { GamepadInputType } from "@/core/input/gamepad/GamepadInput";
7+
import { KeyboardDevice } from "@/core/input/keyboard/KeyboardDevice";
8+
import { KeyboardInputType } from "@/core/input/keyboard/KeyboardInput";
9+
import { MouseDevice } from "@/core/input/mouse/MouseDevice";
10+
import { MouseInputType } from "@/core/input/mouse/MouseInput";
11+
import { TouchpadDevice } from "@/core/input/touchpad/TouchpadDevice";
12+
import { SwipeInputType } from "@/core/input/touchpad/SwipeInput";
13+
import { TouchInputType } from "@/core/input/touchpad/TouchInput";
14+
import { GameCommand, GameCommandConstructor } from "@/core/input/commands/GameCommand";
1515
import { InputBuffer, InputBufferConfig } from "@/core/input/InputBuffer";
1616

1717
export interface InputDeviceConfig {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { InputBinding } from "@/core/input/InputBinding";
1+
import { InputBinding } from "@/core/input/commands/InputBinding";
22

33
export interface GameCommandConstructor {
44
new (): GameCommand;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { GamepadInput, GamepadInputType } from "@/core/input/GamepadInput";
1+
import { GamepadInput, GamepadInputType } from "@/core/input/gamepad/GamepadInput";
22
import { Input } from "@/core/input/Input";
33
import { InputBuffer } from "@/core/input/InputBuffer";
44
import { InputChannel } from "@/core/input/InputChannel";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Input } from "@/core/input/Input";
22
import { InputBuffer } from "@/core/input/InputBuffer";
33
import { InputChannel } from "@/core/input/InputChannel";
44
import { InputState } from "@/core/input/InputState";
5-
import { KeyboardInput, KeyboardInputType } from "@/core/input/KeyboardInput";
5+
import { KeyboardInput, KeyboardInputType } from "@/core/input/keyboard/KeyboardInput";
66

77
export class KeyboardDevice {
88
private keyboard: Map<KeyboardInputType, Input>;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Vector } from "@/core/math/geometry/Vector";
22
import { Input, Pointer } from "@/core/input/Input";
3-
import { MouseInput, MouseInputType } from "@/core/input/MouseInput";
3+
import { MouseInput, MouseInputType } from "@/core/input/mouse/MouseInput";
44
import { Display } from "@/core/graphics/Display";
55
import { GameCoreService } from "@/core/service/GameCoreService";
66
import { InputBuffer } from "@/core/input/InputBuffer";

0 commit comments

Comments
 (0)