From 91c0bfceacae46ddf63032ff540d724bc95410a6 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 20 Aug 2019 22:24:47 -0400 Subject: [PATCH] android: settings: Add/update missing config options from latest master. --- src/android/app/src/main/jni/config.cpp | 9 +++++++++ src/android/app/src/main/jni/default_ini.h | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 120a6644f..5c7b69a3e 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -106,8 +106,15 @@ void Config::ReadValues() { Settings::values.frame_limit = static_cast(sdl2_config->GetInteger("Renderer", "frame_limit", 100)); + Settings::values.render_3d = static_cast( + sdl2_config->GetInteger("Renderer", "render_3d", 0)); Settings::values.factor_3d = static_cast(sdl2_config->GetInteger("Renderer", "factor_3d", 0)); + Settings::values.pp_shader_name = sdl2_config->GetString( + "Renderer", "pp_shader_name", + (Settings::values.render_3d == Settings::StereoRenderOption::Anaglyph) ? "dubois (builtin)" + : "none (builtin)"); + Settings::values.filter_mode = sdl2_config->GetBoolean("Renderer", "filter_mode", true); Settings::values.bg_red = static_cast(sdl2_config->GetReal("Renderer", "bg_red", 0.0)); Settings::values.bg_green = @@ -206,6 +213,8 @@ void Config::ReadValues() { Settings::values.log_filter = sdl2_config->GetString("Miscellaneous", "log_filter", "*:Info"); // Debugging + Settings::values.record_frame_times = + sdl2_config->GetBoolean("Debugging", "record_frame_times", false); Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false); Settings::values.gdbstub_port = static_cast(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index 924e55832..5436da9d4 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -135,10 +135,24 @@ bg_red = bg_blue = bg_green = +# Whether and how Stereoscopic 3D should be rendered +# 0 (default): Off, 1: Side by Side, 2: Anaglyph +render_3d = + # Change 3D Intensity # 0 - 100: Intensity. 0 (default) factor_3d = +# The name of the post processing shader to apply. +# Loaded from shaders if render_3d is off or side by side. +# Loaded from shaders/anaglyph if render_3d is anaglyph +pp_shader_name = + +# Whether to enable linear filtering or not +# This is required for some shaders to work correctly +# 0: Nearest, 1 (default): Linear +filter_mode = + [Layout] # Layout for the screen inside the render window. # 0 (default): Default Top Bottom Screen, 1: Single Screen Only, 2: Large Screen Small Screen, 3: Side by Side @@ -243,6 +257,8 @@ camera_inner_flip = log_filter = *:Info [Debugging] +# Record frame time data, can be found in the log directory. Boolean value +record_frame_times = # Port for listening to GDB connections. use_gdbstub=false gdbstub_port=24689