diff options
| author | JMC47 <JMC4789@gmail.com> | 2021-04-01 01:05:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 01:05:00 -0400 |
| commit | ce8e87c64b271b13a30fbc898b59427d28876a81 (patch) | |
| tree | 969b78c3ba230a74bfc9d953427a65bfd4f50bed /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | |
| parent | 06439a2d40a06179633301e91ee85fa3059506fa (diff) | |
| parent | 28e880efb628598090c715a7783a8dcbbbf18d50 (diff) | |
Merge pull request #8747 from iwubcode/map-freelook
Support controlling Free Look via input bindings (motion controls, gamepad, etc!)
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index a60edc3282..996673becb 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -197,6 +197,11 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar // Mouse Axis, X-/+ and Y-/+ for (int i = 0; i != 4; ++i) AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x)); + + // Relative Mouse, X-/+ and Y-/+ + for (int i = 0; i != 4; ++i) + AddInput(new RelativeMouse(!!(i & 2), !!(i & 1), + (i & 2) ? &m_state.relative_mouse.y : &m_state.relative_mouse.x)); } KeyboardMouse::~KeyboardMouse() @@ -302,6 +307,9 @@ void KeyboardMouse::UpdateInput() XFreeEventData(m_display, &event.xcookie); } + m_state.relative_mouse.x = delta_x; + m_state.relative_mouse.y = delta_y; + // apply axis smoothing m_state.axis.x *= MOUSE_AXIS_SMOOTHING; m_state.axis.x += delta_x; @@ -391,8 +399,20 @@ KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis) name = fmt::format("Axis {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-')); } +KeyboardMouse::RelativeMouse::RelativeMouse(u8 index, bool positive, const float* axis) + : m_axis(axis), m_index(index), m_positive(positive) +{ + name = + fmt::format("RelativeMouse {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-')); +} + ControlState KeyboardMouse::Axis::GetState() const { return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); } + +ControlState KeyboardMouse::RelativeMouse::GetState() const +{ + return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); +} } // namespace ciface::XInput2 |