Merge branch 'main' into new-index-but-better

This commit is contained in:
HJfod 2024-05-09 10:57:36 +03:00
commit a37af634a9

View file

@ -6,12 +6,11 @@
namespace {
std::unordered_map<int, cocos2d::enumKeyCodes> g_keymap = {
{AKEYCODE_ESCAPE, cocos2d::KEY_Escape},
{AKEYCODE_SPACE, cocos2d::KEY_Space},
{AKEYCODE_DPAD_LEFT, cocos2d::KEY_Left},
{AKEYCODE_DPAD_RIGHT, cocos2d::KEY_Right},
{AKEYCODE_DPAD_UP, cocos2d::KEY_Up},
{AKEYCODE_DPAD_DOWN, cocos2d::KEY_Down},
{AKEYCODE_COMMA, cocos2d::KEY_OEMComma},
{AKEYCODE_PLUS, cocos2d::KEY_OEMPlus},
{AKEYCODE_MINUS, cocos2d::KEY_OEMMinus},
{AKEYCODE_PERIOD, cocos2d::KEY_OEMPeriod},
{AKEYCODE_0, cocos2d::KEY_Zero},
{AKEYCODE_1, cocos2d::KEY_One},
{AKEYCODE_2, cocos2d::KEY_Two},
@ -22,28 +21,41 @@ namespace {
{AKEYCODE_7, cocos2d::KEY_Seven},
{AKEYCODE_8, cocos2d::KEY_Eight},
{AKEYCODE_9, cocos2d::KEY_Nine},
{AKEYCODE_Q, cocos2d::KEY_Q},
{AKEYCODE_W, cocos2d::KEY_W},
{AKEYCODE_E, cocos2d::KEY_E},
{AKEYCODE_R, cocos2d::KEY_R},
{AKEYCODE_T, cocos2d::KEY_T},
{AKEYCODE_Y, cocos2d::KEY_Y},
{AKEYCODE_A, cocos2d::KEY_A},
{AKEYCODE_S, cocos2d::KEY_S},
{AKEYCODE_B, cocos2d::KEY_B},
{AKEYCODE_C, cocos2d::KEY_C},
{AKEYCODE_D, cocos2d::KEY_D},
{AKEYCODE_E, cocos2d::KEY_E},
{AKEYCODE_F, cocos2d::KEY_F},
{AKEYCODE_G, cocos2d::KEY_G},
{AKEYCODE_H, cocos2d::KEY_H},
{AKEYCODE_I, cocos2d::KEY_I},
{AKEYCODE_J, cocos2d::KEY_J},
{AKEYCODE_K, cocos2d::KEY_K},
{AKEYCODE_L, cocos2d::KEY_L},
{AKEYCODE_Z, cocos2d::KEY_Z},
{AKEYCODE_X, cocos2d::KEY_X},
{AKEYCODE_C, cocos2d::KEY_C},
{AKEYCODE_V, cocos2d::KEY_V},
{AKEYCODE_B, cocos2d::KEY_B},
{AKEYCODE_N, cocos2d::KEY_N},
{AKEYCODE_M, cocos2d::KEY_M},
{AKEYCODE_N, cocos2d::KEY_N},
{AKEYCODE_O, cocos2d::KEY_O},
{AKEYCODE_P, cocos2d::KEY_P},
{AKEYCODE_Q, cocos2d::KEY_Q},
{AKEYCODE_R, cocos2d::KEY_R},
{AKEYCODE_S, cocos2d::KEY_S},
{AKEYCODE_T, cocos2d::KEY_T},
{AKEYCODE_U, cocos2d::KEY_U},
{AKEYCODE_V, cocos2d::KEY_V},
{AKEYCODE_W, cocos2d::KEY_W},
{AKEYCODE_X, cocos2d::KEY_X},
{AKEYCODE_Z, cocos2d::KEY_Z},
{AKEYCODE_Y, cocos2d::KEY_Y},
{AKEYCODE_ESCAPE, cocos2d::KEY_Escape},
{AKEYCODE_ENTER, cocos2d::KEY_Enter},
{AKEYCODE_DEL, cocos2d::KEY_Backspace},
{AKEYCODE_FORWARD_DEL, cocos2d::KEY_Delete},
{AKEYCODE_DPAD_LEFT, cocos2d::KEY_Left},
{AKEYCODE_DPAD_RIGHT, cocos2d::KEY_Right},
{AKEYCODE_DPAD_UP, cocos2d::KEY_Up},
{AKEYCODE_DPAD_DOWN, cocos2d::KEY_Down},
{AKEYCODE_F1, cocos2d::KEY_F1},
{AKEYCODE_F2, cocos2d::KEY_F2},
{AKEYCODE_F3, cocos2d::KEY_F3},
@ -56,14 +68,11 @@ namespace {
{AKEYCODE_F10, cocos2d::KEY_F10},
{AKEYCODE_F11, cocos2d::KEY_F11},
{AKEYCODE_F12, cocos2d::KEY_F12},
{AKEYCODE_ENTER, cocos2d::KEY_Enter},
{AKEYCODE_FORWARD_DEL, cocos2d::KEY_Delete},
{AKEYCODE_DEL, cocos2d::KEY_Backspace},
{AKEYCODE_CTRL_LEFT, cocos2d::KEY_LeftControl},
{AKEYCODE_CTRL_RIGHT, cocos2d::KEY_RightContol}, // sic
{AKEYCODE_SHIFT_LEFT, cocos2d::KEY_LeftShift},
{AKEYCODE_SHIFT_RIGHT, cocos2d::KEY_RightShift},
{AKEYCODE_CTRL_LEFT, cocos2d::KEY_LeftControl},
{AKEYCODE_ALT_LEFT, cocos2d::KEY_Alt},
{AKEYCODE_SHIFT_RIGHT, cocos2d::KEY_RightShift},
{AKEYCODE_CTRL_RIGHT, cocos2d::KEY_RightContol}, // sic
{AKEYCODE_ALT_RIGHT, cocos2d::KEY_Alt},
{AKEYCODE_BUTTON_A, cocos2d::CONTROLLER_A},
{AKEYCODE_BUTTON_B, cocos2d::CONTROLLER_B},