mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix clang-format

Browse Source
This commit is contained in:
kalaposfos13 2024-10-17 10:36:45 +02:00
parent 1788aed1fd
commit b00ebf317a
1 changed files with 90 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/sdl_window.cpp
View File

@ -137,45 +137,85 @@ std::map<std::string, AxisMapping> string_to_axis_map = {
{"axis_right_y_minus", {Input::Axis::RightY, -127}}, {"axis_right_y_minus", {Input::Axis::RightY, -127}},
}; };
std::map<std::string, u32> string_to_keyboard_key_map = { std::map<std::string, u32> string_to_keyboard_key_map = {
{"a", SDLK_A}, {"b", SDLK_B}, {"c", SDLK_C}, {"d", SDLK_D}, {"a", SDLK_A},
{"e", SDLK_E}, {"f", SDLK_F}, {"g", SDLK_G}, {"h", SDLK_H}, {"b", SDLK_B},
{"i", SDLK_I}, {"j", SDLK_J}, {"k", SDLK_K}, {"l", SDLK_L}, {"c", SDLK_C},
{"m", SDLK_M}, {"n", SDLK_N}, {"o", SDLK_O}, {"p", SDLK_P}, {"d", SDLK_D},
{"q", SDLK_Q}, {"r", SDLK_R}, {"s", SDLK_S}, {"t", SDLK_T}, {"e", SDLK_E},
{"u", SDLK_U}, {"v", SDLK_V}, {"w", SDLK_W}, {"x", SDLK_X}, {"f", SDLK_F},
{"y", SDLK_Y}, {"z", SDLK_Z}, {"g", SDLK_G},
{"0", SDLK_0}, {"1", SDLK_1}, {"2", SDLK_2}, {"3", SDLK_3}, {"h", SDLK_H},
{"4", SDLK_4}, {"5", SDLK_5}, {"6", SDLK_6}, {"7", SDLK_7}, {"i", SDLK_I},
{"8", SDLK_8}, {"9", SDLK_9}, {"j", SDLK_J},
{"kp0", SDLK_KP_0}, {"kp1", SDLK_KP_1}, {"kp2", SDLK_KP_2}, {"kp3", SDLK_KP_3}, {"k", SDLK_K},
{"kp4", SDLK_KP_4}, {"kp5", SDLK_KP_5}, {"kp6", SDLK_KP_6}, {"kp7", SDLK_KP_7}, {"l", SDLK_L},
{"kp8", SDLK_KP_8}, {"kp9", SDLK_KP_9}, {"m", SDLK_M},
{",", SDLK_COMMA}, {"n", SDLK_N},
{".", SDLK_PERIOD}, {"o", SDLK_O},
{"?", SDLK_QUESTION}, {"p", SDLK_P},
{";", SDLK_SEMICOLON}, {"q", SDLK_Q},
{"-", SDLK_MINUS}, {"r", SDLK_R},
{"_", SDLK_UNDERSCORE}, {"s", SDLK_S},
{"(", SDLK_LEFTPAREN}, {"t", SDLK_T},
{")", SDLK_RIGHTPAREN}, {"u", SDLK_U},
{"[", SDLK_LEFTBRACKET}, {"v", SDLK_V},
{"]", SDLK_RIGHTBRACKET}, {"w", SDLK_W},
{"{", SDLK_LEFTBRACE}, {"x", SDLK_X},
{"}", SDLK_RIGHTBRACE}, {"y", SDLK_Y},
{"\\", SDLK_BACKSLASH}, {"z", SDLK_Z},
{"/", SDLK_SLASH}, {"0", SDLK_0},
{"1", SDLK_1},
{"2", SDLK_2},
{"3", SDLK_3},
{"4", SDLK_4},
{"5", SDLK_5},
{"6", SDLK_6},
{"7", SDLK_7},
{"8", SDLK_8},
{"9", SDLK_9},
{"kp0", SDLK_KP_0},
{"kp1", SDLK_KP_1},
{"kp2", SDLK_KP_2},
{"kp3", SDLK_KP_3},
{"kp4", SDLK_KP_4},
{"kp5", SDLK_KP_5},
{"kp6", SDLK_KP_6},
{"kp7", SDLK_KP_7},
{"kp8", SDLK_KP_8},
{"kp9", SDLK_KP_9},
{"comma", SDLK_COMMA},
{"period", SDLK_PERIOD},
{"question", SDLK_QUESTION},
{"semicolon", SDLK_SEMICOLON},
{"minus", SDLK_MINUS},
{"underscore", SDLK_UNDERSCORE},
{"lparenthesis", SDLK_LEFTPAREN},
{"rparenthesis", SDLK_RIGHTPAREN},
{"lbracket", SDLK_LEFTBRACKET},
{"rbracket", SDLK_RIGHTBRACKET},
{"lbrace", SDLK_LEFTBRACE},
{"rbrace", SDLK_RIGHTBRACE},
{"backslash", SDLK_BACKSLASH},
{"dash", SDLK_SLASH},
{"enter", SDLK_RETURN}, {"enter", SDLK_RETURN},
{"space", SDLK_SPACE}, {"space", SDLK_SPACE},
{"tab", SDLK_TAB}, {"tab", SDLK_TAB},
{"backspace", SDLK_BACKSPACE}, {"backspace", SDLK_BACKSPACE},
{"escape", SDLK_ESCAPE}, {"escape", SDLK_ESCAPE},
{"left", SDLK_LEFT}, {"right", SDLK_RIGHT}, {"left", SDLK_LEFT},
{"up", SDLK_UP}, {"down", SDLK_DOWN}, {"right", SDLK_RIGHT},
{"lctrl", SDLK_LCTRL}, {"rctrl", SDLK_RCTRL}, {"up", SDLK_UP},
{"lshift", SDLK_LSHIFT}, {"rshift", SDLK_RSHIFT}, {"down", SDLK_DOWN},
{"lalt", SDLK_LALT}, {"ralt", SDLK_RALT}, {"lctrl", SDLK_LCTRL},
{"lmeta", SDLK_LGUI}, {"rmeta", SDLK_RGUI}, {"rctrl", SDLK_RCTRL},
{"lwin", SDLK_LGUI}, {"rwin", SDLK_RGUI}, {"lshift", SDLK_LSHIFT},
{"rshift", SDLK_RSHIFT},
{"lalt", SDLK_LALT},
{"ralt", SDLK_RALT},
{"lmeta", SDLK_LGUI},
{"rmeta", SDLK_RGUI},
{"lwin", SDLK_LGUI},
{"rwin", SDLK_RGUI},
{"leftbutton", SDL_BUTTON_LEFT}, {"leftbutton", SDL_BUTTON_LEFT},
{"rightbutton", SDL_BUTTON_RIGHT}, {"rightbutton", SDL_BUTTON_RIGHT},
{"middlebutton", SDL_BUTTON_MIDDLE}, {"middlebutton", SDL_BUTTON_MIDDLE},
@ -183,10 +223,14 @@ std::map<std::string, u32> string_to_keyboard_key_map = {
{"mousewheeldown", SDL_EVENT_MOUSE_WHEEL_DOWN}, {"mousewheeldown", SDL_EVENT_MOUSE_WHEEL_DOWN},
{"mousewheelleft", SDL_EVENT_MOUSE_WHEEL_LEFT}, {"mousewheelleft", SDL_EVENT_MOUSE_WHEEL_LEFT},
{"mousewheelright", SDL_EVENT_MOUSE_WHEEL_RIGHT}, {"mousewheelright", SDL_EVENT_MOUSE_WHEEL_RIGHT},
{"kpperiod", SDLK_KP_PERIOD}, {"kpcomma", SDLK_KP_COMMA}, {"kpperiod", SDLK_KP_PERIOD},
{"kpdivide", SDLK_KP_DIVIDE}, {"kpmultiply", SDLK_KP_MULTIPLY}, {"kpcomma", SDLK_KP_COMMA},
{"kpminus", SDLK_KP_MINUS}, {"kpplus", SDLK_KP_PLUS}, {"kpdivide", SDLK_KP_DIVIDE},
{"kpenter", SDLK_KP_ENTER}, {"kpequals", SDLK_KP_EQUALS}, {"kpmultiply", SDLK_KP_MULTIPLY},
{"kpminus", SDLK_KP_MINUS},
{"kpplus", SDLK_KP_PLUS},
{"kpenter", SDLK_KP_ENTER},
{"kpequals", SDLK_KP_EQUALS},
{"capslock", SDLK_CAPSLOCK}, {"capslock", SDLK_CAPSLOCK},
}; };
std::map<std::string, u32> string_to_keyboard_mod_key_map = { std::map<std::string, u32> string_to_keyboard_mod_key_map = {
@ -195,8 +239,7 @@ std::map<std::string, u32> string_to_keyboard_mod_key_map = {
{"shift", SDL_KMOD_SHIFT}, {"ctrl", SDL_KMOD_CTRL}, {"alt", SDL_KMOD_ALT}, {"shift", SDL_KMOD_SHIFT}, {"ctrl", SDL_KMOD_CTRL}, {"alt", SDL_KMOD_ALT},
{"l_meta", SDL_KMOD_LGUI}, {"r_meta", SDL_KMOD_RGUI}, {"meta", SDL_KMOD_GUI}, {"l_meta", SDL_KMOD_LGUI}, {"r_meta", SDL_KMOD_RGUI}, {"meta", SDL_KMOD_GUI},
{"lwin", SDL_KMOD_LGUI}, {"rwin", SDL_KMOD_RGUI}, {"win", SDL_KMOD_GUI}, {"lwin", SDL_KMOD_LGUI}, {"rwin", SDL_KMOD_RGUI}, {"win", SDL_KMOD_GUI},
{"capslock", SDL_KMOD_CAPS}, {"capslock", SDL_KMOD_CAPS}, {"none", SDL_KMOD_NONE}, // if you want to be fancy
{"none", SDL_KMOD_NONE}, // if you want to be fancy
}; };
// Button map: maps key+modifier to controller button // Button map: maps key+modifier to controller button
@ -356,7 +399,7 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
// handle mouse movement params // handle mouse movement params
float p1 = 0.5, p2 = 1, p3 = 0.125; float p1 = 0.5, p2 = 1, p3 = 0.125;
std::size_t second_comma_pos = kbm_input.find(','); std::size_t second_comma_pos = kbm_input.find(',');
try{ try {
p1 = std::stof(key); p1 = std::stof(key);
p2 = std::stof(mod.substr(0, second_comma_pos)); p2 = std::stof(mod.substr(0, second_comma_pos));
p3 = std::stof(mod.substr(second_comma_pos + 1)); p3 = std::stof(mod.substr(second_comma_pos + 1));
@ -451,8 +494,10 @@ void WindowSDL::updateMouse() {
float d_x = 0, d_y = 0; float d_x = 0, d_y = 0;
SDL_GetRelativeMouseState(&d_x, &d_y); SDL_GetRelativeMouseState(&d_x, &d_y);
float output_speed = SDL_clamp((sqrt(d_x*d_x + d_y*d_y) + mouse_speed_offset * 128) * mouse_speed, mouse_deadzone_offset * 128, 128.0); float output_speed =
//std::cout << "speed: " << mouse_speed << "\n"; SDL_clamp((sqrt(d_x * d_x + d_y * d_y) + mouse_speed_offset * 128) * mouse_speed,
mouse_deadzone_offset * 128, 128.0);
// std::cout << "speed: " << mouse_speed << "\n";
float angle = atan2(d_y, d_x); float angle = atan2(d_y, d_x);
float a_x = cos(angle) * output_speed, a_y = sin(angle) * output_speed; float a_x = cos(angle) * output_speed, a_y = sin(angle) * output_speed;
@ -530,8 +575,6 @@ void WindowSDL::waitEvent() {
// Called on main thread // Called on main thread
SDL_Event event{}; SDL_Event event{};
if (!SDL_WaitEvent(&event)) { if (!SDL_WaitEvent(&event)) {
return; return;
} }