ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: Shader & OSD window update 

Adds Texture Filtering Of Display option to the Shader dialog window Windows UI.

Updates the layouts of the Shader and OSD dialog windows to more closely resemble the Linux GUI.
This commit is contained in:
FlatOutPS2 2017-02-23 22:53:02 +01:00 committed by Gregory Hainaut
parent df5278df72
commit cb0a430aa4
5 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSSetting.cpp
View File

@ -166,10 +166,8 @@ const char* dialog_message(int ID, bool* updateText) {
case IDC_OSD_MAX_LOG: case IDC_OSD_MAX_LOG:
return "Sets the maximum number of log messages on the screen or in the buffer at the same time.\n\n" return "Sets the maximum number of log messages on the screen or in the buffer at the same time.\n\n"
"The maximum number of messages visible on the screen at the same time also depends on the character size."; "The maximum number of messages visible on the screen at the same time also depends on the character size.";
#ifdef __unix__
case IDC_LINEAR_PRESENT: case IDC_LINEAR_PRESENT:
return "Use bilinear filtering when Upscaling/Downscaling the image to the screen. Disable it if you want a sharper/pixelated output."; return "Use bilinear filtering when Upscaling/Downscaling the image to the screen. Disable it if you want a sharper/pixelated output.";
#endif
// Exclusive for Hardware Renderer // Exclusive for Hardware Renderer
case IDC_PRELOAD_GS: case IDC_PRELOAD_GS:
return "Uploads GS data when rendering a new frame to reproduce some effects accurately. Fixes black screen issues in games like Armored Core: Last Raven."; return "Uploads GS data when rendering a new frame to reproduce some effects accurately. Fixes black screen issues in games like Armored Core: Last Raven.";

7
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -474,9 +474,13 @@ void GSShaderDlg::OnInit()
// FXAA shader // FXAA shader
CheckDlgButton(m_hWnd, IDC_FXAA, theApp.GetConfigB("fxaa")); CheckDlgButton(m_hWnd, IDC_FXAA, theApp.GetConfigB("fxaa"));
// Texture Filtering Of Display
CheckDlgButton(m_hWnd, IDC_LINEAR_PRESENT, theApp.GetConfigB("linear_present"));
AddTooltip(IDC_SHADEBOOST); AddTooltip(IDC_SHADEBOOST);
AddTooltip(IDC_SHADER_FX); AddTooltip(IDC_SHADER_FX);
AddTooltip(IDC_FXAA); AddTooltip(IDC_FXAA);
AddTooltip(IDC_LINEAR_PRESENT);
UpdateControls(); UpdateControls();
} }
@ -575,6 +579,9 @@ bool GSShaderDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
// FXAA shader // FXAA shader
theApp.SetConfig("Fxaa", (int)IsDlgButtonChecked(m_hWnd, IDC_FXAA)); theApp.SetConfig("Fxaa", (int)IsDlgButtonChecked(m_hWnd, IDC_FXAA));
// Texture Filtering Of Display
theApp.SetConfig("linear_present", (int)IsDlgButtonChecked(m_hWnd, IDC_LINEAR_PRESENT));
// External FX Shader // External FX Shader
theApp.SetConfig("shaderfx", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX)); theApp.SetConfig("shaderfx", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX));

2
plugins/GSdx/GSdx.cpp
View File

@ -332,7 +332,7 @@ void GSdxApp::Init()
#else #else
m_default_configuration["osd_fontname"] = "/usr/share/fonts/truetype/freefont/FreeSerif.ttf"; m_default_configuration["osd_fontname"] = "/usr/share/fonts/truetype/freefont/FreeSerif.ttf";
#endif #endif
m_default_configuration["osd_fontsize"] = "48"; m_default_configuration["osd_fontsize"] = "32";
m_default_configuration["osd_indicator_enabled"] = "0"; m_default_configuration["osd_indicator_enabled"] = "0";
m_default_configuration["osd_log_enabled"] = "1"; m_default_configuration["osd_log_enabled"] = "1";
m_default_configuration["osd_log_speed"] = "6"; m_default_configuration["osd_log_speed"] = "6";

91
plugins/GSdx/GSdx.rc
View File

