Merge pull request #18621 from hrydgard/analog-trigger-sensitivity

Add "Analog trigger threshold" setting, for conversion of analog trigger inputs to digital button inputs.

Core/Config.cpp

@@ -827,6 +827,7 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("AnalogAutoRotSpeed", &g_Config.fAnalogAutoRotSpeed, 8.0f, CfgFlag::PER_GAME),
 
 	ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.6f, CfgFlag::DEFAULT),
+	ConfigSetting("AnalogTriggerThreshold", &g_Config.fAnalogTriggerThreshold, 0.75f, CfgFlag::DEFAULT),
 
 	ConfigSetting("AllowMappingCombos", &g_Config.bAllowMappingCombos, false, CfgFlag::DEFAULT),
 

Core/Config.h

@@ -396,6 +396,9 @@ struct Config {
 	// Sets up how much the analog limiter button restricts digital->analog input.
 	float fAnalogLimiterDeadzone;
 
+	// Trigger configuration
+	float fAnalogTriggerThreshold;
+
 	// Sets whether combo mapping is enabled.
 	bool bAllowMappingCombos;
 

Core/ControlMapper.cpp

@@ -15,9 +15,23 @@
 
 using KeyMap::MultiInputMapping;
 
-// TODO: Possibly make these thresholds configurable?
-static float GetDeviceAxisThreshold(int device) {
-	return device == DEVICE_ID_MOUSE ? AXIS_BIND_THRESHOLD_MOUSE : AXIS_BIND_THRESHOLD;
+const float AXIS_BIND_THRESHOLD = 0.75f;
+const float AXIS_BIND_THRESHOLD_MOUSE = 0.01f;
+
+float GetDeviceAxisThreshold(int device, const InputMapping &mapping) {
+	if (device == DEVICE_ID_MOUSE) {
+		return AXIS_BIND_THRESHOLD_MOUSE;
+	}
+	if (mapping.IsAxis()) {
+		switch (KeyMap::GetAxisType((InputAxis)mapping.Axis(nullptr))) {
+		case KeyMap::AxisType::TRIGGER:
+			return g_Config.fAnalogTriggerThreshold;
+		default:
+			return AXIS_BIND_THRESHOLD;
+		}
+	} else {
+		return AXIS_BIND_THRESHOLD;
+	}
 }
 
 static int GetOppositeVKey(int vkey) {
@@ -311,7 +325,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 				} else {
 					curTime = iter->second.timestamp;
 				}
-				bool down = iter->second.value > GetDeviceAxisThreshold(iter->first.deviceId);
+				bool down = iter->second.value > GetDeviceAxisThreshold(iter->first.deviceId, mapping);
 				if (!down)
 					all = false;
 			}
@@ -364,7 +378,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no
 					}
 
 					if (mapping.IsAxis()) {
-						threshold = GetDeviceAxisThreshold(iter->first.deviceId);
+						threshold = GetDeviceAxisThreshold(iter->first.deviceId, mapping);
 						float value = MapAxisValue(iter->second.value, idForMapping, mapping, changedMapping, &touchedByMapping);
 						product *= value;
 					} else {
@@ -510,7 +524,7 @@ void ControlMapper::ToggleSwapAxes() {
 void ControlMapper::UpdateCurInputAxis(const InputMapping &mapping, float value, double timestamp) {
 	InputSample &input = curInput_[mapping];
 	input.value = value;
-	if (value > GetDeviceAxisThreshold(mapping.deviceId)) {
+	if (value >= GetDeviceAxisThreshold(mapping.deviceId, mapping)) {
 		if (input.timestamp == 0.0) {
 			input.timestamp = time_now_d();
 		}

Core/ControlMapper.h

@@ -93,3 +93,4 @@ class ControlMapper {
 };
 
 void ConvertAnalogStick(float x, float y, float *outX, float *outY);
+float GetDeviceAxisThreshold(int device, const InputMapping &mapping);

Core/KeyMap.cpp

@@ -48,6 +48,25 @@ std::set<std::string> g_seenPads;
 std::map<InputDeviceID, std::string> g_padNames;
 std::set<InputDeviceID> g_seenDeviceIds;
 
+AxisType GetAxisType(InputAxis input) {
+	switch (input) {
+	case JOYSTICK_AXIS_GAS:
+	case JOYSTICK_AXIS_BRAKE:
+	case JOYSTICK_AXIS_LTRIGGER:
+	case JOYSTICK_AXIS_RTRIGGER:
+		return AxisType::TRIGGER;
+	case JOYSTICK_AXIS_X:
+	case JOYSTICK_AXIS_Y:
+	case JOYSTICK_AXIS_Z:
+	case JOYSTICK_AXIS_RX:
+	case JOYSTICK_AXIS_RY:
+	case JOYSTICK_AXIS_RZ:
+		return AxisType::STICK;
+	default:
+		return AxisType::OTHER;
+	}
+}
+
 // Utility for UI navigation
 void SingleInputMappingFromPspButton(int btn, std::vector<InputMapping> *mappings, bool ignoreMouse) {
 	std::vector<MultiInputMapping> multiMappings;
@@ -874,7 +893,7 @@ bool HasChanged(int &prevGeneration) {
 	return false;
 }
 
-static const char *g_vKeyNames[] = {
+static const char * const g_vKeyNames[] = {
 	"AXIS_X_MIN",
 	"AXIS_Y_MIN",
 	"AXIS_X_MAX",

Core/KeyMap.h

@@ -78,10 +78,6 @@ enum {
 	VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
 };
 
-const float AXIS_BIND_THRESHOLD = 0.75f;
-const float AXIS_BIND_RELEASE_THRESHOLD = 0.35f;  // Used during mapping only to detect a "key-up" reliably.
-const float AXIS_BIND_THRESHOLD_MOUSE = 0.01f;
-
 struct MappedAnalogAxis {
 	int axisId;
 	int direction;
@@ -224,4 +220,13 @@ namespace KeyMap {
 	bool IsKeyMapped(InputDeviceID device, int key);
 
 	bool HasChanged(int &prevGeneration);
+
+	// Used for setting thresholds. Technically we could allow a setting per axis, but this is a reasonable compromise.
+	enum class AxisType {
+		TRIGGER,
+		STICK,
+		OTHER,
+	};
+
+	AxisType GetAxisType(InputAxis axis);
 }  // namespace KeyMap

GPU/Common/TextureReplacer.cpp

@@ -600,6 +600,7 @@ ReplacedTexture *TextureReplacer::FindReplacement(u64 cachekey, u32 hash, int w,
 		desc.hashfiles = hashfiles;
 	}
 
+	_dbg_assert_(!hashfiles.empty());
 	// OK, we might already have a matching texture, we use hashfiles as a key. Look it up in the level cache.
 	auto iter = levelCache_.find(hashfiles);
 	if (iter != levelCache_.end()) {

UI/ControlMappingScreen.cpp

@@ -441,6 +441,10 @@ bool KeyMappingNewMouseKeyDialog::key(const KeyInput &key) {
 	return true;
 }
 
+// Only used during the bind process. In other places, it's configurable for some types of axis, like trigger.
+const float AXIS_BIND_THRESHOLD = 0.75f;
+const float AXIS_BIND_RELEASE_THRESHOLD = 0.35f;  // Used during mapping only to detect a "key-up" reliably.
+
 void KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
 	if (time_now_d() < delayUntil_)
 		return;

UI/GameSettingsScreen.cpp

@@ -669,6 +669,7 @@ void GameSettingsScreen::CreateControlsSettings(UI::ViewGroup *controlsSettings)
 	controlsSettings->Add(new ItemHeader(ms->T("Controls")));
 	controlsSettings->Add(new Choice(co->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping);
 	controlsSettings->Add(new Choice(co->T("Calibrate Analog Stick")))->OnClick.Handle(this, &GameSettingsScreen::OnCalibrateAnalogs);
+	controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fAnalogTriggerThreshold, 0.25f, 0.98f, 0.75f, co->T("Analog trigger threshold"), screenManager()));
 
 #if defined(USING_WIN_UI) || (PPSSPP_PLATFORM(LINUX) && !PPSSPP_PLATFORM(ANDROID))
 	controlsSettings->Add(new CheckBox(&g_Config.bSystemControls, co->T("Enable standard shortcut keys")));

assets/lang/ar_AE.ini

@@ -90,6 +90,7 @@ Analog Limiter = ‎محدد التناظري
 Analog Settings = Analog Settings
 Analog Stick = ‎عصا تناظرية
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = ‎حينما يتم ضغط زر تحديد التناظر
 Auto = ‎تلقائي
 Auto-centering analog stick = ‎تنصيف العصا التناظرية تلقائياً

assets/lang/az_AZ.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/bg_BG.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Автоматично
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/ca_ES.ini

@@ -82,6 +82,7 @@ Analog Limiter = Limitador analògic
 Analog Settings = Configuració de l'stick
 Analog Stick = Palanca analògica
 Analog Style = Estil de l'stick
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Quan es prem el botó del limitador de l'stick
 Auto = Automàtic
 Auto-centering analog stick = Auto centrat de l'stick

assets/lang/cz_CZ.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analogový omezovač
 Analog Settings = Analog Settings
 Analog Stick = Analogová páčka
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Automatické vystředění analogové páčky

assets/lang/da_DK.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog begrænser
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Når den analoge begrænser knap er trykket ned
 Auto = Automatisk
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/de_DE.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analogbegrenzer
 Analog Settings = Analog Einstellungen
 Analog Stick = Analogstick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Wenn die Analogbegrenzer-Taste gedrückt ist
 Auto = Automatisch
 Auto-centering analog stick = Analogstick automatisch zentrieren

assets/lang/dr_ID.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/en_US.ini

@@ -106,6 +106,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/es_ES.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (rápido)
 Analog Binding = Asignar stick
 Analog Settings = Ajustes de stick
 Analog Style = Estilo de stick
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = Velocidad auto rotación del stick
 Analog Limiter = Limitador del stick
 Analog Stick = Stick izquierdo

assets/lang/es_LA.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (rápido)
 Analog Binding = Asignar análogo
 Analog Settings = Config. del análogo
 Analog Style = Estilo del análogo
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = Vel. de rotación auto. del análogo
 Analog Limiter = Limitador del análogo
 Analog Stick = Analog stick

assets/lang/fa_IR.ini

@@ -82,6 +82,7 @@ Analog Limiter = ‎محدود کننده آنالوگ
 Analog Settings = تنظیمات انالوگ
 Analog Stick = ‎دسته آنالوگ
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = ‎هنگامی که دکمه محدود کننده آنالوگ فشرده شود
 Auto = ‎اتوماتیک
 Auto-centering analog stick = ‎تنظیم مرکز آنالوگ به صورت خودکار

assets/lang/fi_FI.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analoginen rajoitin
 Analog Settings = Analogisen asetukset
 Analog Stick = Analoginen sauva
 Analog Style = Analogisen tyyli
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Kun analogisen rajoittimen näppäintä painetaan
 Auto = Automaattinen
 Auto-centering analog stick = Automaattisesti keskittävä analoginen sauva

assets/lang/fr_FR.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (rapide)
 Analog Binding = Analog Binding
 Analog Settings = Analog Settings
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = Vitesse de rotation automatique du stick analogique
 Analog Limiter = Limiteur analogique
 Analog Stick = Stick analogique

assets/lang/gl_ES.ini

@@ -82,6 +82,7 @@ Analog Limiter = Limitador analóxico
 Analog Settings = Analog Settings
 Analog Stick = Stick analóxico
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Automática
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/gr_EL.ini

@@ -82,6 +82,7 @@ Analog Limiter = Περιορισμός αναλογικού
 Analog Settings = Analog Settings
 Analog Stick = Αναλογικός μοχλός
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Όταν το κουμπί περιορισμού αναλογικού είναι πατημένο
 Auto = Αυτόματο
 Auto-centering analog stick = Αυτόματος κεντρισμός αναλογικού μοχλού

assets/lang/he_IL.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/he_IL_invert.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Auto
 Auto-centering analog stick = Auto-centering analog stick

assets/lang/hr_HR.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (brzo)
 Analog Binding = Analog Binding
 Analog Settings = Analog Settings
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = Auto-Rotacija analogne brzine
 Analog Limiter = Analogni ograničivač
 Analog Stick = Analogni stick

assets/lang/hu_HU.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (gyors)
 Analog Binding = Analog Binding
 Analog Settings = Analog Settings
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = Automata analóg forgató sebessége
 Analog Limiter = Analóg korlátozó
 Analog Stick = Analóg kar

assets/lang/id_ID.ini

@@ -82,6 +82,7 @@ Analog Limiter = Pembatas analog
 Analog Settings = Pengaturan analog
 Analog Stick = Stik analog
 Analog Style = Gaya analog
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Ketika tombol pembatas analog ditekan
 Auto = Otomatis
 Auto-centering analog stick = Penengahan otomatis stik analog

assets/lang/it_IT.ini

@@ -82,6 +82,7 @@ Analog Limiter = Limitatore Analogico
 Analog Settings = Impostazioni Analogico
 Analog Stick = Stick Analogico
 Analog Style = Stile Analogico
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = Quando viene premuto il tasto del limitatore analogico
 Auto = Automatico
 Auto-centering analog stick = Auto-centramento dello stick analogico

assets/lang/ja_JP.ini

@@ -80,6 +80,7 @@ WASAPI (fast) = WASAPI (高速)
 Analog Binding = 右アナログパッドへの対応ボタン割り当て
 Analog Settings = アナログパッドの設定
 Analog Style = 右アナログパッドのスタイル
+Analog trigger threshold = Analog trigger threshold
 Auto-rotation speed = アナログの自動回転速度
 Analog Limiter = アナログパッドのリミッタ
 Analog Stick = アナログパッド

assets/lang/jv_ID.ini

@@ -82,6 +82,7 @@ Analog Limiter = Analog limiter
 Analog Settings = Analog Settings
 Analog Stick = Analog stick
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = When the analog limiter button is pressed
 Auto = Otomatis
 Auto-centering analog stick = Otomatis Analog stick nang tengah

assets/lang/ko_KR.ini

@@ -82,6 +82,7 @@ Analog Limiter = 아날로그 리미터
 Analog Settings = 아날로그 설정
 Analog Stick = 아날로그 스틱
 Analog Style = 아날로그 스타일
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = 아날로그 리미터 버튼을 눌렀을 때
 Auto = 자동
 Auto-centering analog stick = 자동 센터링 아날로그 스틱

assets/lang/lo_LA.ini

@@ -82,6 +82,7 @@ Analog Limiter = ໂຕຈຳກັດອະນາລ໋ອກ
 Analog Settings = Analog Settings
 Analog Stick = ປຸ່ມອະນາລ໋ອກ
 Analog Style = Analog Style
+Analog trigger threshold = Analog trigger threshold
 AnalogLimiter Tip = ເມື່ອກົດທີ່ຂອບປຸ່ມອະນາລ໋ອກ ໂຕຈຳກັດອະນາລ໋ອກຈະເຮັດວຽກ
 Auto = ອັດຕະໂນມັດ
 Auto-centering analog stick = ອະນາລ໋ອກກັບຄືນຈຸດສູນກາງອັດຕະໂນມັດ