WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 12:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix up some level editor dialog behavior

Browse Source
This commit is contained in:
elasota
2020-02-26 12:17:04 -05:00
parent d617795591
commit cc17911776
23 changed files with 224 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PortabilityLayer/InputManager.cpp
View File

@@ -1,6 +1,7 @@
#include "InputManager.h"
#include "MacRomanConversion.h"
#include "PLKeyEncoding.h"
#include "Vec2i.h"
#include <string.h>
#include <assert.h>
@@ -17,6 +18,7 @@ namespace PortabilityLayer
void ApplyGamepadEvent(const GpGamepadInputEvent &vosEvent) override;
void ApplyMouseEvent(const GpMouseInputEvent &vosEvent) override;
int16_t GetGamepadAxis(unsigned int playerNum, GpGamepadAxis_t gamepadAxis) override;
Vec2i GetMousePosition() const override;
void ClearState() override;
static InputManagerImpl *GetInstance();
@@ -28,6 +30,7 @@ namespace PortabilityLayer
KeyDownStates m_keyMap;
int16_t m_axisStates[PL_INPUT_MAX_PLAYERS][GpGamepadAxes::kCount];
Vec2i m_mousePos;
static InputManagerImpl ms_instance;
};
@@ -53,6 +56,9 @@ namespace PortabilityLayer
void InputManagerImpl::ApplyMouseEvent(const GpMouseInputEvent &vosEvent)
{
m_mousePos.m_x = vosEvent.m_x;
m_mousePos.m_y = vosEvent.m_y;
if (vosEvent.m_eventType == GpMouseEventTypes::kUp || vosEvent.m_eventType == GpMouseEventTypes::kLeave)
this->ApplyEventAsMouseButton(vosEvent, false);
else if (vosEvent.m_eventType == GpMouseEventTypes::kDown)
@@ -66,6 +72,11 @@ namespace PortabilityLayer
return m_axisStates[playerNum][gamepadAxis];
}
Vec2i InputManagerImpl::GetMousePosition() const
{
return m_mousePos;
}
void InputManagerImpl::ClearState()
{
memset(&m_axisStates, 0, sizeof(m_axisStates));
@@ -132,6 +143,7 @@ namespace PortabilityLayer
}
InputManagerImpl::InputManagerImpl()
: m_mousePos(0, 0)
{
memset(m_axisStates, 0, sizeof(m_axisStates));
}