summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-10-20 21:41:56 +0200
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:24 +0100
commitc3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048 (patch)
tree9ecde3ad19cbbb29f418655fc0125cef6c7b31ab
parentcore/hid: Only signal when needed (diff)
downloadyuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar.gz
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar.bz2
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar.lz
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar.xz
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.tar.zst
yuzu-c3ff0a8ac0d1c3f9c0791b5263dae53c06ad6048.zip
Diffstat (limited to '')
-rw-r--r--src/common/input.h7
-rw-r--r--src/core/hid/emulated_controller.cpp34
-rw-r--r--src/input_common/drivers/sdl_driver.cpp20
3 files changed, 48 insertions, 13 deletions
diff --git a/src/common/input.h b/src/common/input.h
index 8871a9d07..cdacd4689 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -60,6 +60,12 @@ enum class PollingError {
Unknown,
};
+// Hint for amplification curve to be used
+enum class VibrationAmplificationType {
+ Linear,
+ Exponential,
+};
+
struct AnalogProperties {
float deadzone{};
float range{1.0f};
@@ -126,6 +132,7 @@ struct VibrationStatus {
f32 low_frequency{};
f32 high_amplitude{};
f32 high_frequency{};
+ VibrationAmplificationType type;
};
struct LedStatus {
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index e102c9437..7b0c4a49b 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -54,7 +54,6 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadType type
}
void EmulatedController::ReloadFromSettings() {
- //LOG_ERROR(Service_HID, "reload config from settings {}", NpadIdTypeToIndex(npad_id_type));
const auto player_index = NpadIdTypeToIndex(npad_id_type);
const auto& player = Settings::values.players.GetValue()[player_index];
@@ -92,7 +91,7 @@ void EmulatedController::ReloadFromSettings() {
}
void EmulatedController::ReloadInput() {
- //LOG_ERROR(Service_HID, "reload config {}", NpadIdTypeToIndex(npad_id_type));
+ // LOG_ERROR(Service_HID, "reload config {}", NpadIdTypeToIndex(npad_id_type));
// If you load any device here add the equivalent to the UnloadInput() function
const auto left_side = button_params[Settings::NativeButton::ZL];
const auto right_side = button_params[Settings::NativeButton::ZR];
@@ -640,12 +639,22 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v
if (!output_devices[device_index]) {
return false;
}
+ const auto player_index = NpadIdTypeToIndex(npad_id_type);
+ const auto& player = Settings::values.players.GetValue()[player_index];
+ const f32 strength = static_cast<f32>(player.vibration_strength) / 100.0f;
+
+ // Exponential amplification is too strong at low amplitudes. Switch to a linear
+ // amplification if strength is set below 0.7f
+ const Input::VibrationAmplificationType type =
+ strength > 0.7f ? Input::VibrationAmplificationType::Exponential
+ : Input::VibrationAmplificationType::Linear;
const Input::VibrationStatus status = {
- .low_amplitude = vibration.high_amplitude,
- .low_frequency = vibration.high_amplitude,
- .high_amplitude = vibration.high_amplitude,
- .high_frequency = vibration.high_amplitude,
+ .low_amplitude = std::min(vibration.low_amplitude * strength, 1.0f),
+ .low_frequency = vibration.low_frequency,
+ .high_amplitude = std::min(vibration.high_amplitude * strength, 1.0f),
+ .high_frequency = vibration.high_frequency,
+ .type = type,
};
return output_devices[device_index]->SetVibration(status) == Input::VibrationError::None;
}
@@ -661,6 +670,7 @@ bool EmulatedController::TestVibration(std::size_t device_index) {
.low_frequency = 160.0f,
.high_amplitude = 0.001f,
.high_frequency = 320.0f,
+ .type = Input::VibrationAmplificationType::Linear,
};
return output_devices[device_index]->SetVibration(status) == Input::VibrationError::None;
}
@@ -687,7 +697,7 @@ void EmulatedController::Connect() {
std::lock_guard lock{mutex};
if (is_configuring) {
temporary_is_connected = true;
- TriggerOnChange(ControllerTriggerType::Connected,false);
+ TriggerOnChange(ControllerTriggerType::Connected, false);
return;
}
@@ -697,7 +707,7 @@ void EmulatedController::Connect() {
is_connected = true;
}
LOG_ERROR(Service_HID, "Connected controller {}", NpadIdTypeToIndex(npad_id_type));
- TriggerOnChange(ControllerTriggerType::Connected,true);
+ TriggerOnChange(ControllerTriggerType::Connected, true);
}
void EmulatedController::Disconnect() {
@@ -707,7 +717,7 @@ void EmulatedController::Disconnect() {
temporary_is_connected = false;
LOG_ERROR(Service_HID, "Disconnected temporal controller {}",
NpadIdTypeToIndex(npad_id_type));
- TriggerOnChange(ControllerTriggerType::Disconnected,false);
+ TriggerOnChange(ControllerTriggerType::Disconnected, false);
return;
}
@@ -717,7 +727,7 @@ void EmulatedController::Disconnect() {
is_connected = false;
}
LOG_ERROR(Service_HID, "Disconnected controller {}", NpadIdTypeToIndex(npad_id_type));
- TriggerOnChange(ControllerTriggerType::Disconnected,true);
+ TriggerOnChange(ControllerTriggerType::Disconnected, true);
}
bool EmulatedController::IsConnected(bool temporary) const {
@@ -751,7 +761,7 @@ void EmulatedController::SetNpadType(NpadType npad_type_) {
return;
}
temporary_npad_type = npad_type_;
- TriggerOnChange(ControllerTriggerType::Type,false);
+ TriggerOnChange(ControllerTriggerType::Type, false);
return;
}
@@ -764,7 +774,7 @@ void EmulatedController::SetNpadType(NpadType npad_type_) {
}
npad_type = npad_type_;
}
- TriggerOnChange(ControllerTriggerType::Type,true);
+ TriggerOnChange(ControllerTriggerType::Type, true);
}
LedPattern EmulatedController::GetLedPattern() const {
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index cee2d965f..d56351815 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -107,6 +107,14 @@ public:
return false;
}
+
+ bool HasHDRumble() const {
+ if (sdl_controller) {
+ return (SDL_GameControllerGetType(sdl_controller.get()) ==
+ SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO);
+ }
+ return false;
+ }
/**
* The Pad identifier of the joystick
*/
@@ -515,16 +523,26 @@ Input::VibrationError SDLDriver::SetRumble(const PadIdentifier& identifier,
const auto process_amplitude = [](f32 amplitude) {
return (amplitude + std::pow(amplitude, 0.3f)) * 0.5f * 0xFFFF;
};
- const Input::VibrationStatus new_vibration{
+ const Input::VibrationStatus exponential_vibration{
.low_amplitude = process_amplitude(vibration.low_amplitude),
.low_frequency = vibration.low_frequency,
.high_amplitude = process_amplitude(vibration.high_amplitude),
.high_frequency = vibration.high_frequency,
+ .type = Input::VibrationAmplificationType::Exponential,
};
+ Input::VibrationStatus new_vibration{};
+
+ if (vibration.type == Input::VibrationAmplificationType::Linear || joystick->HasHDRumble()) {
+ new_vibration = vibration;
+ } else {
+ new_vibration = exponential_vibration;
+ }
+
if (!joystick->RumblePlay(new_vibration)) {
return Input::VibrationError::Unknown;
}
+
return Input::VibrationError::None;
}
Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, std::string guid,