From 38e744b0806493ea75238ca70615cbb1672ce786 Mon Sep 17 00:00:00 2001 From: shenweip <1037567878@qq.com> Date: Sun, 29 Sep 2013 16:08:52 +0800 Subject: [PATCH] Add FXAA to menu item. --- Windows/WndMainWindow.cpp | 20 ++++++++++++++------ Windows/ppsspp.rc | 3 ++- Windows/resource.h | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index eb76c21830..58b05926e2 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -342,12 +342,12 @@ namespace MainWindow SUBMENU_FILE_SAVESTATE_SLOT = 6, // Game Settings submenus - SUBMENU_RENDERING_RESOLUTION = 7, - SUBMENU_WINDOW_SIZE = 8, - SUBMENU_RENDERING_MODE = 9, - SUBMENU_FRAME_SKIPPING = 10, - SUBMENU_TEXTURE_FILTERING = 11, - SUBMENU_TEXTURE_SCALING = 12, + SUBMENU_RENDERING_RESOLUTION = 8, + SUBMENU_WINDOW_SIZE = 9, + SUBMENU_RENDERING_MODE = 10, + SUBMENU_FRAME_SKIPPING = 11, + SUBMENU_TEXTURE_FILTERING = 12, + SUBMENU_TEXTURE_SCALING = 13, }; std::string GetMenuItemText(int menuID) { @@ -514,6 +514,7 @@ namespace MainWindow TranslateMenuItem(ID_OPTIONS_STRETCHDISPLAY); TranslateMenuItem(ID_OPTIONS_FULLSCREEN, L"\tAlt+Return, F11"); TranslateMenuItem(ID_OPTIONS_VSYNC); + TranslateMenuItem(ID_OPTIONS_FXAA); TranslateSubMenu("Rendering Resolution", MENU_OPTIONS, SUBMENU_RENDERING_RESOLUTION, L"\tCtrl+1"); TranslateMenuItem(ID_OPTIONS_SCREENAUTO); // Skip rendering resolution 2x-5x.. @@ -1205,6 +1206,12 @@ namespace MainWindow g_Config.bVSync = !g_Config.bVSync; break; + case ID_OPTIONS_FXAA: + g_Config.bFXAA = !g_Config.bFXAA; + if (gpu) + gpu->Resized(); + break; + case ID_TEXTURESCALING_OFF: setTexScalingMultiplier(TEXSCALING_OFF); break; case ID_TEXTURESCALING_2X: setTexScalingMultiplier(TEXSCALING_2X); break; case ID_TEXTURESCALING_3X: setTexScalingMultiplier(TEXSCALING_3X); break; @@ -1588,6 +1595,7 @@ namespace MainWindow CHECKITEM(ID_OPTIONS_SHOWFPS, g_Config.iShowFPSCounter); CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != 0); CHECKITEM(ID_OPTIONS_VSYNC, g_Config.bVSync); + CHECKITEM(ID_OPTIONS_FXAA, g_Config.bFXAA); CHECKITEM(ID_OPTIONS_TOPMOST, g_Config.bTopMost); CHECKITEM(ID_EMULATION_SOUND, g_Config.bEnableSound); CHECKITEM(ID_TEXTURESCALING_DEPOSTERIZE, g_Config.bTexDeposterize); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 63eb00aac5..90ffbe7d75 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -380,9 +380,10 @@ BEGIN MENUITEM "Stretch to Display", ID_OPTIONS_STRETCHDISPLAY MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN MENUITEM "VSync", ID_OPTIONS_VSYNC + MENUITEM "FXAA antialiasing", ID_OPTIONS_FXAA POPUP "Rendering Resolution" BEGIN - MENUITEM "Auto", ID_OPTIONS_SCREENAUTO + MENUITEM "Auto", ID_OPTIONS_SCREENAUTO MENUITEM "&1x", ID_OPTIONS_SCREEN1X MENUITEM "&2x", ID_OPTIONS_SCREEN2X MENUITEM "&3x", ID_OPTIONS_SCREEN3X diff --git a/Windows/resource.h b/Windows/resource.h index d4a78012ef..dd677e0d05 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -269,6 +269,7 @@ #define IDC_GEDBG_LISTS_ALLLISTS 40123 #define IDC_GEDBG_LISTS_STACK 40124 #define IDC_GEDBG_LISTS_SELECTEDLIST 40125 +#define ID_OPTIONS_FXAA 40126 // Dummy option to let the buffered rendering hotkey cycle through all the options. #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500