@ -155,62 +155,61 @@ BEGIN
DEFPUSHBUTTON "Cancel",IDCANCEL,108,258,50,14 DEFPUSHBUTTON "Cancel",IDCANCEL,108,258,50,14
END END
IDD_SHADER DIALOGEX 0, 0, 248, 250 IDD_SHADER DIALOGEX 0, 0, 248, 230
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Shader Configuration" CAPTION "Shader Configuration"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,69,231,50,14 CONTROL "Texture Filtering of Display",IDC_LINEAR_PRESENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,100,10
DEFPUSHBUTTON "Cancel",IDCANCEL,126,231,50,14 CONTROL "FXAA Shader",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,19,54,10
CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,46,90,10 CONTROL "Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,32,90,10
LTEXT "Saturation",IDC_STATIC,15,64,34,8 LTEXT "Shade Boost Brightness",IDC_STATIC,16,50,80,8
CONTROL "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,62,165,15 CONTROL "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,48,135,15
LTEXT "Brightness",IDC_STATIC,15,89,34,8 RTEXT "100",IDC_BRIGHTNESS_TEXT,225,50,15,8
CONTROL "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,87,165,15 LTEXT "Shade Boost Contrast",IDC_STATIC,16,75,80,8
LTEXT "Contrast",IDC_STATIC,15,114,29,8 CONTROL "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,73,135,15
CONTROL "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,111,165,15 RTEXT "100",IDC_CONTRAST_TEXT,225,75,15,8
RTEXT "100",IDC_SATURATION_TEXT,220,64,15,8 LTEXT "Shade Boost Saturation",IDC_STATIC,16,100,80,8
RTEXT "100",IDC_BRIGHTNESS_TEXT,220,89,15,8 CONTROL "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,95,98,135,15
RTEXT "100",IDC_CONTRAST_TEXT,220,114,15,8 RTEXT "100",IDC_SATURATION_TEXT,225,100,15,8
CONTROL "Enable FXAA",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,6,54,10 CONTROL "External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,116,90,10
CONTROL "Enable External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,156,90,10 LTEXT "External Shader",IDC_SHADER_FX_TEXT,16,131,75,8
LTEXT "External Shader",IDC_SHADER_FX_TEXT,15,171,75,8 EDITTEXT IDC_SHADER_FX_EDIT,16,139,170,14,ES_AUTOHSCROLL
EDITTEXT IDC_SHADER_FX_EDIT,15,179,170,14,ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_SHADER_FX_BUTTON,196,139,36,14
PUSHBUTTON "Browse",IDC_SHADER_FX_BUTTON,196,179,36,14 LTEXT "External Shader Config",IDC_SHADER_FX_CONF_TEXT,16,156,75,8
LTEXT "External Shader Config",IDC_SHADER_FX_CONF_TEXT,15,196,75,8 PUSHBUTTON "Browse",IDC_SHADER_FX_CONF_BUTTON,196,164,36,14
PUSHBUTTON "Browse",IDC_SHADER_FX_CONF_BUTTON,196,204,36,14 EDITTEXT IDC_SHADER_FX_CONF_EDIT,16,164,170,14,ES_AUTOHSCROLL
EDITTEXT IDC_SHADER_FX_CONF_EDIT,15,204,170,14,ES_AUTOHSCROLL COMBOBOX IDC_TVSHADER,75,184,76,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_TVSHADER,75,4,76,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "TV Shader (F7):",IDC_STATIC,16,186,55,8
LTEXT "TV Shader (F7):",IDC_STATIC,15,6,55,8 DEFPUSHBUTTON "OK",IDOK,69,208,50,14
GROUPBOX "Shade-Boost Settings",IDC_STATIC,6,28,236,106,BS_CENTER DEFPUSHBUTTON "Cancel",IDCANCEL,126,208,50,14
GROUPBOX "External Shader Settings",IDC_STATIC,6,138,236,88,BS_CENTER
END END
IDD_OSD DIALOGEX 0, 0, 191, 229 IDD_OSD DIALOGEX 0, 0, 210, 140
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "OSD Configuration" CAPTION "OSD Configuration"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,42,209,50,14 LTEXT "Font:",IDC_STATIC,16,7,25,8
DEFPUSHBUTTON "Cancel",IDCANCEL,99,209,50,14 PUSHBUTTON "Browse",IDC_OSD_FONT_BUTTON,164,5,36,14
CONTROL "Enable Log",IDC_OSD_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,6,54,10 EDITTEXT IDC_OSD_FONT_EDIT,45,5,114,14,ES_AUTOHSCROLL
CONTROL "Enable Monitor",IDC_OSD_MONITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,22,90,10 LTEXT "Size:",IDC_STATIC,16,24,120,8
CONTROL "Enable Indicator",IDC_OSD_INDICATOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,38,90,10 EDITTEXT IDC_OSD_SIZE_EDIT,116,22,84,14,ES_RIGHT | ES_AUTOHSCROLL
LTEXT "Character size:",IDC_STATIC,15,57,120,8 CONTROL "",IDC_OSD_SIZE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,116,22,11,14
EDITTEXT IDC_OSD_SIZE_EDIT,15,68,58,14,ES_RIGHT | ES_AUTOHSCROLL LTEXT "Transparency:",IDC_STATIC,16,40,50,8
CONTROL "",IDC_OSD_SIZE,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,15,69,11,14 CONTROL "",IDC_OSD_TRANSPARENCY_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,112,38,78,15
LTEXT "Scrolling speed:",IDC_STATIC,15,90,120,8 RTEXT "100",IDC_OSD_TRANSPARENCY_TEXT,184,40,15,8
EDITTEXT IDC_OSD_SPEED_EDIT,15,101,58,14,ES_RIGHT | ES_AUTOHSCROLL CONTROL "Enable Log",IDC_OSD_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,56,54,10
CONTROL "", IDC_OSD_SPEED,"msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,15,102,11,14 LTEXT "Scrolling Speed:",IDC_STATIC,16,72,120,8
LTEXT "Maximum number of onscreen messages:",IDC_STATIC,15,121,150,8 EDITTEXT IDC_OSD_SPEED_EDIT,116,70,84,14,ES_RIGHT | ES_AUTOHSCROLL
EDITTEXT IDC_OSD_MAX_LOG_EDIT,15,132,58,14,ES_RIGHT | ES_AUTOHSCROLL CONTROL "", IDC_OSD_SPEED,"msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,116,70,11,14
CONTROL "", IDC_OSD_MAX_LOG,"msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,15,133,11,14 LTEXT "Maximum Onscreen Messages:",IDC_STATIC,16,88,150,8
LTEXT "Transparency:",IDC_STATIC,15,151,50,8 EDITTEXT IDC_OSD_MAX_LOG_EDIT,116,86,84,14,ES_RIGHT | ES_AUTOHSCROLL
CONTROL "",IDC_OSD_TRANSPARENCY_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,15,163,115,15 CONTROL "", IDC_OSD_MAX_LOG,"msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,116,86,11,14
RTEXT "100",IDC_OSD_TRANSPARENCY_TEXT,130,167,15,8 CONTROL "Enable Monitor",IDC_OSD_MONITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,103,65,10
LTEXT "Font:",IDC_STATIC,15,180,75,8 //CONTROL "Enable Indicator",IDC_OSD_INDICATOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,103,65,10 // Currently not implemented
PUSHBUTTON "Browse",IDC_OSD_FONT_BUTTON,140,188,36,14 DEFPUSHBUTTON "OK",IDOK,42,120,50,14
EDITTEXT IDC_OSD_FONT_EDIT,15,188,115,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Cancel",IDCANCEL,118,120,50,14
END END
IDD_CAPTURE DIALOGEX 0, 0, 279, 71 IDD_CAPTURE DIALOGEX 0, 0, 279, 71

1
plugins/GSdx/resource.h
View File

@ -116,6 +116,7 @@
#define IDC_SHADER_FX_TEXT 2153 #define IDC_SHADER_FX_TEXT 2153
#define IDC_SHADER_FX_CONF_TEXT 2154 #define IDC_SHADER_FX_CONF_TEXT 2154
#define IDC_TVSHADER 2155 #define IDC_TVSHADER 2155
#define IDC_LINEAR_PRESENT 2156
// OSD: // OSD:
#define IDC_OSD_LOG 2170 #define IDC_OSD_LOG 2170
#define IDC_OSD_MONITOR 2171 #define IDC_OSD_MONITOR 2171