diff options
| author | 2020-09-25 17:58:27 -0500 | |
|---|---|---|
| committer | 2020-09-25 17:59:52 -0500 | |
| commit | 297823239026d1b5487f9b07f63646ca4a2e3a79 (patch) | |
| tree | a08b8f0930f4a46d6853fb66d33bf15073613c0b /src/input_common/main.cpp | |
| parent | Add random motion input to SDL (diff) | |
| download | yuzu-297823239026d1b5487f9b07f63646ca4a2e3a79.tar.gz yuzu-297823239026d1b5487f9b07f63646ca4a2e3a79.tar.xz yuzu-297823239026d1b5487f9b07f63646ca4a2e3a79.zip | |
Add random motion input to keyboard
Diffstat (limited to 'src/input_common/main.cpp')
| -rw-r--r-- | src/input_common/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 8da829132..3d97d95f7 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "input_common/keyboard.h" | 11 | #include "input_common/keyboard.h" |
| 12 | #include "input_common/main.h" | 12 | #include "input_common/main.h" |
| 13 | #include "input_common/motion_emu.h" | 13 | #include "input_common/motion_emu.h" |
| 14 | #include "input_common/motion_from_button.h" | ||
| 14 | #include "input_common/touch_from_button.h" | 15 | #include "input_common/touch_from_button.h" |
| 15 | #include "input_common/udp/client.h" | 16 | #include "input_common/udp/client.h" |
| 16 | #include "input_common/udp/udp.h" | 17 | #include "input_common/udp/udp.h" |
| @@ -32,6 +33,8 @@ struct InputSubsystem::Impl { | |||
| 32 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); | 33 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); |
| 33 | Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", | 34 | Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", |
| 34 | std::make_shared<AnalogFromButton>()); | 35 | std::make_shared<AnalogFromButton>()); |
| 36 | Input::RegisterFactory<Input::MotionDevice>("keyboard", | ||
| 37 | std::make_shared<MotionFromButton>()); | ||
| 35 | motion_emu = std::make_shared<MotionEmu>(); | 38 | motion_emu = std::make_shared<MotionEmu>(); |
| 36 | Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu); | 39 | Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu); |
| 37 | Input::RegisterFactory<Input::TouchDevice>("touch_from_button", | 40 | Input::RegisterFactory<Input::TouchDevice>("touch_from_button", |
| @@ -50,6 +53,7 @@ struct InputSubsystem::Impl { | |||
| 50 | 53 | ||
| 51 | void Shutdown() { | 54 | void Shutdown() { |
| 52 | Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); | 55 | Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); |
| 56 | Input::UnregisterFactory<Input::MotionDevice>("keyboard"); | ||
| 53 | keyboard.reset(); | 57 | keyboard.reset(); |
| 54 | Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); | 58 | Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); |
| 55 | Input::UnregisterFactory<Input::MotionDevice>("motion_emu"); | 59 | Input::UnregisterFactory<Input::MotionDevice>("motion_emu"); |