diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 72df55c303..f7e1b9cdd1 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -111,13 +111,13 @@ IDB_NULL BITMAP "res\\logo-null.bmp" // Dialog // -IDD_HACKS DIALOGEX 0, 0, 210, 283 +IDD_HACKS DIALOGEX 0, 0, 210, 267 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Advanced Settings & Hacks" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN // Hacks settings: - GROUPBOX "Hacks",IDC_STATIC,7,7,196,186,0,WS_EX_TRANSPARENT + GROUPBOX "Hacks",IDC_STATIC,7,7,196,170,0,WS_EX_TRANSPARENT // Column one - HW Hacks CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,58,8 CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,57,8 @@ -137,33 +137,31 @@ BEGIN COMBOBOX IDC_TRI_FILTER,80,96,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Half-pixel Offset:",IDC_OFFSETHACK_TEXT,14,114,62,8 COMBOBOX IDC_OFFSETHACK,80,111,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Sprite:",IDC_SPRITEHACK_TEXT,54,129,22,8 - COMBOBOX IDC_SPRITEHACK,80,126,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Round Sprite:",IDC_ROUND_SPRITE_TEXT,30,144,46,8 - COMBOBOX IDC_ROUND_SPRITE,80,141,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Skipdraw Range:",IDC_SKIPDRAWHACK_TEXT,14,159,62,8 - EDITTEXT IDC_SKIPDRAWOFFSETEDIT,80,156,58,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + RTEXT "Round Sprite:",IDC_ROUND_SPRITE_TEXT,30,129,46,8 + COMBOBOX IDC_ROUND_SPRITE,80,126,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Skipdraw Range:",IDC_SKIPDRAWHACK_TEXT,14,144,62,8 + EDITTEXT IDC_SKIPDRAWOFFSETEDIT,80,141,58,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SKIPDRAWOFFSET,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 - EDITTEXT IDC_SKIPDRAWHACKEDIT,138,156,58,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_SKIPDRAWHACKEDIT,138,141,58,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 - RTEXT "Texture Offsets",IDC_TCOFFSET_TEXT,14,175,59,8 - RTEXT "X:",IDC_TCOFFSETX_TEXT,81,175,10,8 - EDITTEXT IDC_TCOFFSETX2,94,172,44,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + RTEXT "Texture Offsets:",IDC_TCOFFSET_TEXT,14,159,62,8 + RTEXT "X:",IDC_TCOFFSETX_TEXT,81,159,10,8 + EDITTEXT IDC_TCOFFSETX2,94,156,44,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 - RTEXT "Y:",IDC_TCOFFSETY_TEXT,139,175,10,8 - EDITTEXT IDC_TCOFFSETY2,152,172,44,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + RTEXT "Y:",IDC_TCOFFSETY_TEXT,139,159,10,8 + EDITTEXT IDC_TCOFFSETY2,152,156,44,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 // OpenGL Advanced Settings: - GROUPBOX "OpenGL Advanced Settings",IDC_STATIC,7,194,196,64,0,WS_EX_TRANSPARENT - RTEXT "Geometry Shader:",IDC_GEOMETRY_SHADER_TEXT,14,210,62,8 - COMBOBOX IDC_GEOMETRY_SHADER_OVERRIDE,80,207,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Image Load Store:",IDC_IMAGE_LOAD_STORE_TEXT,14,225,62,8 - COMBOBOX IDC_IMAGE_LOAD_STORE,80,222,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Sparse Texture:",IDC_SPARSE_TEXTURE_TEXT,14,240,62,8 - COMBOBOX IDC_SPARSE_TEXTURE,80,237,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "OpenGL Advanced Settings",IDC_STATIC,7,180,196,61,0,WS_EX_TRANSPARENT + RTEXT "Geometry Shader:",IDC_GEOMETRY_SHADER_TEXT,14,194,62,8 + COMBOBOX IDC_GEOMETRY_SHADER_OVERRIDE,80,191,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Image Load Store:",IDC_IMAGE_LOAD_STORE_TEXT,14,209,62,8 + COMBOBOX IDC_IMAGE_LOAD_STORE,80,206,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Sparse Texture:",IDC_SPARSE_TEXTURE_TEXT,14,224,62,8 + COMBOBOX IDC_SPARSE_TEXTURE,80,221,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // General Settings: - DEFPUSHBUTTON "OK",IDOK,52,263,50,14 - DEFPUSHBUTTON "Cancel",IDCANCEL,108,263,50,14 + DEFPUSHBUTTON "OK",IDOK,52,247,50,14 + DEFPUSHBUTTON "Cancel",IDCANCEL,108,247,50,14 END IDD_SHADER DIALOGEX 0, 0, 248, 230 diff --git a/plugins/GSdx/Window/GSLinuxDialog.cpp b/plugins/GSdx/Window/GSLinuxDialog.cpp index 9dfc38447b..822f23d420 100644 --- a/plugins/GSdx/Window/GSLinuxDialog.cpp +++ b/plugins/GSdx/Window/GSLinuxDialog.cpp @@ -445,7 +445,7 @@ void populate_hack_table(GtkWidget* hack_table) GtkWidget* hack_skipdraw_label = left_label("Skipdraw Range:"); CreateSkipdrawSpinButtons(0, 10000); GtkWidget* hack_wild_check = CreateCheckBox("Wild Arms Hack", "UserHacks_WildHack"); - GtkWidget* hack_tco_label = left_label("Texture Offset:"); + GtkWidget* hack_tco_label = left_label("Texture Offsets:"); GtkWidget* hack_tco_x_spin = CreateSpinButton(0, 10000, "UserHacks_TCOffsetX"); GtkWidget* hack_tco_y_spin = CreateSpinButton(0, 10000, "UserHacks_TCOffsetY"); GtkWidget* align_sprite_check = CreateCheckBox("Align Sprite", "UserHacks_align_sprite_X"); @@ -458,8 +458,6 @@ void populate_hack_table(GtkWidget* hack_table) GtkWidget* hack_merge_sprite = CreateCheckBox("Merge Sprite", "UserHacks_merge_pp_sprite"); GtkWidget* hack_wrap_mem = CreateCheckBox("Memory Wrapping", "wrap_gs_mem"); - GtkWidget* hack_sprite_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_SpriteHack"); - GtkWidget* hack_sprite_label = left_label("Sprite:"); GtkWidget* stretch_hack_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_round_sprite_offset"); GtkWidget* stretch_hack_label = left_label("Round Sprite:"); GtkWidget* trilinear_box = CreateComboBoxFromVector(theApp.m_gs_trifilter, "UserHacks_TriFilter"); @@ -472,7 +470,6 @@ void populate_hack_table(GtkWidget* hack_table) AddTooltip(s_hack_skipdraw_offset_spin, IDC_SKIPDRAWHACK); AddTooltip(s_hack_skipdraw_spin, IDC_SKIPDRAWHACK); AddTooltip(hack_wild_check, IDC_WILDHACK); - AddTooltip(hack_sprite_label, hack_sprite_box, IDC_SPRITEHACK); AddTooltip(hack_tco_label, IDC_TCOFFSETX); AddTooltip(hack_tco_x_spin, IDC_TCOFFSETX); AddTooltip(hack_tco_y_spin, IDC_TCOFFSETX); @@ -501,7 +498,6 @@ void populate_hack_table(GtkWidget* hack_table) // Other upscaling hacks InsertWidgetInTable(hack_table , trilinear_label , trilinear_box); InsertWidgetInTable(hack_table , hack_offset_label , hack_offset_box); - InsertWidgetInTable(hack_table , hack_sprite_label , hack_sprite_box ); InsertWidgetInTable(hack_table , stretch_hack_label , stretch_hack_box ); InsertWidgetInTable(hack_table , hack_skipdraw_label , s_hack_skipdraw_offset_spin, s_hack_skipdraw_spin); InsertWidgetInTable(hack_table , hack_tco_label , hack_tco_x_spin, hack_tco_y_spin); diff --git a/plugins/GSdx/Window/GSSetting.cpp b/plugins/GSdx/Window/GSSetting.cpp index f4fcb96dcd..1462f04f5e 100644 --- a/plugins/GSdx/Window/GSSetting.cpp +++ b/plugins/GSdx/Window/GSSetting.cpp @@ -68,10 +68,6 @@ const char* dialog_message(int ID, bool* updateText) { return "Might fix some misaligned fog, bloom, or blend effect.\n" "The preferred option is Normal (Vertex) as it is most likely to resolve misalignment issues.\n" "The special cases are only useful in a couple of games like Captain Tsubasa."; - case IDC_SPRITEHACK: - return "Helps getting rid of black inner lines in some filtered sprites." - " Half option is the preferred one. Use it for Mana Khemia or Ar tonelico for example." - " Full can be used for Tales of Destiny."; case IDC_WILDHACK: return "Lowers the GS precision to avoid gaps between pixels when upscaling.\n" "Fixes the text on Wild Arms games."; diff --git a/plugins/GSdx/Window/GSSetting.h b/plugins/GSdx/Window/GSSetting.h index 8072871f99..3bd200dd33 100644 --- a/plugins/GSdx/Window/GSSetting.h +++ b/plugins/GSdx/Window/GSSetting.h @@ -49,7 +49,6 @@ enum { IDC_SKIPDRAWOFFSET, IDC_SKIPDRAWOFFSETEDIT, IDC_OFFSETHACK, - IDC_SPRITEHACK, IDC_WILDHACK, IDC_ALIGN_SPRITE, IDC_ROUND_SPRITE, diff --git a/plugins/GSdx/Window/GSSettingsDlg.cpp b/plugins/GSdx/Window/GSSettingsDlg.cpp index 01138d007e..47179add16 100644 --- a/plugins/GSdx/Window/GSSettingsDlg.cpp +++ b/plugins/GSdx/Window/GSSettingsDlg.cpp @@ -643,7 +643,6 @@ void GSHacksDlg::OnInit() ComboBoxInit(IDC_TRI_FILTER, theApp.m_gs_trifilter, theApp.GetConfigI("UserHacks_TriFilter")); ComboBoxInit(IDC_OFFSETHACK, theApp.m_gs_offset_hack, theApp.GetConfigI("UserHacks_HalfPixelOffset")); ComboBoxInit(IDC_ROUND_SPRITE, theApp.m_gs_hack, theApp.GetConfigI("UserHacks_round_sprite_offset")); - ComboBoxInit(IDC_SPRITEHACK, theApp.m_gs_hack, theApp.GetConfigI("UserHacks_SpriteHack")); ComboBoxInit(IDC_GEOMETRY_SHADER_OVERRIDE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_geometry_shader")); ComboBoxInit(IDC_IMAGE_LOAD_STORE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_GL_ARB_shader_image_load_store")); ComboBoxInit(IDC_SPARSE_TEXTURE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_GL_ARB_sparse_texture")); @@ -691,11 +690,9 @@ void GSHacksDlg::OnInit() EnableWindow(GetDlgItem(m_hWnd, IDC_TRI_FILTER_TEXT), hwhacks && ogl); // Upscaling hacks: - EnableWindow(GetDlgItem(m_hWnd, IDC_SPRITEHACK), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_WILDHACK), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_ALIGN_SPRITE), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_ROUND_SPRITE), hwhacks && !native); - EnableWindow(GetDlgItem(m_hWnd, IDC_SPRITEHACK_TEXT), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_ROUND_SPRITE_TEXT), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK_TEXT), hwhacks && !native); EnableWindow(GetDlgItem(m_hWnd, IDC_OFFSETHACK), hwhacks && !native); @@ -714,7 +711,6 @@ void GSHacksDlg::OnInit() AddTooltip(IDC_SKIPDRAWOFFSETEDIT); AddTooltip(IDC_SKIPDRAWOFFSET); AddTooltip(IDC_OFFSETHACK); - AddTooltip(IDC_SPRITEHACK); AddTooltip(IDC_WILDHACK); AddTooltip(IDC_ALPHASTENCIL); AddTooltip(IDC_ALIGN_SPRITE); @@ -794,10 +790,6 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam) { theApp.SetConfig("UserHacks_round_sprite_offset", (int)data); } - if (ComboBoxGetSelData(IDC_SPRITEHACK, data)) - { - theApp.SetConfig("UserHacks_SpriteHack", (int)data); - } if (ComboBoxGetSelData(IDC_OFFSETHACK, data)) { theApp.SetConfig("UserHacks_HalfPixelOffset", (int)data); diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index 366a3c1c92..51a5e7a5ca 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -75,34 +75,32 @@ #define IDC_WILDHACK 2100 #define IDC_OFFSETHACK 2101 #define IDC_OFFSETHACK_TEXT 2102 -#define IDC_SPRITEHACK 2103 -#define IDC_SPRITEHACK_TEXT 2104 -#define IDC_ALPHASTENCIL 2105 -#define IDC_TCOFFSETX 2106 -#define IDC_TCOFFSETX2 2107 -#define IDC_TCOFFSETX_TEXT 2108 -#define IDC_TCOFFSETY 2109 -#define IDC_TCOFFSETY2 2110 -#define IDC_TCOFFSETY_TEXT 2111 -#define IDC_TCOFFSET_TEXT 2112 -#define IDC_ROUND_SPRITE 2113 -#define IDC_ROUND_SPRITE_TEXT 2114 -#define IDC_ALIGN_SPRITE 2115 -#define IDC_TC_DEPTH 2116 -#define IDC_PRELOAD_GS 2117 -#define IDC_FAST_TC_INV 2118 -#define IDC_AUTO_FLUSH_HW 2119 -#define IDC_MEMORY_WRAPPING 2120 -#define IDC_TRI_FILTER 2121 -#define IDC_TRI_FILTER_TEXT 2122 -#define IDC_SAFE_FEATURES 2123 -#define IDC_MERGE_PP_SPRITE 2124 -#define IDC_CPU_FB_CONVERSION 2125 -#define IDC_SKIPDRAWHACK 2126 -#define IDC_SKIPDRAWHACK_TEXT 2127 -#define IDC_SKIPDRAWHACKEDIT 2128 -#define IDC_SKIPDRAWOFFSET 2129 -#define IDC_SKIPDRAWOFFSETEDIT 2130 +#define IDC_ALPHASTENCIL 2103 +#define IDC_TCOFFSETX 2104 +#define IDC_TCOFFSETX2 2105 +#define IDC_TCOFFSETX_TEXT 2106 +#define IDC_TCOFFSETY 2107 +#define IDC_TCOFFSETY2 2108 +#define IDC_TCOFFSETY_TEXT 2109 +#define IDC_TCOFFSET_TEXT 2110 +#define IDC_ROUND_SPRITE 2111 +#define IDC_ROUND_SPRITE_TEXT 2112 +#define IDC_ALIGN_SPRITE 2113 +#define IDC_TC_DEPTH 2114 +#define IDC_PRELOAD_GS 2115 +#define IDC_FAST_TC_INV 2116 +#define IDC_AUTO_FLUSH_HW 2117 +#define IDC_MEMORY_WRAPPING 2118 +#define IDC_TRI_FILTER 2119 +#define IDC_TRI_FILTER_TEXT 2120 +#define IDC_SAFE_FEATURES 2121 +#define IDC_MERGE_PP_SPRITE 2122 +#define IDC_CPU_FB_CONVERSION 2123 +#define IDC_SKIPDRAWHACK 2124 +#define IDC_SKIPDRAWHACK_TEXT 2125 +#define IDC_SKIPDRAWHACKEDIT 2126 +#define IDC_SKIPDRAWOFFSET 2127 +#define IDC_SKIPDRAWOFFSETEDIT 2128 // Shader: #define IDC_SHADEBOOST 2140 #define IDC_FXAA 2141