OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-27 13:00:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13099 from t895/default-fix

Browse Source 
android: Fix extra stick setting default values
This commit is contained in:
Charles Lombardo 2024-02-21 07:02:58 -05:00 committed by GitHub
commit 60fc6df407
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -780,7 +780,7 @@ class SettingsFragmentPresenter(
playerIndex: Int, playerIndex: Int,
paramName: String, paramName: String,
stick: NativeAnalog, stick: NativeAnalog,
defaultValue: Int defaultValue: Float
): AbstractIntSetting = ): AbstractIntSetting =
object : AbstractIntSetting { object : AbstractIntSetting {
val params get() = NativeInput.getStickParam(playerIndex, stick) val params get() = NativeInput.getStickParam(playerIndex, stick)
@ -788,7 +788,7 @@ class SettingsFragmentPresenter(
override val key = "" override val key = ""
override fun getInt(needsGlobal: Boolean): Int = override fun getInt(needsGlobal: Boolean): Int =
(params.get(paramName, 0.15f) * 100).toInt() (params.get(paramName, defaultValue) * 100).toInt()
override fun setInt(value: Int) { override fun setInt(value: Int) {
val tempParams = params val tempParams = params
@ -796,12 +796,12 @@ class SettingsFragmentPresenter(
NativeInput.setStickParam(playerIndex, stick, tempParams) NativeInput.setStickParam(playerIndex, stick, tempParams)
} }
override val defaultValue = defaultValue override val defaultValue = (defaultValue * 100).toInt()
override fun getValueAsString(needsGlobal: Boolean): String = override fun getValueAsString(needsGlobal: Boolean): String =
getInt(needsGlobal).toString() getInt(needsGlobal).toString()
override fun reset() = setInt(defaultValue) override fun reset() = setInt(this.defaultValue)
} }
private fun getExtraStickSettings( private fun getExtraStickSettings(
@ -811,11 +811,11 @@ class SettingsFragmentPresenter(
val stickIsController = val stickIsController =
NativeInput.isController(NativeInput.getStickParam(playerIndex, nativeAnalog)) NativeInput.isController(NativeInput.getStickParam(playerIndex, nativeAnalog))
val modifierRangeSetting = val modifierRangeSetting =
getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 50) getStickIntSettingFromParam(playerIndex, "modifier_scale", nativeAnalog, 0.5f)
val stickRangeSetting = val stickRangeSetting =
getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 95) getStickIntSettingFromParam(playerIndex, "range", nativeAnalog, 0.95f)
val stickDeadzoneSetting = val stickDeadzoneSetting =
getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 15) getStickIntSettingFromParam(playerIndex, "deadzone", nativeAnalog, 0.15f)
val out = mutableListOf<SettingsItem>().apply { val out = mutableListOf<SettingsItem>().apply {
if (stickIsController) { if (stickIsController) {