diff options
author | german <german@thesoftwareartisans.com> | 2020-11-18 05:55:09 +0100 |
---|---|---|
committer | german <german@thesoftwareartisans.com> | 2020-11-26 06:59:30 +0100 |
commit | e46f0e084c73420f8c76c514079952ca0acf1ebe (patch) | |
tree | 9d17776f73ffee5a42e20a7d4b12409e830cce26 /src/yuzu_cmd | |
parent | Merge pull request #4308 from ReinUsesLisp/maxwell-3d-funcs (diff) | |
download | yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar.gz yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar.bz2 yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar.lz yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar.xz yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.tar.zst yuzu-e46f0e084c73420f8c76c514079952ca0acf1ebe.zip |
Diffstat (limited to '')
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 8 | ||||
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 521209622..72ec25c99 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -9,7 +9,7 @@ #include "core/perf_stats.h" #include "input_common/keyboard.h" #include "input_common/main.h" -#include "input_common/motion_emu.h" +#include "input_common/mouse/mouse_input.h" #include "input_common/sdl/sdl.h" #include "yuzu_cmd/emu_window/emu_window_sdl2.h" @@ -30,7 +30,7 @@ EmuWindow_SDL2::~EmuWindow_SDL2() { void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); - input_subsystem->GetMotionEmu()->Tilt(x, y); + input_subsystem->GetMouse()->MouseMove(x, y); } void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { @@ -42,9 +42,9 @@ void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { } } else if (button == SDL_BUTTON_RIGHT) { if (state == SDL_PRESSED) { - input_subsystem->GetMotionEmu()->BeginTilt(x, y); + input_subsystem->GetMouse()->PressButton(x, y, button); } else { - input_subsystem->GetMotionEmu()->EndTilt(); + input_subsystem->GetMouse()->ReleaseButton(button); } } } diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp index 5f35233b5..a103b04bd 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp @@ -17,7 +17,6 @@ #include "core/settings.h" #include "input_common/keyboard.h" #include "input_common/main.h" -#include "input_common/motion_emu.h" #include "video_core/renderer_base.h" #include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h" |