diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-11-23 00:24:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 00:24:45 +0100 |
| commit | 31458259b67fe67d4feb0b2d425f629e3792fdf7 (patch) | |
| tree | bc30c5e0272fb545ecc01e97ac3921b2958a389c /Source/Android/app/src/main/java/org | |
| parent | 5e442f6ffa7664dbc696e18693c1a4dd872fae8d (diff) | |
| parent | edb2c90b38f6b32cf6f687ed0d00b272fc5a5793 (diff) | |
Merge pull request #11212 from Sam-Belliveau/realtime-fps-and-vps-counter
VideoCommon: Improve FPS/VPS Counting with Euler + Moving Averages and Colors
Diffstat (limited to 'Source/Android/app/src/main/java/org')
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java index 21812df053..9c6e2ce476 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java @@ -173,6 +173,9 @@ public enum BooleanSetting implements AbstractBooleanSetting GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack", false), GFX_CROP(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "Crop", false), GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS", false), + GFX_SHOW_VPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowVPS", false), + GFX_SHOW_SPEED(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowSpeed", false), + GFX_SHOW_SPEED_COLORS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowSpeedColors", true), GFX_OVERLAY_STATS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "OverlayStats", false), GFX_DUMP_TEXTURES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DumpTextures", false), GFX_DUMP_MIP_TEXTURES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DumpMipTextures", false), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index cb4fcc38fb..1f073ace20 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -690,6 +690,13 @@ public final class SettingsFragmentPresenter R.string.video_backend, 0, R.array.videoBackendEntries, R.array.videoBackendValues)); sl.add(new CheckBoxSetting(mContext, BooleanSetting.GFX_SHOW_FPS, R.string.show_fps, R.string.show_fps_description)); + sl.add(new CheckBoxSetting(mContext, BooleanSetting.GFX_SHOW_VPS, R.string.show_vps, + R.string.show_vps_description)); + sl.add(new CheckBoxSetting(mContext, BooleanSetting.GFX_SHOW_SPEED, R.string.show_speed, + R.string.show_speed_description)); + sl.add(new CheckBoxSetting(mContext, BooleanSetting.GFX_SHOW_SPEED_COLORS, + R.string.show_speed_colors, + R.string.show_speed_colors_description)); sl.add(new SingleChoiceSettingDynamicDescriptions(mContext, IntSetting.GFX_SHADER_COMPILATION_MODE, R.string.shader_compilation_mode, 0, R.array.shaderCompilationModeEntries, R.array.shaderCompilationModeValues, |