diff --git a/recompinput/include/recompinput/profiles.h b/recompinput/include/recompinput/profiles.h index 45bedd1..459e93e 100644 --- a/recompinput/include/recompinput/profiles.h +++ b/recompinput/include/recompinput/profiles.h @@ -47,6 +47,7 @@ namespace recompinput { const std::vector get_indices_for_custom_profiles(InputDevice device); void set_input_profile_for_player(int player_index, int profile_index, InputDevice device); int get_input_profile_for_player(int player_index, InputDevice device); + void mask_currently_pressed_buttons_for_all_players(); int add_controller(ControllerGUID guid, int profile_index); const ControllerGUID &get_controller_guid(int controller_index); int get_controller_profile_index(int controller_index); diff --git a/recompinput/src/players.cpp b/recompinput/src/players.cpp index 08cb3f3..a3fdf44 100644 --- a/recompinput/src/players.cpp +++ b/recompinput/src/players.cpp @@ -110,6 +110,9 @@ bool players::get_player_is_assigned(int player_index, bool temp_player) { } bool players::has_enough_players_assigned() { + if (players::is_single_player_mode()) { + return true; + } return PlayerState.players.get_count() >= PlayerState.min_players; } @@ -150,6 +153,7 @@ void playerassignment::stop_and_close_modal() { } void playerassignment::commit_player_assignment() { + profiles::mask_currently_pressed_buttons_for_all_players(); stop_and_close_modal(); PlayerState.players = PlayerState.temp_players; diff --git a/recompinput/src/profiles.cpp b/recompinput/src/profiles.cpp index c89956e..39a4cf5 100644 --- a/recompinput/src/profiles.cpp +++ b/recompinput/src/profiles.cpp @@ -20,6 +20,7 @@ struct InputProfile { static std::vector input_profiles{}; static std::array, recompinput::max_num_players_supported> players_input_profile_indices{}; +static std::array players_input_currently_pressed_buttons_mask{}; static std::unordered_map input_profile_key_index_map{}; static std::vector input_profile_custom_indices[static_cast(recompinput::InputDevice::COUNT)]{}; @@ -224,6 +225,10 @@ namespace recompinput { return -1; } } + + void profiles::mask_currently_pressed_buttons_for_all_players() { + players_input_currently_pressed_buttons_mask.fill(0xFFFFU); + } int profiles::add_controller(ControllerGUID guid, int profile_index) { auto it = controller_hash_index_map.find(guid.hash); @@ -407,7 +412,8 @@ namespace recompinput { check_joystick(profile_index_kb); } - *buttons_out = cur_buttons; + *buttons_out = cur_buttons & (~players_input_currently_pressed_buttons_mask[player_index]); + players_input_currently_pressed_buttons_mask[player_index] &= cur_buttons; *x_out = std::clamp(cur_x, -1.0f, 1.0f); *y_out = std::clamp(cur_y, -1.0f, 1.0f); diff --git a/recompui/src/base/ui_state.cpp b/recompui/src/base/ui_state.cpp index 277a421..0de173c 100644 --- a/recompui/src/base/ui_state.cpp +++ b/recompui/src/base/ui_state.cpp @@ -843,6 +843,17 @@ void draw_hook(plume::RenderCommandList* command_list, plume::RenderFramebuffer* } } // end dequeue event loop + // In game when the player count isn't sufficient, open the assign player process + if ( + !recompui::is_context_shown(recompui::config::get_config_context_id()) && + ultramodern::is_game_started() && + !recompinput::players::has_enough_players_assigned() && + !recompui::AssignPlayersModal::check_is_open() + ) { + recompinput::playerassignment::start(); + recompui::AssignPlayersModal::open(); + } + // Handle controller key repeats. if (latest_controller_key_pressed != SDLK_UNKNOWN) { clock::time_point now = clock::now(); diff --git a/recompui/src/composites/ui_assign_players_modal.cpp b/recompui/src/composites/ui_assign_players_modal.cpp index 5c6b035..8a7a1b9 100644 --- a/recompui/src/composites/ui_assign_players_modal.cpp +++ b/recompui/src/composites/ui_assign_players_modal.cpp @@ -342,4 +342,12 @@ void AssignPlayersModal::init() { assign_players_modal_context.close(); } +bool AssignPlayersModal::check_is_open() { + if (assign_players_modal_instance == nullptr || !recompui::is_context_shown(assign_players_modal_context)) { + return false; + } + + return assign_players_modal_instance->is_open; +} + } // namespace recompui diff --git a/recompui/src/composites/ui_assign_players_modal.h b/recompui/src/composites/ui_assign_players_modal.h index d8098c3..30dcf0f 100644 --- a/recompui/src/composites/ui_assign_players_modal.h +++ b/recompui/src/composites/ui_assign_players_modal.h @@ -35,6 +35,7 @@ class AssignPlayersModal : public Element { // Pass false to force player assignment. static void open(); static void close(); + static bool check_is_open(); }; } // namespace recompui