pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

include/Spectre/Input/InputEvent.h: Move MouseButton::Type to Mouse class.

Browse source
This commit is contained in:
Henrik Hautakoski 2020-01-24 17:23:44 +01:00
parent b2ca926a00
commit 762d26f368
No known key found for this signature in database
GPG key ID: 96765B12FEAC4745
5 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/Platform/Win32/Win32Mouse.cpp
View file

@ -29,7 +29,7 @@ static RECT GetClientArea(HWND hwnd) {
void Win32Mouse::init()
{
memset(m_state, 0, MouseButton::NUM_MBUTTONS);
memset(m_state, 0, Mouse::Button::NUM_MBUTTONS);
m_tracked = false;
}
@ -38,7 +38,7 @@ Vector2f Win32Mouse::getPosition() const
return m_position;
}
bool Win32Mouse::isButtonDown(MouseButton::Type button) const
bool Win32Mouse::isButtonDown(Mouse::Button button) const
{
return m_state[button];
}
@ -53,26 +53,26 @@ void Win32Mouse::update(InputModule *input)
if (msg.message == WM_LBUTTONDOWN || msg.message == WM_LBUTTONUP) {
InputEvent event(InputEvent::MouseButton);
event.mouseButton.button = MouseButton::Left;
event.mouseButton.button = Mouse::Button::Left;
event.mouseButton.pressed = msg.message == WM_LBUTTONDOWN;
m_state[MouseButton::Left] = event.mouseButton.pressed;
m_state[Mouse::Button::Left] = event.mouseButton.pressed;
input->postInputEvent(event);
} else if (msg.message == WM_RBUTTONDOWN || msg.message == WM_RBUTTONUP) {
InputEvent event(InputEvent::MouseButton);
event.mouseButton.button = MouseButton::Right;
event.mouseButton.button = Mouse::Button::Right;
event.mouseButton.pressed = msg.message == WM_RBUTTONDOWN;
m_state[MouseButton::Right] = event.mouseButton.pressed;
m_state[Mouse::Button::Right] = event.mouseButton.pressed;
input->postInputEvent(event);
} else if (msg.message == WM_MBUTTONDOWN || msg.message == WM_MBUTTONUP) {
InputEvent event(InputEvent::MouseButton);
event.mouseButton.button = MouseButton::Middle;
event.mouseButton.button = Mouse::Button::Middle;
event.mouseButton.pressed = msg.message == WM_MBUTTONDOWN;
m_state[MouseButton::Middle] = event.mouseButton.pressed;
m_state[Mouse::Button::Middle] = event.mouseButton.pressed;
input->postInputEvent(event);
} else if (msg.message == WM_XBUTTONDOWN || msg.message == WM_XBUTTONUP) {
@ -80,10 +80,10 @@ void Win32Mouse::update(InputModule *input)
int btn = GET_XBUTTON_WPARAM(msg.wParam);
InputEvent event(InputEvent::MouseButton);
event.mouseButton.button = btn == XBUTTON1 ? MouseButton::Button1 : MouseButton::Button2;
event.mouseButton.button = btn == XBUTTON1 ? Mouse::Button::Button1 : Mouse::Button::Button2;
event.mouseButton.pressed = msg.message == WM_XBUTTONDOWN;
m_state[MouseButton::Button1] = event.mouseButton.pressed;
m_state[Mouse::Button::Button1] = event.mouseButton.pressed;
input->postInputEvent(event);
} else if (msg.message == WM_MOUSEMOVE) {