Merge pull request #17489 from hrydgard/tilt-restore-setting

Restore "low end radius" (inverse deadzone) for tilt input
hrydgard · May 22, 2023 · d121b25 · d121b25
2 parents d5dfef8 + 15ff2cf
commit d121b25
Show file tree

Hide file tree

Showing 48 changed files with 79 additions and 7 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -681,6 +681,8 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("TiltSensitivityX", &g_Config.iTiltSensitivityX, 60, CfgFlag::PER_GAME),
 	ConfigSetting("TiltSensitivityY", &g_Config.iTiltSensitivityY, 60, CfgFlag::PER_GAME),
 	ConfigSetting("TiltAnalogDeadzoneRadius", &g_Config.fTiltAnalogDeadzoneRadius, 0.0f, CfgFlag::PER_GAME),
+	ConfigSetting("TiltInverseDeadzone", &g_Config.fTiltInverseDeadzone, 0.0f, CfgFlag::PER_GAME),
+	ConfigSetting("TiltCircularInverseDeadzone", &g_Config.bTiltCircularInverseDeadzone, true, CfgFlag::PER_GAME),
 	ConfigSetting("TiltInputType", &g_Config.iTiltInputType, 0, CfgFlag::PER_GAME),
 #endif
 

diff --git a/Core/Config.h b/Core/Config.h
@@ -279,6 +279,8 @@ struct Config {
 	int iTiltSensitivityY;
 	// The deadzone radius of the tilt. Only used in the analog mapping.
 	float fTiltAnalogDeadzoneRadius;
+	float fTiltInverseDeadzone;  // An inverse deadzone for the output, counteracting excessive deadzones applied by games. See #17483.
+	bool bTiltCircularInverseDeadzone;
 	// Type of tilt input currently selected: Defined in TiltEventProcessor.h
 	// 0 - no tilt, 1 - analog stick, 2 - D-Pad, 3 - Action Buttons (Tri, Cross, Square, Circle)
 	int iTiltInputType;

diff --git a/Core/TiltEventProcessor.cpp b/Core/TiltEventProcessor.cpp
@@ -40,6 +40,24 @@ inline float ApplyDeadzone(float x, float deadzone) {
 	}
 }
 
