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

GSdx: 

- Fixed the resource issue I had, so the new options are now also available in the old config dialog.
- Added some code that hides the hack options completely when they're disabled. By Bositman :p

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2619 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2010-02-21 12:56:25 +00:00
parent df39878a9e
commit 1b00ce0803
3 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -267,9 +267,12 @@ void GSSettingsDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAAEDIT), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAAEDIT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), allowHacks && hw); ShowWindow(GetDlgItem(m_hWnd, IDC_USERHACKS), allowHacks && hw)?SW_SHOW:SW_HIDE;
EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK), allowHacks && hw); ShowWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), allowHacks && hw)?SW_SHOW:SW_HIDE;
EnableWindow(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACK), allowHacks && hw); ShowWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK), allowHacks && hw)?SW_SHOW:SW_HIDE;
EnableWindow(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACKEDIT), allowHacks && hw); ShowWindow(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACKEDIT), allowHacks && hw)?SW_SHOW:SW_HIDE;
ShowWindow(GetDlgItem(m_hWnd, IDC_STATIC10), allowHacks && hw)?SW_SHOW:SW_HIDE;
ShowWindow(GetDlgItem(m_hWnd, IDC_SKIPDRAWHACK), allowHacks && hw)?SW_SHOW:SW_HIDE;
} }
} }

58
plugins/GSdx/GSdx.rc
View File

@ -70,7 +70,7 @@ IDB_LOGO10 BITMAP "res\\logo10.bmp"
// Dialog // Dialog
// //
IDD_CONFIG DIALOGEX 0, 0, 189, 295 IDD_CONFIG DIALOGEX 0, 0, 189, 343
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 "Settings..." CAPTION "Settings..."
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@ -85,28 +85,36 @@ BEGIN
COMBOBOX IDC_INTERLACE,71,86,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_INTERLACE,71,86,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,104,60,8 LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,104,60,8
COMBOBOX IDC_ASPECTRATIO,71,101,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_ASPECTRATIO,71,101,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "D3D internal res:",IDC_STATIC,7,132,55,8 DEFPUSHBUTTON "OK",IDOK,43,312,50,14
EDITTEXT IDC_RESX_EDIT,71,129,35,13,ES_AUTOHSCROLL | ES_NUMBER PUSHBUTTON "Cancel",IDCANCEL,96,312,50,14
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,132,11,14 CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,250,93,10
EDITTEXT IDC_RESY_EDIT,109,129,35,13,ES_AUTOHSCROLL | ES_NUMBER LTEXT "D3D internal res:",IDC_STATIC,18,135,55,8
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,133,132,11,14 EDITTEXT IDC_RESX_EDIT,82,132,35,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,162,33,10 CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,110,135,11,14
LTEXT "SW rend. threads:",IDC_STATIC,7,178,60,8 EDITTEXT IDC_RESY_EDIT,120,132,35,13,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_SWTHREADS_EDIT,71,176,35,13,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,144,135,11,14
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,179,11,14 CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,165,33,10
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,197,67,10 COMBOBOX IDC_UPSCALE_MULTIPLIER,82,147,74,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,198,58,10 LTEXT "Or use Scaling:",IDC_STATIC,18,150,49,8
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,210,82,10 LTEXT "Or use original PS2 resolution :",IDC_STATIC,18,165,99,8
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,211,93,10 EDITTEXT IDC_MSAAEDIT,123,182,35,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Wait VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,224,51,10 CONTROL "",IDC_MSAA,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,157,185,11,14
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,224,93,10 LTEXT "Experimental HW Anti Aliasing",IDC_STATIC,18,185,96,8
CONTROL "Edge anti-aliasing (AA1, sw-mode only)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,238,141,10 GROUPBOX "D3D Enhancements (can cause glitches)",IDC_STATIC,7,117,175,86
DEFPUSHBUTTON "OK",IDOK,43,275,50,14 LTEXT "SW rend. threads:",IDC_STATIC,7,208,60,8
PUSHBUTTON "Cancel",IDCANCEL,96,275,50,14 EDITTEXT IDC_SWTHREADS_EDIT,71,206,35,13,ES_AUTOHSCROLL | ES_NUMBER
COMBOBOX IDC_UPSCALE_MULTIPLIER,71,144,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,209,11,14
LTEXT "Or use Scaling:",IDC_STATIC,7,147,49,8 CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,222,67,10
LTEXT "D3D Enhancements (can cause glitches)",IDC_STATIC,31,117,128,8 CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,223,58,10
LTEXT "Or use original PS2 resolution :",IDC_STATIC,7,162,99,8 CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,236,82,10
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,236,93,10
CONTROL "Edge anti-aliasing",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,250,72,10
CONTROL "Alpha Hack",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,275,51,10
CONTROL "Offset Hack",IDC_OFFSETHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,275,51,10
GROUPBOX "Hacks (try to fix bad graphics)",IDC_USERHACKS,13,264,161,43,BS_CENTER
EDITTEXT IDC_SKIPDRAWHACKEDIT,55,287,40,14,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,94,289,11,14
LTEXT "SkipDraw:",IDC_STATIC,20,289,33,8
END END
IDD_CAPTURE DIALOGEX 0, 0, 279, 71 IDD_CAPTURE DIALOGEX 0, 0, 279, 71
@ -187,7 +195,7 @@ BEGIN
GROUPBOX "Hacks (try to fix bad graphics)",IDC_USERHACKS,13,240,161,40,BS_CENTER GROUPBOX "Hacks (try to fix bad graphics)",IDC_USERHACKS,13,240,161,40,BS_CENTER
EDITTEXT IDC_SKIPDRAWHACKEDIT,55,263,40,14,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SKIPDRAWHACKEDIT,55,263,40,14,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,94,265,11,14 CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,94,265,11,14
LTEXT "SkipDraw:",IDC_STATIC,20,267,33,8 LTEXT "SkipDraw:",IDC_STATIC,20,265,33,8
EDITTEXT IDC_MSAAEDIT,122,152,35,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_MSAAEDIT,122,152,35,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_MSAA,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,156,155,11,14 CONTROL "",IDC_MSAA,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,156,155,11,14
LTEXT "Experimental HW Anti Aliasing",IDC_STATIC,17,155,96,8 LTEXT "Experimental HW Anti Aliasing",IDC_STATIC,17,155,96,8
@ -211,7 +219,7 @@ BEGIN
VERTGUIDE, 89 VERTGUIDE, 89
VERTGUIDE, 182 VERTGUIDE, 182
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 288 BOTTOMMARGIN, 336
HORZGUIDE, 49 HORZGUIDE, 49
END END

