Skip to content

Commit f5a006d

Browse files
nerzhulnerzhul
committedJan 20, 2018
Game refactor [3/X]: Move keycache to inputhandler
·
5.11.05.0.0
1 parent 64fe79b commit f5a006d

File tree

3 files changed

+106
-105
lines changed

3 files changed

+106
-105
lines changed
 

‎src/client/inputhandler.cpp

+75
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,81 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2222
#include "inputhandler.h"
2323
#include "gui/mainmenumanager.h"
2424

25+
void KeyCache::populate_nonchanging()
26+
{
27+
key[KeyType::ESC] = EscapeKey;
28+
}
29+
30+
void KeyCache::populate()
31+
{
32+
key[KeyType::FORWARD] = getKeySetting("keymap_forward");
33+
key[KeyType::BACKWARD] = getKeySetting("keymap_backward");
34+
key[KeyType::LEFT] = getKeySetting("keymap_left");
35+
key[KeyType::RIGHT] = getKeySetting("keymap_right");
36+
key[KeyType::JUMP] = getKeySetting("keymap_jump");
37+
key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
38+
key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
39+
40+
key[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");
41+
42+
key[KeyType::DROP] = getKeySetting("keymap_drop");
43+
key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
44+
key[KeyType::CHAT] = getKeySetting("keymap_chat");
45+
key[KeyType::CMD] = getKeySetting("keymap_cmd");
46+
key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
47+
key[KeyType::CONSOLE] = getKeySetting("keymap_console");
48+
key[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
49+
key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
50+
key[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
51+
key[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
52+
key[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
53+
key[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
54+
key[KeyType::MUTE] = getKeySetting("keymap_mute");
55+
key[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
56+
key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
57+
key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
58+
key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
59+
key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
60+
key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
61+
key[KeyType::TOGGLE_FORCE_FOG_OFF]
62+
= getKeySetting("keymap_toggle_force_fog_off");
63+
key[KeyType::TOGGLE_UPDATE_CAMERA]
64+
= getKeySetting("keymap_toggle_update_camera");
65+
key[KeyType::TOGGLE_DEBUG]
66+
= getKeySetting("keymap_toggle_debug");
67+
key[KeyType::TOGGLE_PROFILER]
68+
= getKeySetting("keymap_toggle_profiler");
69+
key[KeyType::CAMERA_MODE]
70+
= getKeySetting("keymap_camera_mode");
71+
key[KeyType::INCREASE_VIEWING_RANGE]
72+
= getKeySetting("keymap_increase_viewing_range_min");
73+
key[KeyType::DECREASE_VIEWING_RANGE]
74+
= getKeySetting("keymap_decrease_viewing_range_min");
75+
key[KeyType::RANGESELECT]
76+
= getKeySetting("keymap_rangeselect");
77+
key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
78+
79+
key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
80+
key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
81+
key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
82+
key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
83+
84+
for (int i = 0; i < 23; i++) {
85+
std::string slot_key_name = "keymap_slot" + std::to_string(i + 1);
86+
key[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
87+
}
88+
89+
if (handler) {
90+
// First clear all keys, then re-add the ones we listen for
91+
handler->dontListenForKeys();
92+
for (const KeyPress &k : key) {
93+
handler->listenForKey(k);
94+
}
95+
handler->listenForKey(EscapeKey);
96+
handler->listenForKey(CancelKey);
97+
}
98+
}
99+
25100
bool MyEventReceiver::OnEvent(const SEvent &event)
26101
{
27102
/*

‎src/client/inputhandler.h

+31
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,37 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2929
#include "gui/touchscreengui.h"
3030
#endif
3131

32+
class InputHandler;
33+
34+
/****************************************************************************
35+
Fast key cache for main game loop
36+
****************************************************************************/
37+
38+
/* This is faster than using getKeySetting with the tradeoff that functions
39+
* using it must make sure that it's initialised before using it and there is
40+
* no error handling (for example bounds checking). This is really intended for
41+
* use only in the main running loop of the client (the_game()) where the faster
42+
* (up to 10x faster) key lookup is an asset. Other parts of the codebase
43+
* (e.g. formspecs) should continue using getKeySetting().
44+
*/
45+
struct KeyCache {
46+
47+
KeyCache()
48+
{
49+
handler = NULL;
50+
populate();
51+
populate_nonchanging();
52+
}
53+
54+
void populate();
55+
56+
// Keys that are not settings dependent
57+
void populate_nonchanging();
58+
59+
KeyPress key[KeyType::INTERNAL_ENUM_COUNT];
60+
InputHandler *handler;
61+
};
62+
3263
class KeyList : private std::list<KeyPress>
3364
{
3465
typedef std::list<KeyPress> super;

‎src/game.cpp

-105
Original file line numberDiff line numberDiff line change
@@ -566,111 +566,6 @@ class GameGlobalShaderConstantSetterFactory : public IShaderConstantSetterFactor
566566
#define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
567567
#endif
568568

569-
/****************************************************************************
570-
Fast key cache for main game loop
571-
****************************************************************************/
572-
573-
/* This is faster than using getKeySetting with the tradeoff that functions
574-
* using it must make sure that it's initialised before using it and there is
575-
* no error handling (for example bounds checking). This is really intended for
576-
* use only in the main running loop of the client (the_game()) where the faster
577-
* (up to 10x faster) key lookup is an asset. Other parts of the codebase
578-
* (e.g. formspecs) should continue using getKeySetting().
579-
*/
580-
struct KeyCache {
581-
582-
KeyCache()
583-
{
584-
handler = NULL;
585-
populate();
586-
populate_nonchanging();
587-
}
588-
589-
void populate();
590-
591-
// Keys that are not settings dependent
592-
void populate_nonchanging();
593-
594-
KeyPress key[KeyType::INTERNAL_ENUM_COUNT];
595-
InputHandler *handler;
596-
};
597-
598-
void KeyCache::populate_nonchanging()
599-
{
600-
key[KeyType::ESC] = EscapeKey;
601-
}
602-
603-
void KeyCache::populate()
604-
{
605-
key[KeyType::FORWARD] = getKeySetting("keymap_forward");
606-
key[KeyType::BACKWARD] = getKeySetting("keymap_backward");
607-
key[KeyType::LEFT] = getKeySetting("keymap_left");
608-
key[KeyType::RIGHT] = getKeySetting("keymap_right");
609-
key[KeyType::JUMP] = getKeySetting("keymap_jump");
610-
key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
611-
key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
612-
613-
key[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");
614-
615-
key[KeyType::DROP] = getKeySetting("keymap_drop");
616-
key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
617-
key[KeyType::CHAT] = getKeySetting("keymap_chat");
618-
key[KeyType::CMD] = getKeySetting("keymap_cmd");
619-
key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
620-
key[KeyType::CONSOLE] = getKeySetting("keymap_console");
621-
key[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
622-
key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
623-
key[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
624-
key[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
625-
key[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
626-
key[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
627-
key[KeyType::MUTE] = getKeySetting("keymap_mute");
628-
key[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
629-
key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
630-
key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
631-
key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
632-
key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
633-
key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
634-
key[KeyType::TOGGLE_FORCE_FOG_OFF]
635-
= getKeySetting("keymap_toggle_force_fog_off");
636-
key[KeyType::TOGGLE_UPDATE_CAMERA]
637-
= getKeySetting("keymap_toggle_update_camera");
638-
key[KeyType::TOGGLE_DEBUG]
639-
= getKeySetting("keymap_toggle_debug");
640-
key[KeyType::TOGGLE_PROFILER]
641-
= getKeySetting("keymap_toggle_profiler");
642-
key[KeyType::CAMERA_MODE]
643-
= getKeySetting("keymap_camera_mode");
644-
key[KeyType::INCREASE_VIEWING_RANGE]
645-
= getKeySetting("keymap_increase_viewing_range_min");
646-
key[KeyType::DECREASE_VIEWING_RANGE]
647-
= getKeySetting("keymap_decrease_viewing_range_min");
648-
key[KeyType::RANGESELECT]
649-
= getKeySetting("keymap_rangeselect");
650-
key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
651-
652-
key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
653-
key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
654-
key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
655-
key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
656-
657-
for (int i = 0; i < 23; i++) {
658-
std::string slot_key_name = "keymap_slot" + std::to_string(i + 1);
659-
key[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
660-
}
661-
662-
if (handler) {
663-
// First clear all keys, then re-add the ones we listen for
664-
handler->dontListenForKeys();
665-
for (const KeyPress &k : key) {
666-
handler->listenForKey(k);
667-
}
668-
handler->listenForKey(EscapeKey);
669-
handler->listenForKey(CancelKey);
670-
}
671-
}
672-
673-
674569
/****************************************************************************
675570
676571
****************************************************************************/

0 commit comments

Comments
 (0)
Please sign in to comment.