X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient%2Finputhandler.cpp;h=a6ba87e8d2b8526b28eab4e2bd07f3a4868ed09e;hb=2f32044273d107e82fb1c35d4a0f616fa480cdf0;hp=3b01f5d93ea520e4bb2837981b28cd4403f39ef2;hpb=f5a006dce7896d9241b7d21df77825c1c5decc88;p=minetest.git diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp index 3b01f5d93..a6ba87e8d 100644 --- a/src/client/inputhandler.cpp +++ b/src/client/inputhandler.cpp @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/numeric.h" #include "inputhandler.h" #include "gui/mainmenumanager.h" +#include "hud.h" void KeyCache::populate_nonchanging() { @@ -29,59 +30,57 @@ void KeyCache::populate_nonchanging() 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::SPECIAL1] = getKeySetting("keymap_special1"); - key[KeyType::SNEAK] = getKeySetting("keymap_sneak"); - - key[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::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_HUD] = getKeySetting("keymap_toggle_hud"); - key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat"); - key[KeyType::TOGGLE_FORCE_FOG_OFF] - = getKeySetting("keymap_toggle_force_fog_off"); - 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] - = getKeySetting("keymap_increase_viewing_range_min"); - key[KeyType::DECREASE_VIEWING_RANGE] - = getKeySetting("keymap_decrease_viewing_range_min"); - key[KeyType::RANGESELECT] - = getKeySetting("keymap_rangeselect"); + 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"); + + key[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] = + getKeySetting("keymap_increase_viewing_range_min"); + key[KeyType::DECREASE_VIEWING_RANGE] = + getKeySetting("keymap_decrease_viewing_range_min"); + key[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect"); key[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"); + key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc"); + key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec"); - for (int i = 0; i < 23; i++) { + 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()); } @@ -116,56 +115,72 @@ bool MyEventReceiver::OnEvent(const SEvent &event) const KeyPress &keyCode = event.KeyInput; if (keysListenedFor[keyCode]) { 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); } + return true; } - } #ifdef HAVE_TOUCHSCREENGUI - // case of touchscreengui we have to handle different events - if (m_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) { + } else if (m_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) { + // In case of touchscreengui, we have to handle different events m_touchscreengui->translateEvent(event); return true; - } #endif - if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) { - /* TODO add a check like: - if (event.JoystickEvent != joystick_we_listen_for) - return false; - */ - return joystick->handleEvent(event.JoystickEvent); - } - // handle mouse events - if (event.EventType == irr::EET_MOUSE_INPUT_EVENT) { - if (isMenuActive()) { - left_active = false; - middle_active = false; - right_active = false; - } else { - left_active = event.MouseInput.isLeftPressed(); - middle_active = event.MouseInput.isMiddlePressed(); - right_active = event.MouseInput.isRightPressed(); - - if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) { - leftclicked = true; - } - if (event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) { - rightclicked = true; - } - if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) { - leftreleased = true; - } - if (event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) { - rightreleased = true; - } - if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) { - mouse_wheel += event.MouseInput.Wheel; - } + } else if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) { + // joystick may be nullptr if game is launched with '--random-input' parameter + return joystick && joystick->handleEvent(event.JoystickEvent); + } else if (event.EventType == irr::EET_MOUSE_INPUT_EVENT) { + // Handle mouse events + KeyPress key; + switch (event.MouseInput.Event) { + case EMIE_LMOUSE_PRESSED_DOWN: + key = "KEY_LBUTTON"; + keyIsDown.set(key); + keyWasDown.set(key); + keyWasPressed.set(key); + break; + case EMIE_MMOUSE_PRESSED_DOWN: + key = "KEY_MBUTTON"; + keyIsDown.set(key); + keyWasDown.set(key); + keyWasPressed.set(key); + break; + case EMIE_RMOUSE_PRESSED_DOWN: + key = "KEY_RBUTTON"; + keyIsDown.set(key); + keyWasDown.set(key); + keyWasPressed.set(key); + break; + case EMIE_LMOUSE_LEFT_UP: + key = "KEY_LBUTTON"; + keyIsDown.unset(key); + keyWasReleased.set(key); + break; + case EMIE_MMOUSE_LEFT_UP: + key = "KEY_MBUTTON"; + keyIsDown.unset(key); + keyWasReleased.set(key); + break; + case EMIE_RMOUSE_LEFT_UP: + key = "KEY_RBUTTON"; + keyIsDown.unset(key); + keyWasReleased.set(key); + break; + case EMIE_MOUSE_WHEEL: + mouse_wheel += event.MouseInput.Wheel; + break; + default: break; } } else if (event.EventType == irr::EET_LOG_TEXT_EVENT) { static const LogLevel irr_loglev_conv[] = { @@ -191,3 +206,73 @@ s32 RandomInputHandler::Rand(s32 min, s32 max) { return (myrand() % (max - min + 1)) + min; } + +struct RandomInputHandlerSimData { + std::string key; + float counter; + int time_max; +}; + +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 } + }; + + 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())); + } + } + { + static float counter1 = 0; + counter1 -= dtime; + if (counter1 < 0.0) { + counter1 = 0.1 * Rand(1, 20); + mousespeed = v2s32(Rand(-20, 20), Rand(-15, 20)); + } + } + mousepos += mousespeed; + static bool useJoystick = false; + { + static float counterUseJoystick = 0; + counterUseJoystick -= dtime; + if (counterUseJoystick < 0.0) { + counterUseJoystick = 5.0; // switch between joystick and keyboard direction input + useJoystick = !useJoystick; + } + } + if (useJoystick) { + static float counterMovement = 0; + counterMovement -= dtime; + if (counterMovement < 0.0) { + counterMovement = 0.1 * Rand(1, 40); + movementSpeed = Rand(0,100)*0.01; + movementDirection = Rand(-100, 100)*0.01 * M_PI; + } + } else { + bool f = keydown[keycache.key[KeyType::FORWARD]], + l = keydown[keycache.key[KeyType::LEFT]]; + if (f || l) { + movementSpeed = 1.0f; + if (f && !l) + movementDirection = 0.0; + else if (!f && l) + movementDirection = -M_PI_2; + else if (f && l) + movementDirection = -M_PI_4; + else + movementDirection = 0.0; + } else { + movementSpeed = 0.0; + movementDirection = 0.0; + } + } +}