summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-11-27 02:29:08 +0100
committergerman77 <juangerman-13@hotmail.com>2021-11-27 02:31:04 +0100
commit182cd9004f75df21979d0edd47910fecbd129b63 (patch)
tree0e53bca95c6cdf14ab763d425c3f776fb466edf4 /src
parentapplet/controller: Enable configuring mode while the applet is open (diff)
downloadyuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar.gz
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar.bz2
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar.lz
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar.xz
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.tar.zst
yuzu-182cd9004f75df21979d0edd47910fecbd129b63.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/settings_input.h2
-rw-r--r--src/core/hid/emulated_controller.cpp5
-rw-r--r--src/yuzu/applets/qt_controller.cpp4
-rw-r--r--src/yuzu/configuration/config.cpp17
-rw-r--r--src/yuzu/configuration/configure_vibration.cpp74
-rw-r--r--src/yuzu/configuration/configure_vibration.h3
-rw-r--r--src/yuzu/main.cpp2
7 files changed, 3 insertions, 104 deletions
diff --git a/src/common/settings_input.h b/src/common/settings_input.h
index 9a8804488..9e3df7376 100644
--- a/src/common/settings_input.h
+++ b/src/common/settings_input.h
@@ -357,7 +357,6 @@ constexpr int NUM_KEYBOARD_MODS_HID = NumKeyboardMods;
using AnalogsRaw = std::array<std::string, NativeAnalog::NumAnalogs>;
using ButtonsRaw = std::array<std::string, NativeButton::NumButtons>;
using MotionsRaw = std::array<std::string, NativeMotion::NumMotions>;
-using VibrationsRaw = std::array<std::string, NativeVibration::NumVibrations>;
constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28;
constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A;
@@ -378,7 +377,6 @@ struct PlayerInput {
ControllerType controller_type;
ButtonsRaw buttons;
AnalogsRaw analogs;
- VibrationsRaw vibrations;
MotionsRaw motions;
bool vibration_enabled;
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index 54d4ed93d..06ae41c3e 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -92,10 +92,11 @@ void EmulatedController::ReloadFromSettings() {
ReloadInput();
}
+
void EmulatedController::LoadDevices() {
// TODO(german77): Use more buttons to detect the correct device
- const auto left_joycon = button_params[Settings::NativeButton::A];
- const auto right_joycon = button_params[Settings::NativeButton::DRight];
+ const auto left_joycon = button_params[Settings::NativeButton::DRight];
+ const auto right_joycon = button_params[Settings::NativeButton::A];
// Triggers for GC controllers
trigger_params[LeftIndex] = button_params[Settings::NativeButton::ZL];
diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp
index eaa0f39f2..589e0577a 100644
--- a/src/yuzu/applets/qt_controller.cpp
+++ b/src/yuzu/applets/qt_controller.cpp
@@ -517,16 +517,12 @@ void QtControllerSelectorDialog::UpdateControllerState(std::size_t player_index)
if (controller->GetNpadStyleIndex(true) == controller_type &&
controller->IsConnected(true) == player_connected) {
- // Set vibration devices in the event that the input device has changed.
- ConfigureVibration::SetVibrationDevices(player_index);
return;
}
// Disconnect the controller first.
UpdateController(controller, controller_type, false);
- ConfigureVibration::SetVibrationDevices(player_index);
-
// Handheld
if (player_index == 0) {
if (controller_type == Core::HID::NpadStyleIndex::Handheld) {
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 38fd6e93b..2c70d0548 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -273,18 +273,6 @@ void Config::ReadPlayerValue(std::size_t player_index) {
}
}
- for (int i = 0; i < Settings::NativeVibration::NumVibrations; ++i) {
- auto& player_vibrations = player.vibrations[i];
-
- player_vibrations =
- qt_config
- ->value(QStringLiteral("%1").arg(player_prefix) +
- QString::fromUtf8(Settings::NativeVibration::mapping[i]),
- QString{})
- .toString()
- .toStdString();
- }
-
for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
auto& player_motions = player.motions[i];
@@ -891,11 +879,6 @@ void Config::SavePlayerValue(std::size_t player_index) {
QString::fromStdString(player.analogs[i]),
QString::fromStdString(default_param));
}
- for (int i = 0; i < Settings::NativeVibration::NumVibrations; ++i) {
- WriteSetting(QStringLiteral("%1").arg(player_prefix) +
- QString::fromStdString(Settings::NativeVibration::mapping[i]),
- QString::fromStdString(player.vibrations[i]), QString{});
- }
for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
WriteSetting(QStringLiteral("%1").arg(player_prefix) +
diff --git a/src/yuzu/configuration/configure_vibration.cpp b/src/yuzu/configuration/configure_vibration.cpp
index f1ce7205d..adce04b27 100644
--- a/src/yuzu/configuration/configure_vibration.cpp
+++ b/src/yuzu/configuration/configure_vibration.cpp
@@ -59,80 +59,6 @@ void ConfigureVibration::ApplyConfiguration() {
ui->checkBoxAccurateVibration->isChecked());
}
-void ConfigureVibration::SetVibrationDevices(std::size_t player_index) {
- using namespace Settings::NativeButton;
- static constexpr std::array<std::array<Settings::NativeButton::Values, 6>, 2> buttons{{
- {DLeft, DUp, DRight, DDown, L, ZL}, // Left Buttons
- {A, B, X, Y, R, ZR}, // Right Buttons
- }};
-
- auto& player = Settings::values.players.GetValue()[player_index];
-
- for (std::size_t device_idx = 0; device_idx < buttons.size(); ++device_idx) {
- std::unordered_map<std::string, int> params_count;
-
- for (const auto button_index : buttons[device_idx]) {
- const auto& player_button = player.buttons[button_index];
-
- if (params_count.find(player_button) != params_count.end()) {
- ++params_count[player_button];
- continue;
- }
-
- params_count.insert_or_assign(player_button, 1);
- }
-
- const auto it = std::max_element(
- params_count.begin(), params_count.end(),
- [](const auto& lhs, const auto& rhs) { return lhs.second < rhs.second; });
-
- auto& vibration_param_str = player.vibrations[device_idx];
- vibration_param_str.clear();
-
- if (it->first.empty()) {
- continue;
- }
-
- const auto param = Common::ParamPackage(it->first);
-
- const auto engine = param.Get("engine", "");
- const auto guid = param.Get("guid", "");
- const auto port = param.Get("port", 0);
-
- if (engine.empty() || engine == "keyboard" || engine == "mouse" || engine == "tas") {
- continue;
- }
-
- vibration_param_str += fmt::format("engine:{}", engine);
-
- if (port != 0) {
- vibration_param_str += fmt::format(",port:{}", port);
- }
- if (!guid.empty()) {
- vibration_param_str += fmt::format(",guid:{}", guid);
- }
- }
-
- if (player.vibrations[0] != player.vibrations[1]) {
- return;
- }
-
- if (!player.vibrations[0].empty() &&
- player.controller_type != Settings::ControllerType::RightJoycon) {
- player.vibrations[1].clear();
- } else if (!player.vibrations[1].empty() &&
- player.controller_type == Settings::ControllerType::RightJoycon) {
- player.vibrations[0].clear();
- }
-}
-
-void ConfigureVibration::SetAllVibrationDevices() {
- // Set vibration devices for all player indices including handheld
- for (std::size_t player_idx = 0; player_idx < NUM_PLAYERS + 1; ++player_idx) {
- SetVibrationDevices(player_idx);
- }
-}
-
void ConfigureVibration::changeEvent(QEvent* event) {
if (event->type() == QEvent::LanguageChange) {
RetranslateUI();
diff --git a/src/yuzu/configuration/configure_vibration.h b/src/yuzu/configuration/configure_vibration.h
index 07411a86f..37bbc2653 100644
--- a/src/yuzu/configuration/configure_vibration.h
+++ b/src/yuzu/configuration/configure_vibration.h
@@ -24,9 +24,6 @@ public:
void ApplyConfiguration();
- static void SetVibrationDevices(std::size_t player_index);
- static void SetAllVibrationDevices();
-
private:
void changeEvent(QEvent* event) override;
void RetranslateUI();
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 09ea21f5e..552db6387 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1380,8 +1380,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
Config per_game_config(*system, config_file_name, Config::ConfigType::PerGameConfig);
}
- ConfigureVibration::SetAllVibrationDevices();
-
// Disable fps limit toggle when booting a new title
Settings::values.disable_fps_limit.SetValue(false);