nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: fixed conflict between character casting and named enums

Browse Source
This commit is contained in:
Turánszki János
2024-08-28 08:15:29 +02:00
parent b62c7ff48b
commit 7b83a1e8dc
4 changed files with 105 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiInput.cpp
+2 -2
View File
@@ -404,7 +404,7 @@ namespace wi::input
return false;
}
if(button > GAMEPAD_RANGE_START)
if(button > GAMEPAD_RANGE_START && button < GAMEPAD_RANGE_END)
{
if (playerindex < (int)controllers.size())
{
@@ -586,7 +586,7 @@ namespace wi::input
keycode = VK_TAB;
break;
case KEYBOARD_BUTTON_TILDE:
keycode = 192;
keycode = VK_TAB; // http://kbdedit.com/manual/low_level_vk_list.html
break;
#endif // _WIN32
default: break;
WickedEngine/wiInput.h
+51 -51
View File
@@ -12,57 +12,6 @@ namespace wi::input
{
BUTTON_NONE = 0,
MOUSE_BUTTON_LEFT,
MOUSE_BUTTON_RIGHT,
MOUSE_BUTTON_MIDDLE,
KEYBOARD_BUTTON_UP,
KEYBOARD_BUTTON_DOWN,
KEYBOARD_BUTTON_LEFT,
KEYBOARD_BUTTON_RIGHT,
KEYBOARD_BUTTON_SPACE,
KEYBOARD_BUTTON_RSHIFT,
KEYBOARD_BUTTON_LSHIFT,
KEYBOARD_BUTTON_F1,
KEYBOARD_BUTTON_F2,
KEYBOARD_BUTTON_F3,
KEYBOARD_BUTTON_F4,
KEYBOARD_BUTTON_F5,
KEYBOARD_BUTTON_F6,
KEYBOARD_BUTTON_F7,
KEYBOARD_BUTTON_F8,
KEYBOARD_BUTTON_F9,
KEYBOARD_BUTTON_F10,
KEYBOARD_BUTTON_F11,
KEYBOARD_BUTTON_F12,
KEYBOARD_BUTTON_ENTER,
KEYBOARD_BUTTON_ESCAPE,
KEYBOARD_BUTTON_HOME,
KEYBOARD_BUTTON_RCONTROL,
KEYBOARD_BUTTON_LCONTROL,
KEYBOARD_BUTTON_DELETE,
KEYBOARD_BUTTON_BACKSPACE,
KEYBOARD_BUTTON_PAGEDOWN,
KEYBOARD_BUTTON_PAGEUP,
KEYBOARD_BUTTON_NUMPAD0,
KEYBOARD_BUTTON_NUMPAD1,
KEYBOARD_BUTTON_NUMPAD2,
KEYBOARD_BUTTON_NUMPAD3,
KEYBOARD_BUTTON_NUMPAD4,
KEYBOARD_BUTTON_NUMPAD5,
KEYBOARD_BUTTON_NUMPAD6,
KEYBOARD_BUTTON_NUMPAD7,
KEYBOARD_BUTTON_NUMPAD8,
KEYBOARD_BUTTON_NUMPAD9,
KEYBOARD_BUTTON_MULTIPLY,
KEYBOARD_BUTTON_ADD,
KEYBOARD_BUTTON_SEPARATOR,
KEYBOARD_BUTTON_SUBTRACT,
KEYBOARD_BUTTON_DECIMAL,
KEYBOARD_BUTTON_DIVIDE,
KEYBOARD_BUTTON_TAB,
KEYBOARD_BUTTON_TILDE,
CHARACTER_RANGE_START = 65, // letter A
GAMEPAD_RANGE_START = 256, // do not use!
@@ -113,6 +62,57 @@ namespace wi::input
GAMEPAD_BUTTON_PLAYSTATION_START = GAMEPAD_BUTTON_PLAYSTATION_OPTION,
GAMEPAD_RANGE_END = 275, // do not use!
MOUSE_BUTTON_LEFT,
MOUSE_BUTTON_RIGHT,
MOUSE_BUTTON_MIDDLE,
KEYBOARD_BUTTON_UP,
KEYBOARD_BUTTON_DOWN,
KEYBOARD_BUTTON_LEFT,
KEYBOARD_BUTTON_RIGHT,
KEYBOARD_BUTTON_SPACE,
KEYBOARD_BUTTON_RSHIFT,
KEYBOARD_BUTTON_LSHIFT,
KEYBOARD_BUTTON_F1,
KEYBOARD_BUTTON_F2,
KEYBOARD_BUTTON_F3,
KEYBOARD_BUTTON_F4,
KEYBOARD_BUTTON_F5,
KEYBOARD_BUTTON_F6,
KEYBOARD_BUTTON_F7,
KEYBOARD_BUTTON_F8,
KEYBOARD_BUTTON_F9,
KEYBOARD_BUTTON_F10,
KEYBOARD_BUTTON_F11,
KEYBOARD_BUTTON_F12,
KEYBOARD_BUTTON_ENTER,
KEYBOARD_BUTTON_ESCAPE,
KEYBOARD_BUTTON_HOME,
KEYBOARD_BUTTON_RCONTROL,
KEYBOARD_BUTTON_LCONTROL,
KEYBOARD_BUTTON_DELETE,
KEYBOARD_BUTTON_BACKSPACE,
KEYBOARD_BUTTON_PAGEDOWN,
KEYBOARD_BUTTON_PAGEUP,
KEYBOARD_BUTTON_NUMPAD0,
KEYBOARD_BUTTON_NUMPAD1,
KEYBOARD_BUTTON_NUMPAD2,
KEYBOARD_BUTTON_NUMPAD3,
KEYBOARD_BUTTON_NUMPAD4,
KEYBOARD_BUTTON_NUMPAD5,
KEYBOARD_BUTTON_NUMPAD6,
KEYBOARD_BUTTON_NUMPAD7,
KEYBOARD_BUTTON_NUMPAD8,
KEYBOARD_BUTTON_NUMPAD9,
KEYBOARD_BUTTON_MULTIPLY,
KEYBOARD_BUTTON_ADD,
KEYBOARD_BUTTON_SEPARATOR,
KEYBOARD_BUTTON_SUBTRACT,
KEYBOARD_BUTTON_DECIMAL,
KEYBOARD_BUTTON_DIVIDE,
KEYBOARD_BUTTON_TAB,
KEYBOARD_BUTTON_TILDE,
};
enum GAMEPAD_ANALOG
{
WickedEngine/wiInput_BindLua.cpp
+51 -49
View File
@@ -209,55 +209,6 @@ namespace wi::lua
wi::lua::RunText(R"(
input = Input()
MOUSE_BUTTON_LEFT = 1
MOUSE_BUTTON_RIGHT = 2
MOUSE_BUTTON_MIDDLE = 3
KEYBOARD_BUTTON_UP = 4
KEYBOARD_BUTTON_DOWN = 5
KEYBOARD_BUTTON_LEFT = 6
KEYBOARD_BUTTON_RIGHT = 7
KEYBOARD_BUTTON_SPACE = 8
KEYBOARD_BUTTON_RSHIFT = 9
KEYBOARD_BUTTON_LSHIFT = 10
KEYBOARD_BUTTON_F1 = 11
KEYBOARD_BUTTON_F2 = 12
KEYBOARD_BUTTON_F3 = 13
KEYBOARD_BUTTON_F4 = 14
KEYBOARD_BUTTON_F5 = 15
KEYBOARD_BUTTON_F6 = 16
KEYBOARD_BUTTON_F7 = 17
KEYBOARD_BUTTON_F8 = 18
KEYBOARD_BUTTON_F9 = 19
KEYBOARD_BUTTON_F10 = 20
KEYBOARD_BUTTON_F11 = 21
KEYBOARD_BUTTON_F12 = 22
KEYBOARD_BUTTON_ENTER = 23
KEYBOARD_BUTTON_ESCAPE = 24
KEYBOARD_BUTTON_HOME = 25
KEYBOARD_BUTTON_RCONTROL = 26
KEYBOARD_BUTTON_LCONTROL = 27
KEYBOARD_BUTTON_DELETE = 28
KEYBOARD_BUTTON_BACK = 29
KEYBOARD_BUTTON_PAGEDOWN = 30
KEYBOARD_BUTTON_PAGEUP = 31
KEYBOARD_BUTTON_NUMPAD0 = 32
KEYBOARD_BUTTON_NUMPAD1 = 33
KEYBOARD_BUTTON_NUMPAD2 = 34
KEYBOARD_BUTTON_NUMPAD3 = 35
KEYBOARD_BUTTON_NUMPAD4 = 36
KEYBOARD_BUTTON_NUMPAD5 = 37
KEYBOARD_BUTTON_NUMPAD6 = 38
KEYBOARD_BUTTON_NUMPAD7 = 39
KEYBOARD_BUTTON_NUMPAD8 = 40
KEYBOARD_BUTTON_NUMPAD9 = 41
KEYBOARD_BUTTON_MULTIPLY = 42
KEYBOARD_BUTTON_ADD = 43
KEYBOARD_BUTTON_SEPARATOR = 44
KEYBOARD_BUTTON_SUBTRACT = 45
KEYBOARD_BUTTON_DECIMAL = 46
KEYBOARD_BUTTON_DIVIDE = 47
GAMEPAD_BUTTON_UP = 257
GAMEPAD_BUTTON_LEFT = 258
GAMEPAD_BUTTON_DOWN = 259
@@ -309,6 +260,57 @@ GAMEPAD_ANALOG_TRIGGER_R = 3
TOUCHSTATE_PRESSED = 0
TOUCHSTATE_RELEASED = 1
TOUCHSTATE_MOVED = 2
MOUSE_BUTTON_LEFT = 276
MOUSE_BUTTON_RIGHT = 277
MOUSE_BUTTON_MIDDLE = 278
KEYBOARD_BUTTON_UP = 279
KEYBOARD_BUTTON_DOWN = 280
KEYBOARD_BUTTON_LEFT = 281
KEYBOARD_BUTTON_RIGHT = 282
KEYBOARD_BUTTON_SPACE = 283
KEYBOARD_BUTTON_RSHIFT = 284
KEYBOARD_BUTTON_LSHIFT = 285
KEYBOARD_BUTTON_F1 = 286
KEYBOARD_BUTTON_F2 = 287
KEYBOARD_BUTTON_F3 = 288
KEYBOARD_BUTTON_F4 = 289
KEYBOARD_BUTTON_F5 = 290
KEYBOARD_BUTTON_F6 = 291
KEYBOARD_BUTTON_F7 = 292
KEYBOARD_BUTTON_F8 = 293
KEYBOARD_BUTTON_F9 = 294
KEYBOARD_BUTTON_F10 = 295
KEYBOARD_BUTTON_F11 = 296
KEYBOARD_BUTTON_F12 = 297
KEYBOARD_BUTTON_ENTER = 298
KEYBOARD_BUTTON_ESCAPE = 299
KEYBOARD_BUTTON_HOME = 300
KEYBOARD_BUTTON_RCONTROL = 301
KEYBOARD_BUTTON_LCONTROL = 302
KEYBOARD_BUTTON_DELETE = 303
KEYBOARD_BUTTON_BACK = 304
KEYBOARD_BUTTON_PAGEDOWN = 305
KEYBOARD_BUTTON_PAGEUP = 306
KEYBOARD_BUTTON_NUMPAD0 = 307
KEYBOARD_BUTTON_NUMPAD1 = 308
KEYBOARD_BUTTON_NUMPAD2 = 309
KEYBOARD_BUTTON_NUMPAD3 = 310
KEYBOARD_BUTTON_NUMPAD4 = 311
KEYBOARD_BUTTON_NUMPAD5 = 312
KEYBOARD_BUTTON_NUMPAD6 = 313
KEYBOARD_BUTTON_NUMPAD7 = 314
KEYBOARD_BUTTON_NUMPAD8 = 315
KEYBOARD_BUTTON_NUMPAD9 = 316
KEYBOARD_BUTTON_MULTIPLY = 317
KEYBOARD_BUTTON_ADD = 318
KEYBOARD_BUTTON_SEPARATOR = 319
KEYBOARD_BUTTON_SUBTRACT = 320
KEYBOARD_BUTTON_DECIMAL = 321
KEYBOARD_BUTTON_DIVIDE = 322
KEYBOARD_BUTTON_TAB = 323
KEYBOARD_BUTTON_TILDE = 324
)");
}
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wi::version
// minor features, major updates, breaking compatibility changes
const int minor = 71;
// minor bug fixes, alterations, refactors, updates
const int revision = 558;
const int revision = 559;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);