+// Also clamps to -1.0..1.0.
+// This applies a (circular if desired) inverse deadzone.
+inline void ApplyInverseDeadzone(float x, float y, float *outX, float *outY, float inverseDeadzone, bool circular) {
+	if (inverseDeadzone == 0.0f) {
+		*outX = Clamp(x, -1.0f, 1.0f);
+		*outY = Clamp(y, -1.0f, 1.0f);
+	}
+	if (circular) {
+		float magnitude = sqrtf(x * x + y * y);
+		magnitude = (magnitude + inverseDeadzone) / magnitude;
+		*outX = Clamp(x * magnitude, -1.0f, 1.0f);
+		*outY = Clamp(y * magnitude, -1.0f, 1.0f);
+	} else {
+		*outX = Clamp(x + copysignf(inverseDeadzone, x), -1.0f, 1.0f);
+		*outY = Clamp(y + copysignf(inverseDeadzone, y), -1.0f, 1.0f);
+	}
+}
+
 void ProcessTilt(bool landscape, float calibrationAngle, float x, float y, float z, bool invertX, bool invertY, float xSensitivity, float ySensitivity) {
 	if (g_Config.iTiltInputType == TILT_NULL) {
 		// Turned off - nothing to do.
@@ -79,9 +97,14 @@ void ProcessTilt(bool landscape, float calibrationAngle, float x, float y, float
 
 	if (g_Config.iTiltInputType == TILT_ANALOG) {
 		// Only analog mappings use the deadzone.
-
 		float adjustedTiltX = ApplyDeadzone(tiltX, g_Config.fTiltAnalogDeadzoneRadius);
 		float adjustedTiltY = ApplyDeadzone(tiltY, g_Config.fTiltAnalogDeadzoneRadius);
+
+		// Unlike regular deadzone, where per-axis is okay, inverse deadzone (to compensate for game deadzones) really needs to be
+		// applied on the two axes together.
+		// TODO: Share this code with the joystick code. For now though, we keep it separate.
+		ApplyInverseDeadzone(adjustedTiltX, adjustedTiltY, &adjustedTiltX, &adjustedTiltY, g_Config.fTiltInverseDeadzone, g_Config.bTiltCircularInverseDeadzone);
+
 		rawTiltAnalogX = adjustedTiltX;
 		rawTiltAnalogY = adjustedTiltY;
 		GenerateAnalogStickEvent(adjustedTiltX, adjustedTiltY);

diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock
diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp
@@ -123,6 +123,8 @@ void TiltAnalogSettingsScreen::CreateViews() {
 	settings->Add(new ItemHeader(co->T("Sensitivity")));
 	if (g_Config.iTiltInputType == 1) {
 		settings->Add(new PopupSliderChoiceFloat(&g_Config.fTiltAnalogDeadzoneRadius, 0.0f, 0.8f, 0.0f, co->T("Deadzone radius"), 0.01f, screenManager(), "/ 1.0"))->SetEnabledFunc(enabledFunc);
+		settings->Add(new PopupSliderChoiceFloat(&g_Config.fTiltInverseDeadzone, 0.0f, 0.8f, 0.0f, co->T("Low end radius"), 0.0f, screenManager(), "/ 1.0"))->SetEnabledFunc(enabledFunc);
+		settings->Add(new CheckBox(&g_Config.bTiltCircularInverseDeadzone, co->T("Circular low end radius")))->SetEnabledFunc(enabledFunc);
 	}
 	settings->Add(new PopupSliderChoice(&g_Config.iTiltSensitivityX, 0, 100, 60, co->T("Tilt Sensitivity along X axis"), screenManager(), "%"))->SetEnabledFunc(enabledFunc);
 	settings->Add(new PopupSliderChoice(&g_Config.iTiltSensitivityY, 0, 100, 60, co->T("Tilt Sensitivity along Y axis"), screenManager(), "%"))->SetEnabledFunc(enabledFunc);

diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -44,6 +44,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = ‎معايرة
 Calibrated = Calibrated
 Calibration = ‎المعايرة
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = ‎كلاسيكي
 Confine Mouse = ‎حجز مؤشر الماوس في حدود نافذة البرنامج

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Класик
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrar
 Calibrated = Calibrat
 Calibration = Calibració
+Circular low end radius = Ràdio inferior circular
 Circular stick input = Entrada de stick circular
 Classic = Clàssic
 Confine Mouse = Fixar el ratolí a l'àrea de la finestra/pantalla

diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibrovat
 Calibrated = Calibrated
 Calibration = Kalibrace
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasický
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibrer
 Calibrated = Calibrated
 Calibration = Kalibrering
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klassisk
 Confine Mouse = Begræns mus indenfor vindue/skærmområde

diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Kalibriere Analog Stick
 Calibrate = Kalibriere Steuerkreuz
 Calibrated = Kalibriert
 Calibration = Kalibrierung
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klassisch
 Confine Mouse = Maus in Fenster/sichtbaren Bereich einsperren

diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -60,6 +60,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrar stick
 Calibrate = Calibrar
 Calibrated = Calibrado
 Calibration = Calibración
+Circular low end radius = Circular low end radius
 Circular stick input = Entrada de stick circular
 Classic = Clásico
 Confine Mouse = Fijar el ratón al área de la ventana/pantalla

diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrar análogo
 Calibrate = Calibrar
 Calibrated = Calibrado
 Calibration = Calibración
+Circular low end radius = Circular low end radius
 Circular stick input = Entrada del stick circular
 Classic = Clásico
 Confine Mouse = Fijar el ratón al área de la ventana/pantalla

diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = دسته آنالوگ را کالیبراسیون کن
 Calibrate = ‎کالیبره کردن
 Calibrated = کالیبراسیون شد
 Calibration = ‎کالیبره کردن
+Circular low end radius = Circular شعاع کم پایان
 Circular stick input = ورودی دایره ای
 Classic = ‎کلاسیک
 Confine Mouse = ‎محدود کردن موس به ناحیه درون پنجره

diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klassinen
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Étalonner
 Calibrated = Calibrated
 Calibration = Étalonnage
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classique
 Confine Mouse = Capturer la souris dans la fenêtre/zone d'affichage

diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrar
 Calibrated = Calibrated
 Calibration = Calibración
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Clásico
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Βαθμονόμηση
 Calibrated = Calibrated
 Calibration = Βαθμονόμηση ψηφιακού πληκρολογίου
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Κλασικό
 Confine Mouse = Εγκλωβισμός ποντικιού μέσα στην περιοχή παραθύρου/οθόνης

diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibriraj
 Calibrated = Calibrated
 Calibration = Kalibracija
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasično
 Confine Mouse = Zaključaj miš u window/display području

diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibrálása
 Calibrated = Calibrated
 Calibration = Kalibrálás
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasszikus
 Confine Mouse = Egérkurzor rögzítése az ablakhoz

diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Kalibrasi stik analog
 Calibrate = Kalibrasi
 Calibrated = Dikalibrasi
 Calibration = Kalibrasi
+Circular low end radius = Circular low end radius
 Circular stick input = Masukan stik melingkar
 Classic = Klasik
 Confine Mouse = Kunci mouse di area layar

diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibra Stick Analogico
 Calibrate = Calibra
 Calibrated = Calibrato
 Calibration = Calibratura
+Circular low end radius = Circular low end radius
 Circular stick input = Input stick circolare
 Classic = Classico
 Confine Mouse = Confina il mouse all'interno dell'area della finestra

diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = アナログスティックをキャリブレートす
 Calibrate = キャリブレート
 Calibrated = キャリブレーション\n（調整）された動作
 Calibration = キャリブレーション
+Circular low end radius = Circular low end radius
 Circular stick input = 環状スティック入力
 Classic = クラシック
 Confine Mouse = ウィンドウ/表示領域内でマウスをトラップする

diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibrasi
 Calibrated = Calibrated
 Calibration = Kalibrasi
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasik
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = 아날로그 스틱 보정
 Calibrate = 보정
 Calibrated = 보정됨
 Calibration = 교정
+Circular low end radius = Circular low end radius
 Circular stick input = 원형 스틱 입력
 Classic = 클래식
 Confine Mouse = 창/표시 영역 내에서 마우스 트랩

diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = ປັບຄ່າຄວາມຄາດເຄື່ອນຂອງ
 Calibrated = Calibrated
 Calibration = ປັບຄ່າຄວາມຄາດເຄື່ອນ
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = ແບບດັ້ງເດີມ
 Confine Mouse = ຈຳກັດເມົ້າໃນໜ້າຕ່າງ/ພື້ນທີ່ສະແດງຜົນ

diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibruoti
 Calibrated = Calibrated
 Calibration = Kalibravimas
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasikinis
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasik
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibreren
 Calibrated = Calibrated
 Calibration = Kalibreren
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klassiek
 Confine Mouse = Muis binnen venster/weergavegebied vastzetten

diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Kalibrer
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Classic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Kalibracja Analoga
 Calibrate = Kalibracja
 Calibrated = Skalibrowany
 Calibration = Kalibracja
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasyczny
 Confine Mouse = Zablokuj myszkę w oknie

diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
@@ -60,6 +60,7 @@ Calibrate Analog Stick = Calibrar Direcional Analógico
 Calibrate = Calibrar
 Calibrated = Calibrado
 Calibration = Calibração
+Circular low end radius = Circular low end radius
 Circular stick input = Entrada circular do direcional
 Classic = Clássico
 Confine Mouse = Travar o mouse dentro da janela/área de exibição

diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
@@ -60,6 +60,7 @@ Calibrate Analog Stick = Calibrar Analógico
 Calibrate = Calibrar
 Calibrated = Calibrado
 Calibration = Calibração
+Circular low end radius = Circular low end radius
 Circular stick input = Entrada circular do direcional
 Classic = Clássico
 Confine Mouse = Travar o mouse dentro da janela/área de exibição

diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrare
 Calibrated = Calibrated
 Calibration = Calibrare
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Clasic
 Confine Mouse = Trap mouse within window/display area

diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Калибровка аналогового стика
 Calibrate = Калибровка
 Calibrated = Откалиблированный
 Calibration = Калибровка
+Circular low end radius = Circular low end radius
 Circular stick input = Круговой ввод стика
 Classic = Классический
 Confine Mouse = Не давать мыши выходить за пределы окна

diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Kalibrera analog styrspak
 Calibrate = Kalibrera
 Calibrated = Kalibrerad
 Calibration = Kalibrering
+Circular low end radius = Circulär inner-radie
 Circular stick input = Cirkulär analog input
 Classic = Klassisk
 Confine Mouse = Stäng in muspekaren i fönstret

diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
@@ -36,6 +36,7 @@ Calibrate Analog Stick = Calibrate Analog Stick
 Calibrate = Calibrate
 Calibrated = Calibrated
 Calibration = Calibration
+Circular low end radius = Circular low end radius
 Circular stick input = Circular stick input
 Classic = Klasiko
 Confine Mouse = Trap mouse within window/display area