mirror of https://github.com/PCSX2/pcsx2.git
gsdx:windows: Move CRC box to main dialog
The CRC hack option is always used regardless of whether the HW Hack checkbox is ticked. Move it to the main gsdx dialog and make it use the same descriptions that are used in Linux. And fix the accurate_blend_unit whitespace formatting.
This commit is contained in:
Jonathan Li
parent
e65a223c91
commit
6f6a7b92e4
|
|
@ -153,6 +153,7 @@ void GSSettingsDlg::OnInit()
|
|||
ComboBoxInit(IDC_UPSCALE_MULTIPLIER, theApp.m_gs_upscale_multiplier, theApp.GetConfig("upscale_multiplier", 1));
|
||||
ComboBoxInit(IDC_AFCOMBO, theApp.m_gs_max_anisotropy, theApp.GetConfig("MaxAnisotropy", 0));
|
||||
ComboBoxInit(IDC_ACCURATE_BLEND_UNIT, theApp.m_gs_acc_blend_level, theApp.GetConfig("accurate_blending_unit", 1));
|
||||
ComboBoxInit(IDC_CRC_LEVEL, theApp.m_gs_crc_level, theApp.GetConfig("crc_hack_level", 3));
|
||||
|
||||
CheckDlgButton(m_hWnd, IDC_FILTER, theApp.GetConfig("filter", 2));
|
||||
CheckDlgButton(m_hWnd, IDC_PALTEX, theApp.GetConfig("paltex", 0));
|
||||
|
|
@ -257,11 +258,16 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
|
|||
theApp.SetConfig("upscale_multiplier", 1);
|
||||
}
|
||||
|
||||
if(ComboBoxGetSelData(IDC_ACCURATE_BLEND_UNIT, data))
|
||||
{
|
||||
theApp.SetConfig("accurate_blending_unit", (int)data);
|
||||
}
|
||||
|
||||
if(ComboBoxGetSelData(IDC_ACCURATE_BLEND_UNIT, data))
|
||||
{
|
||||
theApp.SetConfig("accurate_blending_unit", (int)data);
|
||||
}
|
||||
|
||||
if (ComboBoxGetSelData(IDC_CRC_LEVEL, data))
|
||||
{
|
||||
theApp.SetConfig("crc_hack_level", (int)data);
|
||||
}
|
||||
|
||||
if(ComboBoxGetSelData(IDC_AFCOMBO, data))
|
||||
{
|
||||
theApp.SetConfig("MaxAnisotropy", (int)data);
|
||||
|
|
@ -559,13 +565,6 @@ void GSHacksDlg::OnInit()
|
|||
|
||||
SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_SETCURSEL, msaa2cb[min(theApp.GetConfig("UserHacks_MSAA", 0), 16)], 0);
|
||||
|
||||
char crctext[5][32] = { "None", "Minimal", "Partial", "Full", "Agressive" };
|
||||
for (unsigned short i = 0; i < 5; i++){
|
||||
SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_ADDSTRING, 0, (LPARAM)crctext[i]);
|
||||
}
|
||||
|
||||
SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_SETCURSEL, theApp.GetConfig("crc_hack_level", 3), 0);
|
||||
|
||||
CheckDlgButton(m_hWnd, IDC_ALPHAHACK, theApp.GetConfig("UserHacks_AlphaHack", 0));
|
||||
CheckDlgButton(m_hWnd, IDC_OFFSETHACK, theApp.GetConfig("UserHacks_HalfPixelOffset", 0));
|
||||
CheckDlgButton(m_hWnd, IDC_SPRITEHACK, theApp.GetConfig("UserHacks_SpriteHack", 0));
|
||||
|
|
@ -625,7 +624,6 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
|
|||
case IDOK:
|
||||
{
|
||||
theApp.SetConfig("UserHacks_MSAA", cb2msaa[(int)SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_GETCURSEL, 0, 0)]);
|
||||
theApp.SetConfig("crc_hack_level", (int)SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_GETCURSEL, 0, 0));
|
||||
theApp.SetConfig("UserHacks_AlphaHack", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHAHACK));
|
||||
theApp.SetConfig("UserHacks_HalfPixelOffset", (int)IsDlgButtonChecked(m_hWnd, IDC_OFFSETHACK));
|
||||
theApp.SetConfig("UserHacks_SpriteHack", (int)IsDlgButtonChecked(m_hWnd, IDC_SPRITEHACK));
|
||||
|
|
|
|||
|
|
@ -89,36 +89,34 @@ IDB_LOGOGL BITMAP "res\\logo-ogl.bmp"
|
|||
// Dialog
|
||||
//
|
||||
|
||||
IDD_HACKS DIALOGEX 0, 0, 315, 294
|
||||
IDD_HACKS DIALOGEX 0, 0, 315, 247
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Hacks Configuration"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,258,273,50,14
|
||||
GROUPBOX "Hack",IDC_STATIC,7,7,86,262,0,WS_EX_TRANSPARENT
|
||||
GROUPBOX "Description",IDC_STATIC,96,7,212,262
|
||||
DEFPUSHBUTTON "OK",IDOK,258,222,50,14
|
||||
GROUPBOX "Hack",IDC_STATIC,7,7,86,212,0,WS_EX_TRANSPARENT
|
||||
GROUPBOX "Description",IDC_STATIC,96,7,212,212
|
||||
LTEXT "MSAA",IDC_STATIC_MSAA,14,20,20,8
|
||||
LTEXT "Skipdraw",IDC_STATIC_SKIPDRAW,14,37,30,8
|
||||
EDITTEXT IDC_SKIPDRAWHACKEDIT,53,35,35,14,ES_RIGHT | ES_AUTOHSCROLL
|
||||
CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,88,35,10,14
|
||||
CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,85,34,10
|
||||
CONTROL "Half-pixel Offset",IDC_OFFSETHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,101,65,10
|
||||
CONTROL "Sprite",IDC_SPRITEHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,117,35,10
|
||||
LTEXT "USE AT YOUR OWN RISK!",IDC_STATIC,7,276,84,11,WS_DISABLED
|
||||
CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,57,34,10
|
||||
CONTROL "Half-pixel Offset",IDC_OFFSETHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,73,65,10
|
||||
CONTROL "Sprite",IDC_SPRITEHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,89,35,10
|
||||
LTEXT "USE AT YOUR OWN RISK!",IDC_STATIC,7,225,84,11,WS_DISABLED
|
||||
COMBOBOX IDC_MSAACB,35,18,54,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,134,64,10
|
||||
LTEXT "TEXT_GOES_HERE",IDC_HACK_DESCRIPTION,102,20,199,192
|
||||
CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,151,66,10
|
||||
CONTROL "Round Sprite",IDC_ROUND_SPRITE,"Button",BS_AUTO3STATE | WS_TABSTOP,14,168,66,8
|
||||
CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,186,60,10
|
||||
LTEXT "TC Offset X",IDC_STATIC_TCOFFSETX,14,204,37,8
|
||||
EDITTEXT IDC_TCOFFSETX2,53,202,35,14,ES_RIGHT | ES_AUTOHSCROLL
|
||||
CONTROL "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,202,11,14
|
||||
EDITTEXT IDC_TCOFFSETY2,53,219,35,14,ES_RIGHT | ES_AUTOHSCROLL
|
||||
CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,219,11,14
|
||||
LTEXT "TC Offset Y",IDC_STATIC_TCOFFSETY,14,221,37,8
|
||||
COMBOBOX IDC_CRC_LEVEL,13,65,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "CRC Hack Level",IDC_STATIC,14,54,51,8
|
||||
CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,123,66,10
|
||||
CONTROL "Round Sprite",IDC_ROUND_SPRITE,"Button",BS_AUTO3STATE | WS_TABSTOP,14,140,66,8
|
||||
CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,158,60,10
|
||||
LTEXT "TC Offset X",IDC_STATIC_TCOFFSETX,14,176,37,8
|
||||
EDITTEXT IDC_TCOFFSETX2,53,174,35,14,ES_RIGHT | ES_AUTOHSCROLL
|
||||
CONTROL "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,174,11,14
|
||||
EDITTEXT IDC_TCOFFSETY2,53,191,35,14,ES_RIGHT | ES_AUTOHSCROLL
|
||||
CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,191,11,14
|
||||
LTEXT "TC Offset Y",IDC_STATIC_TCOFFSETY,14,193,37,8
|
||||
END
|
||||
|
||||
IDD_SHADEBOOST DIALOGEX 0, 0, 316, 129
|
||||
|
|
@ -184,14 +182,13 @@ BEGIN
|
|||
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
|
||||
END
|
||||
|
||||
|
||||
IDD_CONFIG DIALOGEX 0, 0, 187, 402
|
||||
IDD_CONFIG DIALOGEX 0, 0, 187, 406
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Settings..."
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
CONTROL IDB_LOGO10,IDC_LOGO11,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,173,42
|
||||
DEFPUSHBUTTON "OK",IDOK,40,378,50,14
|
||||
DEFPUSHBUTTON "OK",IDOK,40,386,50,14
|
||||
LTEXT "Renderer:",IDC_STATIC,6,72,34,8
|
||||
COMBOBOX IDC_RENDERER,70,70,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Interlacing (F5):",IDC_STATIC,6,101,53,8
|
||||
|
|
@ -202,19 +199,19 @@ BEGIN
|
|||
EDITTEXT IDC_RESY_EDIT,130,161,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,154,161,11,14
|
||||
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,134,33,10
|
||||
LTEXT "Extra rendering threads:",IDC_STATIC,11,335,80,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,94,333,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,129,324,11,14
|
||||
LTEXT "Extra rendering threads:",IDC_STATIC,11,354,80,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,94,352,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,129,344,11,14
|
||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,92,146,74,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Or use Scaling:",IDC_STATIC,38,148,49,8
|
||||
LTEXT "Or use Scaling:",IDC_STATIC,37,148,49,8
|
||||
LTEXT "Original PS2 Resolution:",IDC_STATIC,10,134,80,8
|
||||
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,351,93,10
|
||||
PUSHBUTTON "Cancel",IDCANCEL,95,378,50,14
|
||||
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,370,93,10
|
||||
PUSHBUTTON "Cancel",IDCANCEL,95,386,50,14
|
||||
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,44
|
||||
CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,42
|
||||
GROUPBOX "Internal Resolution (can cause glitches)",IDC_STATIC,6,116,175,64,BS_CENTER
|
||||
GROUPBOX "Software Mode Settings",IDC_STATIC,6,322,175,50,BS_CENTER
|
||||
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,214,175,108,BS_CENTER
|
||||
GROUPBOX "Software Mode Settings",IDC_STATIC,6,341,175,43,BS_CENTER
|
||||
GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,214,175,126,BS_CENTER
|
||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,227,58,10
|
||||
CONTROL "Alpha Correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,243,87,10
|
||||
CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,243,82,10
|
||||
|
|
@ -234,7 +231,9 @@ BEGIN
|
|||
COMBOBOX IDC_OPENCL_DEVICE,70,84,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "HW OGL Depth",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,273,72,13
|
||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT,92,257,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Blending Unit Accuracy:",IDC_STATIC,11,260,76,10
|
||||
LTEXT "Blending Unit Accuracy:",IDC_STATIC,11,260,75,10
|
||||
COMBOBOX IDC_CRC_LEVEL,92,320,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "CRC Hack Level:",IDC_STATIC,32,322,54,8
|
||||
END
|
||||
|
||||
|
||||
|
|
@ -251,7 +250,7 @@ BEGIN
|
|||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 308
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 239
|
||||
BOTTOMMARGIN, 236
|
||||
END
|
||||
|
||||
IDD_SHADEBOOST, DIALOG
|
||||
|
|
@ -285,13 +284,12 @@ BEGIN
|
|||
LEFTMARGIN, 6
|
||||
RIGHTMARGIN, 181
|
||||
VERTGUIDE, 11
|
||||
VERTGUIDE, 87
|
||||
VERTGUIDE, 86
|
||||
TOPMARGIN, 6
|
||||
BOTTOMMARGIN, 360
|
||||
BOTTOMMARGIN, 400
|
||||
HORZGUIDE, 285
|
||||
END
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue