zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/core/inputstate.h

108 lines
1.9 KiB
C
Raw Normal View History

- added an input state class which will contain all game-facing input data state. Having this grouped in a single object will make refactoring a lot easier. Access functions have been provided to avoid changing client code for the reorganization.
2019-10-27 23:24:09 +00:00
#pragma once
- fixed the compile errors and consolidated the key binding CCMDs.
2019-10-28 05:47:49 +00:00
#include <stdint.h>
- removed osd.h as it was merely a minimal wrapper around c_dispatch, giving some alias names. Nothing that's needed when cutting ties to upstream.
2020-07-14 12:00:27 +00:00
#include "compat.h"
#include "printf.h"
#include "c_dispatch.h"
- fixed the compile errors and consolidated the key binding CCMDs.
2019-10-28 05:47:49 +00:00
#include "tarray.h"
WIP
2019-10-28 00:12:31 +00:00
#include "scancodes.h"
- it compiles again (safety commit)
2019-11-03 19:24:50 +00:00
#include "c_bind.h"
- added ZDoom's CCMD code. Not tested yet.
2019-11-04 22:01:50 +00:00
#include "c_buttons.h"
- moved all keyboard related code into the InputState class, so that looking for this stuff is easier. Sadly there's 1ß00 lines of code using this...
2019-11-03 23:53:55 +00:00
#include "d_event.h"
- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.
2019-12-14 19:15:15 +00:00
#include "m_joy.h"
#include "gamecvars.h"
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
#include "packet.h"
- fixed compilation.
2019-11-04 16:58:18 +00:00
- removed osd.h as it was merely a minimal wrapper around c_dispatch, giving some alias names. Nothing that's needed when cutting ties to upstream.
2020-07-14 12:00:27 +00:00
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
struct ControlInfo
{
- make controller input identical across all games. * Convert axes in ControlInfo struct from int32_t to float as what's received from the backend. * Remove all the scale up/down math since we don't need that with floats and replace with float constants that match old behaviour. * Store q16mlook scaling as a constant for use with mouse and upcoming controller code. * Add required controller code to Blood as the only game not to have working controllers. * Fix typos in (gInput.forward > input.forward) for `ctrlGetInput()` in Blood. * Remove use of `scaleAdjustmentToInterval()` on Exhumed and Shadow Warrior as they only process forward/side velocities within the game's ticrate. * Repair angvel/aimvel scaling mistakes from d79a5d256d7593a3633759f302ebc33cc7710ecb. * Scale dyaw and dpitch by 25% for Shadow Warrior as the game runs 25% faster than the other games, leading to faster input.
2020-06-24 13:11:42 +00:00
float dx;
float dy;
float dz;
float dyaw;
float dpitch;
float droll;
- mouse code update. May still need some tweaking of the factors.
2020-09-28 20:36:43 +00:00
float mouseturnx;
float mouseturny;
float mousemovex;
float mousemovey;
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
};
- moved all mouse button handling to the input state Yet again an unbelievable piece of code working around how input works on modern systems to keep the old 90's code alive.
2019-11-04 00:01:54 +00:00
- added an input state class which will contain all game-facing input data state. Having this grouped in a single object will make refactoring a lot easier. Access functions have been provided to avoid changing client code for the reorganization.
2019-10-27 23:24:09 +00:00
class InputState
{
- removed all remaining references to SDL. The Windows version is now fully native.
2019-12-23 19:03:03 +00:00
uint8_t KeyStatus[NUM_KEYS];
- InputState cleanup This removes most of the InputState class because it is no longer used. The only remaining places still checking scan codes are the modifiers for sizeup and sizedown. All the rest was remapped to safer methods. The multiplayer taunts are currently inoperable, they will need support of shift-bindings to get proper support.
2020-08-24 18:34:18 +00:00
bool AnyKeyStatus;
- change mouse input from int to float and adjust games accordingly. * Calculate game-side mousex/mousey divisions into the calculations performed in `InputState::GetMouseDelta()`. * Fix mouse speed when `in_mousesmoothing` is true (wasn't factoring in / 3.f division used in non-true vector. * Standard mouse forward/side movement speeds in Exhumed & SW with that of other games. * Remove `strafeyaw` code from Duke/Exhumed/RR as it's not necessary and was leading to situations where the player would continually keep moving sideways even without input. * Change mouse forward/side velocities to -= current value as is done with controller input and the player's angle/aim velocities.
2020-07-05 02:02:33 +00:00
vec2f_t g_mousePos;
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
- added an input state class which will contain all game-facing input data state. Having this grouped in a single object will make refactoring a lot easier. Access functions have been provided to avoid changing client code for the reorganization.
2019-10-27 23:24:09 +00:00
public:
WIP
2019-10-28 00:12:31 +00:00
bool ShiftPressed()
{
return KeyStatus[sc_LeftShift] || KeyStatus[sc_RightShift];
}
- moved all keyboard related code into the InputState class, so that looking for this stuff is easier. Sadly there's 1ß00 lines of code using this...
2019-11-03 23:53:55 +00:00
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
void AddEvent(const event_t* ev);
- moved all keyboard related code into the InputState class, so that looking for this stuff is easier. Sadly there's 1ß00 lines of code using this...
2019-11-03 23:53:55 +00:00
- change mouse input from int to float and adjust games accordingly. * Calculate game-side mousex/mousey divisions into the calculations performed in `InputState::GetMouseDelta()`. * Fix mouse speed when `in_mousesmoothing` is true (wasn't factoring in / 3.f division used in non-true vector. * Standard mouse forward/side movement speeds in Exhumed & SW with that of other games. * Remove `strafeyaw` code from Duke/Exhumed/RR as it's not necessary and was leading to situations where the player would continually keep moving sideways even without input. * Change mouse forward/side velocities to -= current value as is done with controller input and the player's angle/aim velocities.
2020-07-05 02:02:33 +00:00
void MouseAddToPos(float x, float y)
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
{
g_mousePos.x += x;
g_mousePos.y += y;
}
- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.
2019-12-14 19:15:15 +00:00
- InputState: Make `CONTROL_GetInput()` return an object instead of accepting a pointer and provide to games as a function parameter. * Provide read-only/const results from `CONTROL_GetInput()` so games can't change received input. * Change non-descript `info` to `hidInput` (Human Interface Device). * Remove a few unused prototypes.
2020-09-06 10:17:54 +00:00
void GetMouseDelta(ControlInfo* hidInput);
- added blend table translucency estimation instead of using a lame default. - draw fullscreen blends below the console. - moved all mouse event processing out of the SDL backend to D_PostEvent. - removed all remaining code for dealing with mouse buttons directly.
2019-11-10 14:15:14 +00:00
- use CCMDs for weapon and inventory selection, courtesy of ZDuke.
2020-07-17 18:56:10 +00:00
void ClearAllInput();
- hooked up the input system and did a major cleanup. Much of the old system is no longer needed with all buttons being handled as keys. Mouse axis movement is not working yet.
2019-12-24 11:59:26 +00:00
bool CheckAllInput()
- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.
2019-12-14 19:15:15 +00:00
{
- InputState cleanup This removes most of the InputState class because it is no longer used. The only remaining places still checking scan codes are the modifiers for sizeup and sizedown. All the rest was remapped to safer methods. The multiplayer taunts are currently inoperable, they will need support of shift-bindings to get proper support.
2020-08-24 18:34:18 +00:00
bool res = AnyKeyStatus;
AnyKeyStatus = false;
- hooked up the input system and did a major cleanup. Much of the old system is no longer needed with all buttons being handled as keys. Mouse axis movement is not working yet.
2019-12-24 11:59:26 +00:00
return res;
- fixed compilation and unhooked the Redneck Rampage menu so that it can be replaced.
2019-11-28 18:35:35 +00:00
}
- added an input state class which will contain all game-facing input data state. Having this grouped in a single object will make refactoring a lot easier. Access functions have been provided to avoid changing client code for the reorganization.
2019-10-27 23:24:09 +00:00
};
- hooked up ZDoom' joystick code and removed the remaining parts of the old MACT input library.
2019-12-14 19:15:15 +00:00
extern InputState inputState;
- fixed the Shadow Warrior menu, but it doesn't do much good. The game appears to be thoroughly broken.
2019-11-06 18:22:14 +00:00
- InputState: Make `CONTROL_GetInput()` return an object instead of accepting a pointer and provide to games as a function parameter. * Provide read-only/const results from `CONTROL_GetInput()` so games can't change received input. * Change non-descript `info` to `hidInput` (Human Interface Device). * Remove a few unused prototypes.
2020-09-06 10:17:54 +00:00
ControlInfo CONTROL_GetInput();
- mouse input works again after cleaning out the remaining cruft of the old input code.
2019-12-24 12:54:50 +00:00
int32_t handleevents(void);
- made the GameFunc constants global again. With most of the more specific features being migrated to CCMDs the list is relatively clean now, with merely 2 buttons that are game specific.
2020-08-26 22:25:59 +00:00
enum GameFunction_t
{
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer. These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-27 22:03:35 +00:00
gamefunc_Move_Forward, //
gamefunc_Move_Backward, //
gamefunc_Turn_Left, //
gamefunc_Turn_Right, //
gamefunc_Strafe, //
- made the GameFunc constants global again. With most of the more specific features being migrated to CCMDs the list is relatively clean now, with merely 2 buttons that are game specific.
2020-08-26 22:25:59 +00:00
gamefunc_Fire,
gamefunc_Open,
gamefunc_Run,
gamefunc_Alt_Fire,
gamefunc_Jump,
gamefunc_Crouch,
gamefunc_Look_Up,
gamefunc_Look_Down,
gamefunc_Look_Left,
gamefunc_Look_Right,
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer. These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-27 22:03:35 +00:00
gamefunc_Strafe_Left, //
gamefunc_Strafe_Right, //
- made the GameFunc constants global again. With most of the more specific features being migrated to CCMDs the list is relatively clean now, with merely 2 buttons that are game specific.
2020-08-26 22:25:59 +00:00
gamefunc_Aim_Up,
gamefunc_Aim_Down,
gamefunc_Shrink_Screen, // Automap only
gamefunc_Enlarge_Screen, // Automap only
gamefunc_Mouse_Aiming,
gamefunc_Dpad_Select,
gamefunc_Dpad_Aiming,
gamefunc_Toggle_Crouch,
gamefunc_Quick_Kick,
- first stage of generic automap code. Lines and textures get rendered, not all colors are correct - sprites yet to do...
2020-09-06 18:49:43 +00:00
gamefunc_AM_PanLeft,
gamefunc_AM_PanRight,
gamefunc_AM_PanUp,
gamefunc_AM_PanDown,
- made the GameFunc constants global again. With most of the more specific features being migrated to CCMDs the list is relatively clean now, with merely 2 buttons that are game specific.
2020-08-26 22:25:59 +00:00
NUM_ACTIONS
};
void SetupGameButtons();
- InputState: Make `CONTROL_GetInput()` return an object instead of accepting a pointer and provide to games as a function parameter. * Provide read-only/const results from `CONTROL_GetInput()` so games can't change received input. * Change non-descript `info` to `hidInput` (Human Interface Device). * Remove a few unused prototypes.
2020-09-06 10:17:54 +00:00
void ApplyGlobalInput(InputPacket& input, ControlInfo* const hidInput);
- Move Duke's input scaling for unsynchronised input to backend as `InputScale()`.
2020-09-04 07:53:36 +00:00
extern ESyncBits ActionsToSend;
double InputScale();
Reference in a new issue Copy permalink