Skip to content

Commit

Permalink
Merge pull request Tinob#163 from SirMangler/master
Browse files Browse the repository at this point in the history
Hotkeys: Toggle Post Processing
  • Loading branch information
Tinob authored Jul 20, 2020
2 parents d23b77b + 4ffa41c commit 6098c1f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Source/Core/Core/HotkeyManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const std::string hotkey_labels[] = {
_trans("Toggle Texture Dumping"),
_trans("Toggle Custom Textures"),
_trans("Toggle Material Textures"),
_trans("Toggle Post Processing"),
// i18n: IR stands for internal resolution
_trans("Increase IR"),
// i18n: IR stands for internal resolution
Expand Down Expand Up @@ -249,7 +250,7 @@ const std::array<HotkeyGroupInfo, NUM_HOTKEY_GROUPS> groups_info = {
{_trans("Program Counter"), HK_SHOW_PC, HK_SET_PC},
{_trans("Breakpoint"), HK_BP_TOGGLE, HK_MBP_ADD},
{_trans("Wii"), HK_TRIGGER_SYNC_BUTTON, HK_BALANCEBOARD_CONNECT},
{_trans("Graphics Toggles"), HK_TOGGLE_CROP, HK_TOGGLE_MATERIAL_TEXTURES},
{_trans("Graphics Toggles"), HK_TOGGLE_CROP, HK_TOGGLE_POSTPROCESSING},
{_trans("Internal Resolution"), HK_INCREASE_IR, HK_DECREASE_IR},
{_trans("Freelook"), HK_FREELOOK_DECREASE_SPEED, HK_FREELOOK_RESET},
{_trans("3D"), HK_TOGGLE_STEREO_SBS, HK_TOGGLE_STEREO_3DVISION},
Expand Down
1 change: 1 addition & 0 deletions Source/Core/Core/HotkeyManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ enum Hotkey
HK_TOGGLE_DUMPTEXTURES,
HK_TOGGLE_TEXTURES,
HK_TOGGLE_MATERIAL_TEXTURES,
HK_TOGGLE_POSTPROCESSING,

HK_INCREASE_IR,
HK_DECREASE_IR,
Expand Down
5 changes: 5 additions & 0 deletions Source/Core/DolphinWX/Frame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1576,6 +1576,11 @@ void CFrame::ParseHotkeys()
Config::SetCurrent(Config::GFX_HIRES_MATERIAL_MAPS, !Config::Get(Config::GFX_HIRES_MATERIAL_MAPS));
}

if (IsHotkey(HK_TOGGLE_POSTPROCESSING))
{
Config::SetCurrent(Config::GFX_ENHANCE_POST_ENABLED, !Config::Get(Config::GFX_ENHANCE_POST_ENABLED));
}

static float debugSpeed = 1.0f;
if (IsHotkey(HK_FREELOOK_DECREASE_SPEED, true))
debugSpeed /= 1.1f;
Expand Down

0 comments on commit 6098c1f

Please sign in to comment.