emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-13 09:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix settings load and save

Browse Source
This commit is contained in:
David Griswold 2024-08-27 16:11:06 -03:00 committed by OpenSauce04
parent cf1ad67e81
commit e032c223d2
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/jni/default_ini.h
View File

@ -165,6 +165,10 @@ render_3d =
# 0 - 100: Intensity. 0 (default) # 0 - 100: Intensity. 0 (default)
factor_3d = factor_3d =
# Swap Eyes in 3d
# true or false (default)
swap_eyes_3d =
# The name of the post processing shader to apply. # The name of the post processing shader to apply.
# Loaded from shaders if render_3d is off or side by side. # Loaded from shaders if render_3d is off or side by side.
pp_shader_name = pp_shader_name =

2
src/citra_qt/configuration/config.cpp
View File

@ -512,6 +512,7 @@ void QtConfig::ReadLayoutValues() {
ReadGlobalSetting(Settings::values.render_3d); ReadGlobalSetting(Settings::values.render_3d);
ReadGlobalSetting(Settings::values.factor_3d); ReadGlobalSetting(Settings::values.factor_3d);
ReadGlobalSetting(Settings::values.swap_eyes_3d);
ReadGlobalSetting(Settings::values.filter_mode); ReadGlobalSetting(Settings::values.filter_mode);
ReadGlobalSetting(Settings::values.pp_shader_name); ReadGlobalSetting(Settings::values.pp_shader_name);
ReadGlobalSetting(Settings::values.anaglyph_shader_name); ReadGlobalSetting(Settings::values.anaglyph_shader_name);
@ -1078,6 +1079,7 @@ void QtConfig::SaveLayoutValues() {
WriteGlobalSetting(Settings::values.render_3d); WriteGlobalSetting(Settings::values.render_3d);
WriteGlobalSetting(Settings::values.factor_3d); WriteGlobalSetting(Settings::values.factor_3d);
WriteGlobalSetting(Settings::values.swap_eyes_3d);
WriteGlobalSetting(Settings::values.filter_mode); WriteGlobalSetting(Settings::values.filter_mode);
WriteGlobalSetting(Settings::values.pp_shader_name); WriteGlobalSetting(Settings::values.pp_shader_name);
WriteGlobalSetting(Settings::values.anaglyph_shader_name); WriteGlobalSetting(Settings::values.anaglyph_shader_name);

4
src/citra_sdl/default_ini.h
View File

@ -163,6 +163,10 @@ render_3d =
# 0 - 100: Intensity. 0 (default) # 0 - 100: Intensity. 0 (default)
factor_3d = factor_3d =
# Swap Eyes in 3D
# true or false (default)
swap_eyes_3d =
# Change Default Eye to Render When in Monoscopic Mode # Change Default Eye to Render When in Monoscopic Mode
# 0 (default): Left, 1: Right # 0 (default): Left, 1: Right
mono_render_option = mono_render_option =

2
src/common/settings.cpp
View File

@ -105,6 +105,7 @@ void LogSettings() {
log_setting("Renderer_DisableRightEyeRender", values.disable_right_eye_render.GetValue()); log_setting("Renderer_DisableRightEyeRender", values.disable_right_eye_render.GetValue());
log_setting("Stereoscopy_Render3d", values.render_3d.GetValue()); log_setting("Stereoscopy_Render3d", values.render_3d.GetValue());
log_setting("Stereoscopy_Factor3d", values.factor_3d.GetValue()); log_setting("Stereoscopy_Factor3d", values.factor_3d.GetValue());
log_setting("Stereoscopy_Swap_Eyes",values.swap_eyes_3d.GetValue());
log_setting("Stereoscopy_MonoRenderOption", values.mono_render_option.GetValue()); log_setting("Stereoscopy_MonoRenderOption", values.mono_render_option.GetValue());
if (values.render_3d.GetValue() == StereoRenderOption::Anaglyph) { if (values.render_3d.GetValue() == StereoRenderOption::Anaglyph) {
log_setting("Renderer_AnaglyphShader", values.anaglyph_shader_name.GetValue()); log_setting("Renderer_AnaglyphShader", values.anaglyph_shader_name.GetValue());
@ -211,6 +212,7 @@ void RestoreGlobalState(bool is_powered_on) {
values.bg_green.SetGlobal(true); values.bg_green.SetGlobal(true);
values.bg_blue.SetGlobal(true); values.bg_blue.SetGlobal(true);
values.render_3d.SetGlobal(true); values.render_3d.SetGlobal(true);
values.swap_eyes_3d.SetGlobal(true);
values.factor_3d.SetGlobal(true); values.factor_3d.SetGlobal(true);
values.filter_mode.SetGlobal(true); values.filter_mode.SetGlobal(true);
values.pp_shader_name.SetGlobal(true); values.pp_shader_name.SetGlobal(true);

2
src/common/settings.h
View File

@ -541,7 +541,7 @@ struct Values {
SwitchableSetting<StereoRenderOption> render_3d{StereoRenderOption::Off, "render_3d"}; SwitchableSetting<StereoRenderOption> render_3d{StereoRenderOption::Off, "render_3d"};
SwitchableSetting<u32> factor_3d{0, "factor_3d"}; SwitchableSetting<u32> factor_3d{0, "factor_3d"};
SwitchableSetting<bool> swap_eyes_3d{false, "swap_eyes"}; SwitchableSetting<bool> swap_eyes_3d{false, "swap_eyes_3d"};
SwitchableSetting<MonoRenderOption> mono_render_option{MonoRenderOption::LeftEye, SwitchableSetting<MonoRenderOption> mono_render_option{MonoRenderOption::LeftEye,
"mono_render_option"}; "mono_render_option"};