mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-16 04:09:39 +00:00
Merge pull request #14131 from Simonx22/android/stereo-float-settings
Android: Convert stereo settings to floats
This commit is contained in:
commit
27f5c91624
@ -12,7 +12,9 @@ enum class FloatSetting(
|
||||
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_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
|
||||
get() = NativeConfig.isOverridden(file, section, key)
|
||||
|
||||
@ -127,13 +127,6 @@ enum class IntSetting(
|
||||
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(
|
||||
Settings.FILE_GFX,
|
||||
Settings.SECTION_GFX_SETTINGS,
|
||||
|
||||
@ -2181,27 +2181,29 @@ class SettingsFragmentPresenter(
|
||||
)
|
||||
)
|
||||
sl.add(
|
||||
IntSliderSetting(
|
||||
FloatSliderSetting(
|
||||
context,
|
||||
IntSetting.GFX_STEREO_DEPTH,
|
||||
FloatSetting.GFX_STEREO_DEPTH,
|
||||
R.string.stereoscopy_depth,
|
||||
R.string.stereoscopy_depth_description,
|
||||
0,
|
||||
100,
|
||||
"%",
|
||||
1
|
||||
0f,
|
||||
100f,
|
||||
"",
|
||||
1f,
|
||||
false
|
||||
)
|
||||
)
|
||||
sl.add(
|
||||
IntSliderSetting(
|
||||
FloatSliderSetting(
|
||||
context,
|
||||
IntSetting.GFX_STEREO_CONVERGENCE_PERCENTAGE,
|
||||
FloatSetting.GFX_STEREO_CONVERGENCE,
|
||||
R.string.stereoscopy_convergence,
|
||||
R.string.stereoscopy_convergence_description,
|
||||
0,
|
||||
200,
|
||||
"%",
|
||||
1
|
||||
0f,
|
||||
200f,
|
||||
"",
|
||||
0.01f,
|
||||
true
|
||||
)
|
||||
)
|
||||
sl.add(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user