30
plugins/GSdx/resource.h
View File

@ -35,20 +35,22 @@
#define IDC_RENDERER 2029 #define IDC_RENDERER 2029
#define IDC_INTERLACE 2030 #define IDC_INTERLACE 2030
#define IDC_ASPECTRATIO 2031 #define IDC_ASPECTRATIO 2031
#define IDC_ALPHAHACK 2031 #define IDC_ALPHAHACK 2032
#define IDC_SWTHREADS 2032 #define IDC_SWTHREADS 2033
#define IDC_SCALE 2033 #define IDC_SCALE 2034
#define IDC_UPSCALE_MULTIPLIER 2033 #define IDC_UPSCALE_MULTIPLIER 2035
#define IDC_BROWSE 2034 #define IDC_BROWSE 2036
#define IDC_OFFSETHACK 2034 #define IDC_OFFSETHACK 2037
#define IDC_FILENAME 2035 #define IDC_FILENAME 2038
#define IDC_SKIPDRAWHACK 2035 #define IDC_SKIPDRAWHACK 2039
#define IDC_WIDTH 2036 #define IDC_WIDTH 2040
#define IDC_HEIGHT 2037 #define IDC_HEIGHT 2041
#define IDC_CONFIGURE 2038 #define IDC_CONFIGURE 2042
#define IDC_WINDOWED 2039 #define IDC_ALPHAHACK2 2043
#define IDC_USERHACKS 2040 #define IDC_WINDOWED 2044
#define IDC_SKIPDRAWHACKEDIT 2041 #define IDC_USERHACKS 2045
#define IDC_SKIPDRAWHACKEDIT 2046
#define IDC_STATIC10 2047
#define IDR_CONVERT_FX 10000 #define IDR_CONVERT_FX 10000
#define IDR_TFX_FX 10001 #define IDR_TFX_FX 10001
#define IDR_MERGE_FX 10002 #define IDR_MERGE_FX 10002