VERY experimental Nintendo Switch 2 emulator
C++
yuzu: config: Remove player 8 and 9 from config file
Narr the Regf6531fb17c0d
diff --git a/src/common/settings.h b/src/common/settings.hindex 6d27dd5ee4..9fe764e86a 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -481,7 +481,7 @@ struct Values {SwitchableSetting<s32, true> sound_index{1, 0, 2, "sound_index"};// Controls- InputSetting<std::array<PlayerInput, 10>> players;+ InputSetting<std::array<PlayerInput, 8>> players;SwitchableSetting<bool> use_docked_mode{true, "use_docked_mode"};diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cppindex a29c9a6f8b..9f0ceca491 100644--- a/src/core/hid/emulated_controller.cpp+++ b/src/core/hid/emulated_controller.cpp@@ -82,7 +82,12 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadStyleInde}void EmulatedController::ReloadFromSettings() {- const auto player_index = NpadIdTypeToIndex(npad_id_type);+ if (npad_id_type == NpadIdType::Other) {+ ReloadDebugPadFromSettings();+ return;+ }++ const auto player_index = NpadIdTypeToConfigIndex(npad_id_type);const auto& player = Settings::values.players.GetValue()[player_index];for (std::size_t index = 0; index < player.buttons.size(); ++index) {@@ -111,13 +116,21 @@ void EmulatedController::ReloadFromSettings() {ring_params[0] = Common::ParamPackage(Settings::values.ringcon_analogs);- // Other or debug controller should always be a pro controller- if (npad_id_type != NpadIdType::Other) {- SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type));- original_npad_type = npad_type;- } else {- SetNpadStyleIndex(NpadStyleIndex::ProController);- original_npad_type = npad_type;+ SetNpadStyleIndex(MapSettingsTypeToNPad(player.controller_type));+ original_npad_type = npad_type;++ // Player 1 shares config with handheld. Disable controller when handheld is selected+ if (npad_id_type == NpadIdType::Player1 && npad_type == NpadStyleIndex::Handheld) {+ Disconnect();+ ReloadInput();+ return;+ }++ // Handheld shares config with player 1. Disable controller when handheld isn't selected+ if (npad_id_type == NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) {+ Disconnect();+ ReloadInput();+ return;}Disconnect();@@ -128,6 +141,33 @@ void EmulatedController::ReloadFromSettings() {ReloadInput();}+void EmulatedController::ReloadDebugPadFromSettings() {+ for (std::size_t index = 0; index < Settings::values.debug_pad_buttons.size(); ++index) {+ button_params[index] = Common::ParamPackage(Settings::values.debug_pad_buttons[index]);+ }+ for (std::size_t index = 0; index < Settings::values.debug_pad_analogs.size(); ++index) {+ stick_params[index] = Common::ParamPackage(Settings::values.debug_pad_analogs[index]);+ }+ for (std::size_t index = 0; index < motion_params.size(); ++index) {+ motion_params[index] = {};+ }++ controller.color_values = {};+ controller.colors_state.fullkey = {};+ controller.colors_state.left = {};+ controller.colors_state.right = {};+ ring_params[0] = {};+ SetNpadStyleIndex(NpadStyleIndex::ProController);+ original_npad_type = npad_type;++ Disconnect();+ if (Settings::values.debug_pad_enabled) {+ Connect();+ }++ ReloadInput();+}+void EmulatedController::LoadDevices() {// TODO(german77): Use more buttons to detect the correct deviceconst auto left_joycon = button_params[Settings::NativeButton::DRight];@@ -560,9 +600,23 @@ bool EmulatedController::IsConfiguring() const {}void EmulatedController::SaveCurrentConfig() {- const auto player_index = NpadIdTypeToIndex(npad_id_type);+ // Other can't alter the config from here+ if (npad_id_type == NpadIdType::Other) {+ return;+ }++ const auto player_index = NpadIdTypeToConfigIndex(npad_id_type);auto& player = Settings::values.players.GetValue()[player_index];- player.connected = is_connected;++ // Only save the connected status when handheld is connected+ if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {+ player.connected = is_connected;+ }++ if (npad_id_type != NpadIdType::Handheld && npad_type != NpadStyleIndex::Handheld) {+ player.connected = is_connected;+ }+player.controller_type = MapNPadToSettingsType(npad_type);for (std::size_t index = 0; index < player.buttons.size(); ++index) {player.buttons[index] = button_params[index].Serialize();@@ -1152,7 +1206,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue vif (!output_devices[device_index]) {return false;}- const auto player_index = NpadIdTypeToIndex(npad_id_type);+ const auto player_index = NpadIdTypeToConfigIndex(npad_id_type);const auto& player = Settings::values.players.GetValue()[player_index];const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;@@ -1178,7 +1232,7 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v}bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {- const auto player_index = NpadIdTypeToIndex(npad_id_type);+ const auto player_index = NpadIdTypeToConfigIndex(npad_id_type);const auto& player = Settings::values.players.GetValue()[player_index];if (!player.vibration_enabled) {diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.hindex a9da465a2a..99572b3bd0 100644--- a/src/core/hid/emulated_controller.h+++ b/src/core/hid/emulated_controller.h@@ -250,9 +250,14 @@ public:/// Reload all input devicesvoid ReloadInput();- /// Overrides current mapped devices with the stored configuration and reloads all input devices+ /// Overrides current mapped devices with the stored configuration and reloads all input+ /// callbacksvoid ReloadFromSettings();+ /// Overrides current mapped debug pad with the stored configuration and reloads all input+ /// callbacks+ void ReloadDebugPadFromSettings();+/// Saves the current mapped configurationvoid SaveCurrentConfig();diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.hindex 6b35f448cb..983f0addd0 100644--- a/src/core/hid/hid_types.h+++ b/src/core/hid/hid_types.h@@ -690,6 +690,32 @@ constexpr size_t NpadIdTypeToIndex(NpadIdType npad_id_type) {}}+/// Converts a NpadIdType to a config array index.+constexpr size_t NpadIdTypeToConfigIndex(NpadIdType npad_id_type) {+ switch (npad_id_type) {+ case NpadIdType::Player1:+ return 0;+ case NpadIdType::Player2:+ return 1;+ case NpadIdType::Player3:+ return 2;+ case NpadIdType::Player4:+ return 3;+ case NpadIdType::Player5:+ return 4;+ case NpadIdType::Player6:+ return 5;+ case NpadIdType::Player7:+ return 6;+ case NpadIdType::Player8:+ return 7;+ case NpadIdType::Other:+ case NpadIdType::Handheld:+ default:+ return 0;+ }+}+/// Converts an array index to a NpadIdTypeconstexpr NpadIdType IndexToNpadIdType(size_t index) {switch (index) {diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cppindex c30b54499c..d22db9f6b6 100644--- a/src/yuzu/applets/qt_controller.cpp+++ b/src/yuzu/applets/qt_controller.cpp@@ -542,19 +542,14 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index)const auto player_connected = player_groupboxes[player_index]->isChecked() &&controller_type != Core::HID::NpadStyleIndex::Handheld;- if (controller->GetNpadStyleIndex(true) == controller_type &&- controller->IsConnected(true) == player_connected) {- return;- }-// Disconnect the controller first.UpdateController(controller, controller_type, false);// Handheldif (player_index == 0) {+ auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);+ UpdateController(handheld, controller_type, false);if (controller_type == Core::HID::NpadStyleIndex::Handheld) {- auto* handheld =- system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);UpdateController(handheld, Core::HID::NpadStyleIndex::Handheld,player_groupboxes[player_index]->isChecked());}diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex bfed2d038b..f8fae7416b 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -212,16 +212,11 @@ void Config::ReadPlayerValue(std::size_t player_index) {}if (player_prefix.isEmpty() && Settings::IsConfiguringGlobal()) {- const auto controller = static_cast<Settings::ControllerType>(+ player.controller_type = static_cast<Settings::ControllerType>(qt_config->value(QStringLiteral("%1type").arg(player_prefix),static_cast<u8>(Settings::ControllerType::ProController)).toUInt());-- if (controller == Settings::ControllerType::LeftJoycon ||- controller == Settings::ControllerType::RightJoycon) {- player.controller_type = controller;- }} else {player.connected =ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0)diff --git a/src/yuzu/configuration/configure_input_per_game.cpp b/src/yuzu/configuration/configure_input_per_game.cppindex 78e65d4689..4e77fe00b1 100644--- a/src/yuzu/configuration/configure_input_per_game.cpp+++ b/src/yuzu/configuration/configure_input_per_game.cpp@@ -57,7 +57,7 @@ void ConfigureInputPerGame::ApplyConfiguration() {}void ConfigureInputPerGame::LoadConfiguration() {- static constexpr size_t HANDHELD_INDEX = 8;+ static constexpr size_t HANDHELD_INDEX = 0;auto& hid_core = system.HIDCore();for (size_t player_index = 0; player_index < profile_comboboxes.size(); ++player_index) {@@ -69,9 +69,6 @@ void ConfigureInputPerGame::LoadConfiguration() {const auto selection_index = player_combobox->currentIndex();if (selection_index == 0) {Settings::values.players.GetValue()[player_index].profile_name = "";- if (player_index == 0) {- Settings::values.players.GetValue()[HANDHELD_INDEX] = {};- }Settings::values.players.SetGlobal(true);emulated_controller->ReloadFromSettings();continue;diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cppindex 50b62293eb..93eb10cebc 100644--- a/src/yuzu/configuration/configure_input_player.cpp+++ b/src/yuzu/configuration/configure_input_player.cpp@@ -1589,7 +1589,6 @@ void ConfigureInputPlayer::LoadProfile() {}void ConfigureInputPlayer::SaveProfile() {- static constexpr size_t HANDHELD_INDEX = 8;const QString profile_name = ui->comboProfiles->itemText(ui->comboProfiles->currentIndex());if (profile_name.isEmpty()) {@@ -1598,12 +1597,7 @@ void ConfigureInputPlayer::SaveProfile() {ApplyConfiguration();- // When we're in handheld mode, only the handheld emulated controller bindings are updated- const bool is_handheld = player_index == 0 && emulated_controller->GetNpadIdType() ==- Core::HID::NpadIdType::Handheld;- const auto profile_player_index = is_handheld ? HANDHELD_INDEX : player_index;-- if (!profiles->SaveProfile(profile_name.toStdString(), profile_player_index)) {+ if (!profiles->SaveProfile(profile_name.toStdString(), player_index)) {QMessageBox::critical(this, tr("Save Input Profile"),tr("Failed to save the input profile \"%1\"").arg(profile_name));UpdateInputProfiles();