mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-21 18:11:11 +00:00
Move KeyList & InputHandler from game.h to client/inputhandler.h (#5752)
* Move KeyList & InputHandler from game.h to client/inputhandler.h
We have a header for inputs, move inputhandler class & related keylist object to it
Also introduce a cpp file for MyEventReceiver::OnEvent function in inputhandler.h because a so huge function doesn't needs to be inlined
* Pass clang-format on inputhandler.{cpp,h} (compatible)
This commit is contained in:
Loïc Blot
GitHub
parent
5cb7f6a9b7
commit
9b8ca3a746
9 changed files with 284 additions and 365 deletions
|
|
@ -22,103 +22,86 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
#include "irrlichttypes_extrabloated.h"
|
||||
#include "joystick_controller.h"
|
||||
#include <list>
|
||||
#include "keycode.h"
|
||||
|
||||
#ifdef HAVE_TOUCHSCREENGUI
|
||||
#include "touchscreengui.h"
|
||||
#endif
|
||||
|
||||
class KeyList : private std::list<KeyPress>
|
||||
{
|
||||
typedef std::list<KeyPress> super;
|
||||
typedef super::iterator iterator;
|
||||
typedef super::const_iterator const_iterator;
|
||||
|
||||
virtual const_iterator find(const KeyPress &key) const
|
||||
{
|
||||
const_iterator f(begin());
|
||||
const_iterator e(end());
|
||||
|
||||
while (f != e) {
|
||||
if (*f == key)
|
||||
return f;
|
||||
|
||||
++f;
|
||||
}
|
||||
|
||||
return e;
|
||||
}
|
||||
|
||||
virtual iterator find(const KeyPress &key)
|
||||
{
|
||||
iterator f(begin());
|
||||
iterator e(end());
|
||||
|
||||
while (f != e) {
|
||||
if (*f == key)
|
||||
return f;
|
||||
|
||||
++f;
|
||||
}
|
||||
|
||||
return e;
|
||||
}
|
||||
|
||||
public:
|
||||
void clear() { super::clear(); }
|
||||
|
||||
void set(const KeyPress &key)
|
||||
{
|
||||
if (find(key) == end())
|
||||
push_back(key);
|
||||
}
|
||||
|
||||
void unset(const KeyPress &key)
|
||||
{
|
||||
iterator p(find(key));
|
||||
|
||||
if (p != end())
|
||||
erase(p);
|
||||
}
|
||||
|
||||
void toggle(const KeyPress &key)
|
||||
{
|
||||
iterator p(this->find(key));
|
||||
|
||||
if (p != end())
|
||||
erase(p);
|
||||
else
|
||||
push_back(key);
|
||||
}
|
||||
|
||||
bool operator[](const KeyPress &key) const { return find(key) != end(); }
|
||||
};
|
||||
|
||||
class MyEventReceiver : public IEventReceiver
|
||||
{
|
||||
public:
|
||||
// This is the one method that we have to implement
|
||||
virtual bool OnEvent(const SEvent& event)
|
||||
{
|
||||
/*
|
||||
React to nothing here if a menu is active
|
||||
*/
|
||||
if (noMenuActive() == false) {
|
||||
#ifdef HAVE_TOUCHSCREENGUI
|
||||
if (m_touchscreengui != 0) {
|
||||
m_touchscreengui->Toggle(false);
|
||||
}
|
||||
#endif
|
||||
return g_menumgr.preprocessEvent(event);
|
||||
}
|
||||
virtual bool OnEvent(const SEvent &event);
|
||||
|
||||
// Remember whether each key is down or up
|
||||
if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
|
||||
const KeyPress &keyCode = event.KeyInput;
|
||||
if (keysListenedFor[keyCode]) {
|
||||
if (event.KeyInput.PressedDown) {
|
||||
keyIsDown.set(keyCode);
|
||||
keyWasDown.set(keyCode);
|
||||
} else {
|
||||
keyIsDown.unset(keyCode);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_TOUCHSCREENGUI
|
||||
// case of touchscreengui we have to handle different events
|
||||
if ((m_touchscreengui != 0) &&
|
||||
(event.EventType == irr::EET_TOUCH_INPUT_EVENT)) {
|
||||
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 (noMenuActive() == false) {
|
||||
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_LOG_TEXT_EVENT) {
|
||||
static const LogLevel irr_loglev_conv[] = {
|
||||
LL_VERBOSE, // ELL_DEBUG
|
||||
LL_INFO, // ELL_INFORMATION
|
||||
LL_WARNING, // ELL_WARNING
|
||||
LL_ERROR, // ELL_ERROR
|
||||
LL_NONE, // ELL_NONE
|
||||
};
|
||||
assert(event.LogEvent.Level < ARRLEN(irr_loglev_conv));
|
||||
g_logger.log(irr_loglev_conv[event.LogEvent.Level],
|
||||
std::string("Irrlicht: ") + (const char*) event.LogEvent.Text);
|
||||
return true;
|
||||
}
|
||||
/* always return false in order to continue processing events */
|
||||
return false;
|
||||
}
|
||||
|
||||
bool IsKeyDown(const KeyPress &keyCode) const
|
||||
{
|
||||
return keyIsDown[keyCode];
|
||||
}
|
||||
bool IsKeyDown(const KeyPress &keyCode) const { return keyIsDown[keyCode]; }
|
||||
|
||||
// Checks whether a key was down and resets the state
|
||||
bool WasKeyDown(const KeyPress &keyCode)
|
||||
|
|
@ -129,14 +112,8 @@ public:
|
|||
return b;
|
||||
}
|
||||
|
||||
void listenForKey(const KeyPress &keyCode)
|
||||
{
|
||||
keysListenedFor.set(keyCode);
|
||||
}
|
||||
void dontListenForKeys()
|
||||
{
|
||||
keysListenedFor.clear();
|
||||
}
|
||||
void listenForKey(const KeyPress &keyCode) { keysListenedFor.set(keyCode); }
|
||||
void dontListenForKeys() { keysListenedFor.clear(); }
|
||||
|
||||
s32 getMouseWheel()
|
||||
{
|
||||
|
|
@ -184,7 +161,7 @@ public:
|
|||
JoystickController *joystick;
|
||||
|
||||
#ifdef HAVE_TOUCHSCREENGUI
|
||||
TouchScreenGUI* m_touchscreengui;
|
||||
TouchScreenGUI *m_touchscreengui;
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
|
@ -200,7 +177,42 @@ private:
|
|||
KeyList keysListenedFor;
|
||||
};
|
||||
|
||||
class InputHandler
|
||||
{
|
||||
public:
|
||||
InputHandler() {}
|
||||
virtual ~InputHandler() {}
|
||||
|
||||
virtual bool isKeyDown(const KeyPress &keyCode) = 0;
|
||||
virtual bool wasKeyDown(const KeyPress &keyCode) = 0;
|
||||
|
||||
virtual void listenForKey(const KeyPress &keyCode) {}
|
||||
virtual void dontListenForKeys() {}
|
||||
|
||||
virtual v2s32 getMousePos() = 0;
|
||||
virtual void setMousePos(s32 x, s32 y) = 0;
|
||||
|
||||
virtual bool getLeftState() = 0;
|
||||
virtual bool getRightState() = 0;
|
||||
|
||||
virtual bool getLeftClicked() = 0;
|
||||
virtual bool getRightClicked() = 0;
|
||||
virtual void resetLeftClicked() = 0;
|
||||
virtual void resetRightClicked() = 0;
|
||||
|
||||
virtual bool getLeftReleased() = 0;
|
||||
virtual bool getRightReleased() = 0;
|
||||
virtual void resetLeftReleased() = 0;
|
||||
virtual void resetRightReleased() = 0;
|
||||
|
||||
virtual s32 getMouseWheel() = 0;
|
||||
|
||||
virtual void step(float dtime) {}
|
||||
|
||||
virtual void clear() {}
|
||||
|
||||
JoystickController joystick;
|
||||
};
|
||||
/*
|
||||
Separated input handler
|
||||
*/
|
||||
|
|
@ -208,10 +220,8 @@ private:
|
|||
class RealInputHandler : public InputHandler
|
||||
{
|
||||
public:
|
||||
RealInputHandler(IrrlichtDevice *device, MyEventReceiver *receiver):
|
||||
m_device(device),
|
||||
m_receiver(receiver),
|
||||
m_mousepos(0,0)
|
||||
RealInputHandler(IrrlichtDevice *device, MyEventReceiver *receiver)
|
||||
: m_device(device), m_receiver(receiver), m_mousepos(0, 0)
|
||||
{
|
||||
m_receiver->joystick = &joystick;
|
||||
}
|
||||
|
|
@ -227,16 +237,12 @@ public:
|
|||
{
|
||||
m_receiver->listenForKey(keyCode);
|
||||
}
|
||||
virtual void dontListenForKeys()
|
||||
{
|
||||
m_receiver->dontListenForKeys();
|
||||
}
|
||||
virtual void dontListenForKeys() { m_receiver->dontListenForKeys(); }
|
||||
virtual v2s32 getMousePos()
|
||||
{
|
||||
if (m_device->getCursorControl()) {
|
||||
return m_device->getCursorControl()->getPosition();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return m_mousepos;
|
||||
}
|
||||
}
|
||||
|
|
@ -244,69 +250,36 @@ public:
|
|||
{
|
||||
if (m_device->getCursorControl()) {
|
||||
m_device->getCursorControl()->setPosition(x, y);
|
||||
}
|
||||
else {
|
||||
m_mousepos = v2s32(x,y);
|
||||
} else {
|
||||
m_mousepos = v2s32(x, y);
|
||||
}
|
||||
}
|
||||
|
||||
virtual bool getLeftState()
|
||||
{
|
||||
return m_receiver->left_active;
|
||||
}
|
||||
virtual bool getRightState()
|
||||
{
|
||||
return m_receiver->right_active;
|
||||
}
|
||||
virtual bool getLeftState() { return m_receiver->left_active; }
|
||||
virtual bool getRightState() { return m_receiver->right_active; }
|
||||
|
||||
virtual bool getLeftClicked()
|
||||
{
|
||||
return m_receiver->leftclicked;
|
||||
}
|
||||
virtual bool getRightClicked()
|
||||
{
|
||||
return m_receiver->rightclicked;
|
||||
}
|
||||
virtual void resetLeftClicked()
|
||||
{
|
||||
m_receiver->leftclicked = false;
|
||||
}
|
||||
virtual void resetRightClicked()
|
||||
{
|
||||
m_receiver->rightclicked = false;
|
||||
}
|
||||
virtual bool getLeftClicked() { return m_receiver->leftclicked; }
|
||||
virtual bool getRightClicked() { return m_receiver->rightclicked; }
|
||||
virtual void resetLeftClicked() { m_receiver->leftclicked = false; }
|
||||
virtual void resetRightClicked() { m_receiver->rightclicked = false; }
|
||||
|
||||
virtual bool getLeftReleased()
|
||||
{
|
||||
return m_receiver->leftreleased;
|
||||
}
|
||||
virtual bool getRightReleased()
|
||||
{
|
||||
return m_receiver->rightreleased;
|
||||
}
|
||||
virtual void resetLeftReleased()
|
||||
{
|
||||
m_receiver->leftreleased = false;
|
||||
}
|
||||
virtual void resetRightReleased()
|
||||
{
|
||||
m_receiver->rightreleased = false;
|
||||
}
|
||||
virtual bool getLeftReleased() { return m_receiver->leftreleased; }
|
||||
virtual bool getRightReleased() { return m_receiver->rightreleased; }
|
||||
virtual void resetLeftReleased() { m_receiver->leftreleased = false; }
|
||||
virtual void resetRightReleased() { m_receiver->rightreleased = false; }
|
||||
|
||||
virtual s32 getMouseWheel()
|
||||
{
|
||||
return m_receiver->getMouseWheel();
|
||||
}
|
||||
virtual s32 getMouseWheel() { return m_receiver->getMouseWheel(); }
|
||||
|
||||
void clear()
|
||||
{
|
||||
joystick.clear();
|
||||
m_receiver->clearInput();
|
||||
}
|
||||
|
||||
private:
|
||||
IrrlichtDevice *m_device;
|
||||
IrrlichtDevice *m_device;
|
||||
MyEventReceiver *m_receiver;
|
||||
v2s32 m_mousepos;
|
||||
v2s32 m_mousepos;
|
||||
};
|
||||
|
||||
class RandomInputHandler : public InputHandler
|
||||
|
|
@ -322,70 +295,25 @@ public:
|
|||
rightreleased = false;
|
||||
keydown.clear();
|
||||
}
|
||||
virtual bool isKeyDown(const KeyPress &keyCode)
|
||||
{
|
||||
return keydown[keyCode];
|
||||
}
|
||||
virtual bool wasKeyDown(const KeyPress &keyCode)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual v2s32 getMousePos()
|
||||
{
|
||||
return mousepos;
|
||||
}
|
||||
virtual void setMousePos(s32 x, s32 y)
|
||||
{
|
||||
mousepos = v2s32(x, y);
|
||||
}
|
||||
virtual bool isKeyDown(const KeyPress &keyCode) { return keydown[keyCode]; }
|
||||
virtual bool wasKeyDown(const KeyPress &keyCode) { return false; }
|
||||
virtual v2s32 getMousePos() { return mousepos; }
|
||||
virtual void setMousePos(s32 x, s32 y) { mousepos = v2s32(x, y); }
|
||||
|
||||
virtual bool getLeftState()
|
||||
{
|
||||
return leftdown;
|
||||
}
|
||||
virtual bool getRightState()
|
||||
{
|
||||
return rightdown;
|
||||
}
|
||||
virtual bool getLeftState() { return leftdown; }
|
||||
virtual bool getRightState() { return rightdown; }
|
||||
|
||||
virtual bool getLeftClicked()
|
||||
{
|
||||
return leftclicked;
|
||||
}
|
||||
virtual bool getRightClicked()
|
||||
{
|
||||
return rightclicked;
|
||||
}
|
||||
virtual void resetLeftClicked()
|
||||
{
|
||||
leftclicked = false;
|
||||
}
|
||||
virtual void resetRightClicked()
|
||||
{
|
||||
rightclicked = false;
|
||||
}
|
||||
virtual bool getLeftClicked() { return leftclicked; }
|
||||
virtual bool getRightClicked() { return rightclicked; }
|
||||
virtual void resetLeftClicked() { leftclicked = false; }
|
||||
virtual void resetRightClicked() { rightclicked = false; }
|
||||
|
||||
virtual bool getLeftReleased()
|
||||
{
|
||||
return leftreleased;
|
||||
}
|
||||
virtual bool getRightReleased()
|
||||
{
|
||||
return rightreleased;
|
||||
}
|
||||
virtual void resetLeftReleased()
|
||||
{
|
||||
leftreleased = false;
|
||||
}
|
||||
virtual void resetRightReleased()
|
||||
{
|
||||
rightreleased = false;
|
||||
}
|
||||
virtual bool getLeftReleased() { return leftreleased; }
|
||||
virtual bool getRightReleased() { return rightreleased; }
|
||||
virtual void resetLeftReleased() { leftreleased = false; }
|
||||
virtual void resetRightReleased() { rightreleased = false; }
|
||||
|
||||
virtual s32 getMouseWheel()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual s32 getMouseWheel() { return 0; }
|
||||
|
||||
virtual void step(float dtime)
|
||||
{
|
||||
|
|
@ -456,10 +384,8 @@ public:
|
|||
mousepos += mousespeed;
|
||||
}
|
||||
|
||||
s32 Rand(s32 min, s32 max)
|
||||
{
|
||||
return (myrand()%(max-min+1))+min;
|
||||
}
|
||||
s32 Rand(s32 min, s32 max);
|
||||
|
||||
private:
|
||||
KeyList keydown;
|
||||
v2s32 mousepos;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue