oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove excessive touchscreengui.h includes (#14466)

Browse source
This commit is contained in:
grorp 2024-03-17 14:59:50 +01:00 • committed by GitHub
parent 61a5733692
commit c8b615acc9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 115 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/client/inputhandler.cpp
View file

@ -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 "gui/touchscreengui.h"
#include "hud.h"
void KeyCache::populate_nonchanging()
@ -102,8 +103,8 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
React to nothing here if a menu is active
*/
if (isMenuActive()) {
if (m_touchscreengui) {
m_touchscreengui->setVisible(false);
if (g_touchscreengui) {
g_touchscreengui->setVisible(false);
}
return g_menumgr.preprocessEvent(event);
}
@ -128,9 +129,9 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
return true;
}
} else if (m_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {
} else if (g_touchscreengui && event.EventType == irr::EET_TOUCH_INPUT_EVENT) {
// In case of touchscreengui, we have to handle different events
m_touchscreengui->translateEvent(event);
g_touchscreengui->translateEvent(event);
return true;
} else if (event.EventType == irr::EET_JOYSTICK_INPUT_EVENT) {
@ -195,6 +196,52 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
return false;
}
/*
* RealInputHandler
*/
float RealInputHandler::getMovementSpeed()
{
bool f = m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]),
b = m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]),
l = m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]),
r = m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]);
if (f || b || l || r)
{
// if contradictory keys pressed, stay still
if (f && b && l && r)
return 0.0f;
else if (f && b && !l && !r)
return 0.0f;
else if (!f && !b && l && r)
return 0.0f;
return 1.0f; // If there is a keyboard event, assume maximum speed
}
if (g_touchscreengui && g_touchscreengui->getMovementSpeed())
return g_touchscreengui->getMovementSpeed();
return joystick.getMovementSpeed();
}
float RealInputHandler::getMovementDirection()
{
float x = 0, z = 0;
/* Check keyboard for input */
if (m_receiver->IsKeyDown(keycache.key[KeyType::FORWARD]))
z += 1;
if (m_receiver->IsKeyDown(keycache.key[KeyType::BACKWARD]))
z -= 1;
if (m_receiver->IsKeyDown(keycache.key[KeyType::RIGHT]))
x += 1;
if (m_receiver->IsKeyDown(keycache.key[KeyType::LEFT]))
x -= 1;
if (x != 0 || z != 0) /* If there is a keyboard event, it takes priority */
return std::atan2(x, z);
else if (g_touchscreengui && g_touchscreengui->getMovementDirection())
return g_touchscreengui->getMovementDirection();
return joystick.getMovementDirection();
}
/*
* RandomInputHandler
*/