zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 17:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-14 20:15:15 +01:00
parent 957d997353
commit d23b4a7e33
55 changed files with 79 additions and 1376 deletions
Download patch file Download diff file Expand all files Collapse all files

37
source/common/inputstate.h
View file

@ -7,6 +7,8 @@
#include "c_buttons.h"
#include "d_event.h"
#include "osd.h"
#include "m_joy.h"
#include "gamecvars.h"
extern char appactive;
@ -21,8 +23,6 @@ enum
MAXMOUSEBUTTONS = 10,
};
extern bool CONTROL_BindsEnabled;
extern bool g_mouseGrabbed;
extern bool g_mouseEnabled;
extern bool g_mouseInsideWindow;
@ -137,8 +137,6 @@ public:
void SetBindsEnabled(bool on)
{
// This just forwards the setting
CONTROL_BindsEnabled = on;
}
bool keyBufferWaiting()
@ -298,6 +296,12 @@ public:
{
g_mouseAbs = { x, y };
}
bool gamePadActive()
{
// fixme: This needs to be tracked.
return false;
}
int32_t MouseGetButtons(void) { return mouseReadButtons(); }
inline void MouseClearButton(int32_t b) { g_mouseBits &= ~b; }
inline void MouseClearAllButtonss(void) { g_mouseBits = 0; }
@ -313,7 +317,28 @@ public:
};
extern InputState inputState;
inline void CONTROL_GetInput(ControlInfo* info)
{
memset(info, 0, sizeof(ControlInfo));
if (in_mouse)
inputState.GetMouseDelta(info);
if (in_joystick)
{
// Handle joysticks/game controllers.
float joyaxes[NUM_JOYAXIS];
I_GetAxes(joyaxes);
info->dyaw += joyaxes[JOYAXIS_Yaw];
info->dx += joyaxes[JOYAXIS_Side];
info->dz += joyaxes[JOYAXIS_Forward];
info->dpitch += joyaxes[JOYAXIS_Pitch];
}
}