dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14131 from Simonx22/android/stereo-float-settings

Browse Source 
Android: Convert stereo settings to floats
This commit is contained in:
Jordan Woyak 2025-11-17 15:45:24 -06:00 committed by GitHub
commit 27f5c91624
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
View File

@ -12,7 +12,9 @@ enum class FloatSetting(
MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed", 1.0f), MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed", 1.0f),
MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock", 1.0f), MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock", 1.0f),
MAIN_VI_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "VIOverclock", 1.0f), MAIN_VI_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "VIOverclock", 1.0f),
GFX_CC_GAME_GAMMA(Settings.FILE_GFX, Settings.SECTION_GFX_COLOR_CORRECTION, "GameGamma", 2.35f); GFX_CC_GAME_GAMMA(Settings.FILE_GFX, Settings.SECTION_GFX_COLOR_CORRECTION, "GameGamma", 2.35f),
GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20.0f),
GFX_STEREO_CONVERGENCE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoConvergence", 20.0f);
override val isOverridden: Boolean override val isOverridden: Boolean
get() = NativeConfig.isOverridden(file, section, key) get() = NativeConfig.isOverridden(file, section, key)

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
View File

@ -127,13 +127,6 @@ enum class IntSetting(
0 0
), ),
GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0), GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0),
GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20),
GFX_STEREO_CONVERGENCE_PERCENTAGE(
Settings.FILE_GFX,
Settings.SECTION_STEREOSCOPY,
"StereoConvergencePercentage",
100
),
GFX_PERF_SAMP_WINDOW( GFX_PERF_SAMP_WINDOW(
Settings.FILE_GFX, Settings.FILE_GFX,
Settings.SECTION_GFX_SETTINGS, Settings.SECTION_GFX_SETTINGS,

26
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -2181,27 +2181,29 @@ class SettingsFragmentPresenter(
) )
) )
sl.add( sl.add(
IntSliderSetting( FloatSliderSetting(
context, context,
IntSetting.GFX_STEREO_DEPTH, FloatSetting.GFX_STEREO_DEPTH,
R.string.stereoscopy_depth, R.string.stereoscopy_depth,
R.string.stereoscopy_depth_description, R.string.stereoscopy_depth_description,
0, 0f,
100, 100f,
"%", "",
1 1f,
false
) )
) )
sl.add( sl.add(
IntSliderSetting( FloatSliderSetting(
context, context,
IntSetting.GFX_STEREO_CONVERGENCE_PERCENTAGE, FloatSetting.GFX_STEREO_CONVERGENCE,
R.string.stereoscopy_convergence, R.string.stereoscopy_convergence,
R.string.stereoscopy_convergence_description, R.string.stereoscopy_convergence_description,
0, 0f,
200, 200f,
"%", "",
1 0.01f,
true
) )
) )
sl.add( sl.add(