mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Refactor input handler (#15933)
This commit is contained in:
y5nw
GitHub
parent
309c0a0cb6
commit
4cd2273349
5 changed files with 168 additions and 254 deletions
|
|
@ -12,75 +12,98 @@
|
|||
#include "log_internal.h"
|
||||
#include "client/renderingengine.h"
|
||||
|
||||
void KeyCache::populate_nonchanging()
|
||||
void MyEventReceiver::reloadKeybindings()
|
||||
{
|
||||
key[KeyType::ESC] = EscapeKey;
|
||||
}
|
||||
keybindings[KeyType::FORWARD] = getKeySetting("keymap_forward");
|
||||
keybindings[KeyType::BACKWARD] = getKeySetting("keymap_backward");
|
||||
keybindings[KeyType::LEFT] = getKeySetting("keymap_left");
|
||||
keybindings[KeyType::RIGHT] = getKeySetting("keymap_right");
|
||||
keybindings[KeyType::JUMP] = getKeySetting("keymap_jump");
|
||||
keybindings[KeyType::AUX1] = getKeySetting("keymap_aux1");
|
||||
keybindings[KeyType::SNEAK] = getKeySetting("keymap_sneak");
|
||||
keybindings[KeyType::DIG] = getKeySetting("keymap_dig");
|
||||
keybindings[KeyType::PLACE] = getKeySetting("keymap_place");
|
||||
|
||||
void KeyCache::populate()
|
||||
{
|
||||
key[KeyType::FORWARD] = getKeySetting("keymap_forward");
|
||||
key[KeyType::BACKWARD] = getKeySetting("keymap_backward");
|
||||
key[KeyType::LEFT] = getKeySetting("keymap_left");
|
||||
key[KeyType::RIGHT] = getKeySetting("keymap_right");
|
||||
key[KeyType::JUMP] = getKeySetting("keymap_jump");
|
||||
key[KeyType::AUX1] = getKeySetting("keymap_aux1");
|
||||
key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
|
||||
key[KeyType::DIG] = getKeySetting("keymap_dig");
|
||||
key[KeyType::PLACE] = getKeySetting("keymap_place");
|
||||
keybindings[KeyType::ESC] = EscapeKey;
|
||||
|
||||
key[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");
|
||||
keybindings[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");
|
||||
|
||||
key[KeyType::DROP] = getKeySetting("keymap_drop");
|
||||
key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
|
||||
key[KeyType::CHAT] = getKeySetting("keymap_chat");
|
||||
key[KeyType::CMD] = getKeySetting("keymap_cmd");
|
||||
key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
|
||||
key[KeyType::CONSOLE] = getKeySetting("keymap_console");
|
||||
key[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
|
||||
key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
|
||||
key[KeyType::PITCHMOVE] = getKeySetting("keymap_pitchmove");
|
||||
key[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
|
||||
key[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
|
||||
key[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
|
||||
key[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
|
||||
key[KeyType::MUTE] = getKeySetting("keymap_mute");
|
||||
key[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
|
||||
key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
|
||||
key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
|
||||
key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
|
||||
key[KeyType::TOGGLE_BLOCK_BOUNDS] = getKeySetting("keymap_toggle_block_bounds");
|
||||
key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
|
||||
key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
|
||||
key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
|
||||
key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
|
||||
key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
|
||||
key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");
|
||||
key[KeyType::CAMERA_MODE] = getKeySetting("keymap_camera_mode");
|
||||
key[KeyType::INCREASE_VIEWING_RANGE] =
|
||||
keybindings[KeyType::DROP] = getKeySetting("keymap_drop");
|
||||
keybindings[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
|
||||
keybindings[KeyType::CHAT] = getKeySetting("keymap_chat");
|
||||
keybindings[KeyType::CMD] = getKeySetting("keymap_cmd");
|
||||
keybindings[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
|
||||
keybindings[KeyType::CONSOLE] = getKeySetting("keymap_console");
|
||||
keybindings[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
|
||||
keybindings[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
|
||||
keybindings[KeyType::PITCHMOVE] = getKeySetting("keymap_pitchmove");
|
||||
keybindings[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
|
||||
keybindings[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
|
||||
keybindings[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
|
||||
keybindings[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
|
||||
keybindings[KeyType::MUTE] = getKeySetting("keymap_mute");
|
||||
keybindings[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
|
||||
keybindings[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
|
||||
keybindings[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
|
||||
keybindings[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
|
||||
keybindings[KeyType::TOGGLE_BLOCK_BOUNDS] = getKeySetting("keymap_toggle_block_bounds");
|
||||
keybindings[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
|
||||
keybindings[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
|
||||
keybindings[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
|
||||
keybindings[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
|
||||
keybindings[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
|
||||
keybindings[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");
|
||||
keybindings[KeyType::CAMERA_MODE] = getKeySetting("keymap_camera_mode");
|
||||
keybindings[KeyType::INCREASE_VIEWING_RANGE] =
|
||||
getKeySetting("keymap_increase_viewing_range_min");
|
||||
key[KeyType::DECREASE_VIEWING_RANGE] =
|
||||
keybindings[KeyType::DECREASE_VIEWING_RANGE] =
|
||||
getKeySetting("keymap_decrease_viewing_range_min");
|
||||
key[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect");
|
||||
key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
|
||||
keybindings[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect");
|
||||
keybindings[KeyType::ZOOM] = getKeySetting("keymap_zoom");
|
||||
|
||||
key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
|
||||
key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
|
||||
key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
|
||||
key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
|
||||
keybindings[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
|
||||
keybindings[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
|
||||
keybindings[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
|
||||
keybindings[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
|
||||
|
||||
for (int i = 0; i < HUD_HOTBAR_ITEMCOUNT_MAX; i++) {
|
||||
std::string slot_key_name = "keymap_slot" + std::to_string(i + 1);
|
||||
key[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
|
||||
keybindings[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
|
||||
}
|
||||
|
||||
if (handler) {
|
||||
// First clear all keys, then re-add the ones we listen for
|
||||
handler->dontListenForKeys();
|
||||
for (auto k : key) {
|
||||
handler->listenForKey(k);
|
||||
}
|
||||
handler->listenForKey(EscapeKey);
|
||||
// First clear all keys, then re-add the ones we listen for
|
||||
keysListenedFor.clear();
|
||||
for (int i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
|
||||
listenForKey(keybindings[i], static_cast<GameKeyType>(i));
|
||||
}
|
||||
}
|
||||
|
||||
bool MyEventReceiver::setKeyDown(KeyPress keyCode, bool is_down)
|
||||
{
|
||||
if (keysListenedFor.find(keyCode) == keysListenedFor.end()) // ignore irrelevant key input
|
||||
return false;
|
||||
auto action = keysListenedFor[keyCode];
|
||||
if (is_down) {
|
||||
physicalKeyDown.insert(keyCode);
|
||||
setKeyDown(action, true);
|
||||
} else {
|
||||
physicalKeyDown.erase(keyCode);
|
||||
setKeyDown(action, false);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void MyEventReceiver::setKeyDown(GameKeyType action, bool is_down)
|
||||
{
|
||||
if (is_down) {
|
||||
if (!IsKeyDown(action))
|
||||
keyWasPressed.set(action);
|
||||
keyIsDown.set(action);
|
||||
keyWasDown.set(action);
|
||||
} else {
|
||||
if (IsKeyDown(action))
|
||||
keyWasReleased.set(action);
|
||||
keyIsDown.reset(action);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -143,23 +166,8 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
|
|||
// Remember whether each key is down or up
|
||||
if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
|
||||
KeyPress keyCode(event.KeyInput);
|
||||
if (keyCode && keysListenedFor[keyCode]) { // ignore key input that is invalid or irrelevant for the game.
|
||||
if (event.KeyInput.PressedDown) {
|
||||
if (!IsKeyDown(keyCode))
|
||||
keyWasPressed.set(keyCode);
|
||||
|
||||
keyIsDown.set(keyCode);
|
||||
keyWasDown.set(keyCode);
|
||||
} else {
|
||||
if (IsKeyDown(keyCode))
|
||||
keyWasReleased.set(keyCode);
|
||||
|
||||
keyIsDown.unset(keyCode);
|
||||
}
|
||||
|
||||
if (setKeyDown(keyCode, event.KeyInput.PressedDown))
|
||||
return true;
|
||||
}
|
||||
|
||||
} else if (g_touchcontrols && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {
|
||||
// In case of touchcontrols, we have to handle different events
|
||||
g_touchcontrols->translateEvent(event);
|
||||
|
|
@ -171,31 +179,22 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
|
|||
// Handle mouse events
|
||||
switch (event.MouseInput.Event) {
|
||||
case EMIE_LMOUSE_PRESSED_DOWN:
|
||||
keyIsDown.set(LMBKey);
|
||||
keyWasDown.set(LMBKey);
|
||||
keyWasPressed.set(LMBKey);
|
||||
setKeyDown(LMBKey, true);
|
||||
break;
|
||||
case EMIE_MMOUSE_PRESSED_DOWN:
|
||||
keyIsDown.set(MMBKey);
|
||||
keyWasDown.set(MMBKey);
|
||||
keyWasPressed.set(MMBKey);
|
||||
setKeyDown(MMBKey, true);
|
||||
break;
|
||||
case EMIE_RMOUSE_PRESSED_DOWN:
|
||||
keyIsDown.set(RMBKey);
|
||||
keyWasDown.set(RMBKey);
|
||||
keyWasPressed.set(RMBKey);
|
||||
setKeyDown(RMBKey, true);
|
||||
break;
|
||||
case EMIE_LMOUSE_LEFT_UP:
|
||||
keyIsDown.unset(LMBKey);
|
||||
keyWasReleased.set(LMBKey);
|
||||
setKeyDown(LMBKey, false);
|
||||
break;
|
||||
case EMIE_MMOUSE_LEFT_UP:
|
||||
keyIsDown.unset(MMBKey);
|
||||
keyWasReleased.set(MMBKey);
|
||||
setKeyDown(MMBKey, false);
|
||||
break;
|
||||
case EMIE_RMOUSE_LEFT_UP:
|
||||
keyIsDown.unset(RMBKey);
|
||||
keyWasReleased.set(RMBKey);
|
||||
setKeyDown(RMBKey, false);
|
||||
break;
|
||||
case EMIE_MOUSE_WHEEL:
|
||||
mouse_wheel += event.MouseInput.Wheel;
|
||||
|
|
@ -257,7 +256,7 @@ s32 RandomInputHandler::Rand(s32 min, s32 max)
|
|||
}
|
||||
|
||||
struct RandomInputHandlerSimData {
|
||||
std::string key;
|
||||
GameKeyType key;
|
||||
float counter;
|
||||
int time_max;
|
||||
};
|
||||
|
|
@ -265,19 +264,19 @@ struct RandomInputHandlerSimData {
|
|||
void RandomInputHandler::step(float dtime)
|
||||
{
|
||||
static RandomInputHandlerSimData rnd_data[] = {
|
||||
{ "keymap_jump", 0.0f, 40 },
|
||||
{ "keymap_aux1", 0.0f, 40 },
|
||||
{ "keymap_forward", 0.0f, 40 },
|
||||
{ "keymap_left", 0.0f, 40 },
|
||||
{ "keymap_dig", 0.0f, 30 },
|
||||
{ "keymap_place", 0.0f, 15 }
|
||||
{ KeyType::JUMP, 0.0f, 40 },
|
||||
{ KeyType::AUX1, 0.0f, 40 },
|
||||
{ KeyType::FORWARD, 0.0f, 40 },
|
||||
{ KeyType::LEFT, 0.0f, 40 },
|
||||
{ KeyType::DIG, 0.0f, 30 },
|
||||
{ KeyType::PLACE, 0.0f, 15 }
|
||||
};
|
||||
|
||||
for (auto &i : rnd_data) {
|
||||
i.counter -= dtime;
|
||||
if (i.counter < 0.0) {
|
||||
i.counter = 0.1 * Rand(1, i.time_max);
|
||||
keydown.toggle(getKeySetting(i.key.c_str()));
|
||||
keydown.flip(i.key);
|
||||
}
|
||||
}
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue