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

clang and debug print cleanup

Browse Source
This commit is contained in:
kalaposfos13 2024-11-24 21:25:43 +01:00
parent 675559b1ba
commit 0067d741f4
3 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/input/input_handler.cpp
View File

@ -101,13 +101,12 @@ void ToggleMouseEnabled() {
// parsing related functions // parsing related functions
u32 GetAxisInputId(AxisMapping a) { u32 GetAxisInputId(AxisMapping a) {
//LOG_INFO(Input, "Parsing an axis..."); // LOG_INFO(Input, "Parsing an axis...");
if (a.axis == Axis::AxisMax || a.value != 0) { if (a.axis == Axis::AxisMax || a.value != 0) {
LOG_ERROR(Input, "Invalid axis given!"); LOG_ERROR(Input, "Invalid axis given!");
return 0; return 0;
} }
u32 value = (u32)a.axis + 0x80000000; u32 value = (u32)a.axis + 0x80000000;
LOG_DEBUG(Input, "Listening to {0:X}", value);
return value; return value;
} }
@ -145,16 +144,13 @@ u32 GetOrbisToSdlButtonKeycode(u32 cbutton) {
} }
} }
u32 GetControllerButtonInputId(u32 cbutton) { u32 GetControllerButtonInputId(u32 cbutton) {
if((cbutton & (OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_TOUCH_PAD | if ((cbutton & (OrbisPadButtonDataOffset::ORBIS_PAD_BUTTON_TOUCH_PAD | LEFTJOYSTICK_HALFMODE |
LEFTJOYSTICK_HALFMODE |
RIGHTJOYSTICK_HALFMODE)) != 0) { RIGHTJOYSTICK_HALFMODE)) != 0) {
//LOG_ERROR(Input, "You can't use this as a button input!");
return (u32)-1; return (u32)-1;
} }
return GetOrbisToSdlButtonKeycode(cbutton) + 0x10000000; return GetOrbisToSdlButtonKeycode(cbutton) + 0x10000000;
} }
// syntax: 'name, name,name' or 'name,name' or 'name' // syntax: 'name, name,name' or 'name,name' or 'name'
InputBinding GetBindingFromString(std::string& line) { InputBinding GetBindingFromString(std::string& line) {
u32 key1 = 0, key2 = 0, key3 = 0; u32 key1 = 0, key2 = 0, key3 = 0;
@ -173,31 +169,37 @@ InputBinding GetBindingFromString(std::string& line) {
if (string_to_keyboard_key_map.find(t) != string_to_keyboard_key_map.end()) { if (string_to_keyboard_key_map.find(t) != string_to_keyboard_key_map.end()) {
// Map to keyboard key // Map to keyboard key
u32 key_id = string_to_keyboard_key_map.at(t); u32 key_id = string_to_keyboard_key_map.at(t);
if (!key1) key1 = key_id; if (!key1)
else if (!key2) key2 = key_id; key1 = key_id;
else if (!key3) key3 = key_id; else if (!key2)
} key2 = key_id;
else if (string_to_axis_map.find(t) != string_to_axis_map.end()) { else if (!key3)
key3 = key_id;
} else if (string_to_axis_map.find(t) != string_to_axis_map.end()) {
// Map to axis input ID // Map to axis input ID
u32 axis_id = GetAxisInputId(string_to_axis_map.at(t)); u32 axis_id = GetAxisInputId(string_to_axis_map.at(t));
if (axis_id == (u32)-1) { if (axis_id == (u32)-1) {
return InputBinding(0, 0, 0); return InputBinding(0, 0, 0);
} }
if (!key1) key1 = axis_id; if (!key1)
else if (!key2) key2 = axis_id; key1 = axis_id;
else if (!key3) key3 = axis_id; else if (!key2)
} key2 = axis_id;
else if (string_to_cbutton_map.find(t) != string_to_cbutton_map.end()) { else if (!key3)
key3 = axis_id;
} else if (string_to_cbutton_map.find(t) != string_to_cbutton_map.end()) {
// Map to controller button input ID // Map to controller button input ID
u32 cbutton_id = GetControllerButtonInputId(string_to_cbutton_map.at(t)); u32 cbutton_id = GetControllerButtonInputId(string_to_cbutton_map.at(t));
if (cbutton_id == (u32)-1) { if (cbutton_id == (u32)-1) {
return InputBinding(0, 0, 0); return InputBinding(0, 0, 0);
} }
if (!key1) key1 = cbutton_id; if (!key1)
else if (!key2) key2 = cbutton_id; key1 = cbutton_id;
else if (!key3) key3 = cbutton_id; else if (!key2)
} key2 = cbutton_id;
else { else if (!key3)
key3 = cbutton_id;
} else {
// Invalid token found; return default binding // Invalid token found; return default binding
return InputBinding(0, 0, 0); return InputBinding(0, 0, 0);
} }
@ -226,9 +228,8 @@ void ParseInputConfig(const std::string game_id = "") {
return; return;
} }
// todo // we reset these here so in case the user fucks up or doesn't include this,
// we reset these here so in case the user fucks up or doesn't include this we can fall back to // we can fall back to default
// default
connections.clear(); connections.clear();
mouse_deadzone_offset = 0.5; mouse_deadzone_offset = 0.5;
mouse_speed = 1; mouse_speed = 1;
@ -276,9 +277,9 @@ void ParseInputConfig(const std::string game_id = "") {
InputBinding toggle_keys = GetBindingFromString(input_string); InputBinding toggle_keys = GetBindingFromString(input_string);
if (toggle_keys.KeyCount() != 2) { if (toggle_keys.KeyCount() != 2) {
LOG_WARNING(Input, LOG_WARNING(Input,
"Syntax error: Please provide exactly 2 keys: " "Syntax error: Please provide exactly 2 keys: "
"first is the toggler, the second is the key to toggle: {}", "first is the toggler, the second is the key to toggle: {}",
line); line);
continue; continue;
} }
ControllerOutput* toggle_out = GetOutputPointer(ControllerOutput(KEY_TOGGLE)); ControllerOutput* toggle_out = GetOutputPointer(ControllerOutput(KEY_TOGGLE));
@ -287,8 +288,8 @@ void ParseInputConfig(const std::string game_id = "") {
connections.insert(connections.end(), toggle_connection); connections.insert(connections.end(), toggle_connection);
continue; continue;
} }
LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.", lineCount, LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.",
line); lineCount, line);
continue; continue;
} }
if (output_string == "mouse_movement_params") { if (output_string == "mouse_movement_params") {
@ -310,8 +311,8 @@ void ParseInputConfig(const std::string game_id = "") {
auto axis_it = string_to_axis_map.find(output_string); auto axis_it = string_to_axis_map.find(output_string);
if (binding.IsEmpty()) { if (binding.IsEmpty()) {
LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.", lineCount, LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.",
line); lineCount, line);
continue; continue;
} }
if (button_it != string_to_cbutton_map.end()) { if (button_it != string_to_cbutton_map.end()) {
@ -320,16 +321,17 @@ void ParseInputConfig(const std::string game_id = "") {
connections.insert(connections.end(), connection); connections.insert(connections.end(), connection);
} else if (axis_it != string_to_axis_map.end()) { } else if (axis_it != string_to_axis_map.end()) {
int value_to_set = (binding.key3 & 0x80000000) != 0 ? 0 : int value_to_set = (binding.key3 & 0x80000000) != 0 ? 0
(axis_it->second.axis == Axis::TriggerLeft || axis_it->second.axis == Axis::TriggerRight) ? : (axis_it->second.axis == Axis::TriggerLeft ||
127 : axis_it->second.value; axis_it->second.axis == Axis::TriggerRight)
? 127
: axis_it->second.value;
connection = BindingConnection( connection = BindingConnection(
binding, GetOutputPointer(ControllerOutput(0, axis_it->second.axis)), binding, GetOutputPointer(ControllerOutput(0, axis_it->second.axis)), value_to_set);
value_to_set);
connections.insert(connections.end(), connection); connections.insert(connections.end(), connection);
} else { } else {
LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.", lineCount, LOG_WARNING(Input, "Invalid format at line: {}, data: \"{}\", skipping line.",
line); lineCount, line);
continue; continue;
} }
// LOG_INFO(Input, "Succesfully parsed line {}", lineCount); // LOG_INFO(Input, "Succesfully parsed line {}", lineCount);
@ -374,9 +376,11 @@ u32 InputBinding::GetInputIDFromEvent(const SDL_Event& e) {
case SDL_EVENT_GAMEPAD_AXIS_MOTION: case SDL_EVENT_GAMEPAD_AXIS_MOTION:
// todo: somehow put this value into the correct connection // todo: somehow put this value into the correct connection
// solution 1: add it to the keycode as a 0x0FF00000 (a bit hacky but works I guess?) // solution 1: add it to the keycode as a 0x0FF00000 (a bit hacky but works I guess?)
// I guess in software developement, there really is nothing more permanent than a temporary solution // I guess in software developement, there really is nothing more permanent than a temporary
// solution
value_mask = (u32)((e.gaxis.value / 256 + 128) << 20); // +-32000 to +-128 to 0-255 value_mask = (u32)((e.gaxis.value / 256 + 128) << 20); // +-32000 to +-128 to 0-255
return (u32)e.gaxis.axis + 0x80000000 + value_mask; // they are pushed to the end of the sorted array return (u32)e.gaxis.axis + 0x80000000 +
value_mask; // they are pushed to the end of the sorted array
default: default:
return (u32)-1; return (u32)-1;
} }
@ -445,8 +449,6 @@ void ControllerOutput::FinalizeUpdate() {
break; break;
case LEFTJOYSTICK_HALFMODE: case LEFTJOYSTICK_HALFMODE:
leftjoystick_halfmode = new_button_state; leftjoystick_halfmode = new_button_state;
// LOG_DEBUG(Input, "This is when we set the halfmode flag to {}",
// leftjoystick_halfmode);
break; break;
case RIGHTJOYSTICK_HALFMODE: case RIGHTJOYSTICK_HALFMODE:
rightjoystick_halfmode = new_button_state; rightjoystick_halfmode = new_button_state;
@ -467,8 +469,6 @@ void ControllerOutput::FinalizeUpdate() {
case Axis::LeftX: case Axis::LeftX:
case Axis::LeftY: case Axis::LeftY:
multiplier = leftjoystick_halfmode ? 0.5 : 1.0; multiplier = leftjoystick_halfmode ? 0.5 : 1.0;
// LOG_DEBUG(Input, "This is where we use the halfmode flag that is {}",
// leftjoystick_halfmode);
break; break;
case Axis::RightX: case Axis::RightX:
case Axis::RightY: case Axis::RightY:
@ -499,16 +499,15 @@ bool UpdatePressedKeys(u32 value, bool is_pressed) {
// and from there, it only changes the parameter // and from there, it only changes the parameter
// reverse iterate until we get out of the 0x8000000 range, if found, // reverse iterate until we get out of the 0x8000000 range, if found,
// update the parameter, if not, add it to the end // update the parameter, if not, add it to the end
//LOG_DEBUG(Input, "Updating an analog input...");
u32 value_to_search = value & 0xF00FFFFF; u32 value_to_search = value & 0xF00FFFFF;
for (auto& it = --pressed_keys.end(); (it->first & 0x80000000) != 0; it--) { for (auto& it = --pressed_keys.end(); (it->first & 0x80000000) != 0; it--) {
if ((it->first & 0xF00FFFFF) == value_to_search) { if ((it->first & 0xF00FFFFF) == value_to_search) {
it->first = value; it->first = value;
LOG_DEBUG(Input, "New value for {:X}: {:x}", value, value); // LOG_DEBUG(Input, "New value for {:X}: {:x}", value, value);
return true; return true;
} }
} }
//LOG_DEBUG(Input, "Input activated for the first time, adding it to the list"); // LOG_DEBUG(Input, "Input activated for the first time, adding it to the list");
pressed_keys.insert(pressed_keys.end(), {value, false}); pressed_keys.insert(pressed_keys.end(), {value, false});
return true; return true;
} }
@ -583,7 +582,7 @@ bool IsInputActive(BindingConnection& connection) {
if ((rev_it->first & 0xF00FFFFF) == (key & 0xF00FFFFF)) { if ((rev_it->first & 0xF00FFFFF) == (key & 0xF00FFFFF)) {
connection.parameter = (u32)((s32)((rev_it->first & 0x0FF00000) >> 20) - 128); connection.parameter = (u32)((s32)((rev_it->first & 0x0FF00000) >> 20) - 128);
LOG_DEBUG(Input, "Extracted the following param: {:X} from {:X}", LOG_DEBUG(Input, "Extracted the following param: {:X} from {:X}",
(s32)connection.parameter, rev_it->first); (s32)connection.parameter, rev_it->first);
key_found = true; key_found = true;
flags_to_set.push_back(&rev_it->second); flags_to_set.push_back(&rev_it->second);
break; break;

6
src/input/input_handler.h
View File

@ -308,9 +308,8 @@ public:
u32 parameter; u32 parameter;
BindingConnection(InputBinding b, ControllerOutput* out, u32 param = 0) { BindingConnection(InputBinding b, ControllerOutput* out, u32 param = 0) {
binding = b; binding = b;
parameter = param; // bruh this accidentally set to be 0 no wonder it didn't do anything parameter = param;
// todo: check if out is in the allowed array
output = out; output = out;
} }
bool operator<(const BindingConnection& other) const { bool operator<(const BindingConnection& other) const {
@ -328,8 +327,7 @@ public:
} }
}; };
// Check if the 3 key input is currently active. bool IsInputActive(BindingConnection& connection);
bool IsInputActive(const InputBinding& i);
// Updates the list of pressed keys with the given input. // Updates the list of pressed keys with the given input.
// Returns whether the list was updated or not. // Returns whether the list was updated or not.

10
src/sdl_window.cpp
View File

@ -124,8 +124,8 @@ void WindowSDL::waitEvent() {
case SDL_EVENT_GAMEPAD_TOUCHPAD_UP: case SDL_EVENT_GAMEPAD_TOUCHPAD_UP:
case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION: case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION:
controller->SetTouchpadState(event.gtouchpad.finger, controller->SetTouchpadState(event.gtouchpad.finger,
event.type != SDL_EVENT_GAMEPAD_TOUCHPAD_UP, event.type != SDL_EVENT_GAMEPAD_TOUCHPAD_UP, event.gtouchpad.x,
event.gtouchpad.x, event.gtouchpad.y); event.gtouchpad.y);
break; break;
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
case SDL_EVENT_GAMEPAD_BUTTON_UP: case SDL_EVENT_GAMEPAD_BUTTON_UP:
@ -213,9 +213,9 @@ void WindowSDL::OnKeyboardMouseInput(const SDL_Event* event) {
void WindowSDL::OnGamepadEvent(const SDL_Event* event) { void WindowSDL::OnGamepadEvent(const SDL_Event* event) {
bool input_down = event->type == SDL_EVENT_GAMEPAD_AXIS_MOTION || bool input_down = event->type == SDL_EVENT_GAMEPAD_AXIS_MOTION ||
event->type == SDL_EVENT_GAMEPAD_BUTTON_DOWN || event->type == SDL_EVENT_GAMEPAD_BUTTON_DOWN ||
event->type == SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN || event->type == SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN ||
event->type == SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION; event->type == SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION;
u32 input_id = Input::InputBinding::GetInputIDFromEvent(*event); u32 input_id = Input::InputBinding::GetInputIDFromEvent(*event);
bool inputs_changed = Input::UpdatePressedKeys(input_id, input_down); bool inputs_changed = Input::UpdatePressedKeys(input_id, input_down);