diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index c93028e8d2..167c2d79fe 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -43,7 +43,6 @@ BEGIN_EVENT_TABLE(CISOProperties, wxDialog) EVT_CLOSE(CISOProperties::OnClose) EVT_BUTTON(ID_CLOSE, CISOProperties::OnCloseClick) EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig) - EVT_CHOICE(ID_HACK, CISOProperties::SetRefresh) EVT_CHOICE(ID_EMUSTATE, CISOProperties::SetRefresh) EVT_CHOICE(ID_EMU_ISSUES, CISOProperties::SetRefresh) EVT_LISTBOX(ID_PATCHES_LIST, CISOProperties::ListSelectionChanged) @@ -278,7 +277,6 @@ void CISOProperties::CreateGUIControls() } // Video sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); - ProjHack1 = new wxCheckBox(m_GameConfig, ID_PROJHACK1, _("Projection Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); ForceFiltering = new wxCheckBox(m_GameConfig, ID_FORCEFILTERING, _("Force Filtering"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EFBCopyDisable = new wxCheckBox(m_GameConfig, ID_EFBCOPYDISABLE, _("Disable Copy to EFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EFBCopyDisableHotKey = new wxCheckBox(m_GameConfig, ID_EFBCOPYDISABLEHOTKEY, _("With Hotkey E"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); @@ -287,15 +285,16 @@ void CISOProperties::CreateGUIControls() DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Hack - Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Hack for: "), wxDefaultPosition, wxDefaultSize); + Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize); arrayStringFor_Hack.Add(_("None")); - arrayStringFor_Hack.Add(_("Zelda Twighlight Princess Bloom hack")); + arrayStringFor_Hack.Add(_("Zelda Twilight Princess Bloom hack")); arrayStringFor_Hack.Add(_("Super Mario Galaxy")); arrayStringFor_Hack.Add(_("Mario Kart Wii")); arrayStringFor_Hack.Add(_("Sonic and the Black Knight")); arrayStringFor_Hack.Add(_("Bleach Versus Crusade")); arrayStringFor_Hack.Add(_("Final Fantasy CC Echo of Time")); Hack = new wxChoice(m_GameConfig, ID_HACK, wxDefaultPosition, wxDefaultSize, arrayStringFor_Hack, 0, wxDefaultValidator); + //HLE Audio sbHLEaudioOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("HLE Audio")); @@ -323,7 +322,6 @@ void CISOProperties::CreateGUIControls() sbCoreOverrides->Add(OptimizeQuantizers, 0, wxEXPAND|wxLEFT, 5); sbWiiOverrides->Add(EnableProgressiveScan, 0, wxEXPAND|wxLEFT, 5); sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5); - sbVideoOverrides->Add(ProjHack1, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBCopyDisable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBCopyDisableHotKey, 0, wxEXPAND|wxLEFT, 5); @@ -613,7 +611,6 @@ void CISOProperties::LoadGameConfig() else TLBHack->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Wii", "ProgressiveScan", &bTemp)) EnableProgressiveScan->Set3StateValue((wxCheckBoxState)bTemp); else @@ -624,12 +621,6 @@ void CISOProperties::LoadGameConfig() else EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "ProjectionHax1", &bTemp)) - ProjHack1->Set3StateValue((wxCheckBoxState)bTemp); - else - ProjHack1->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "ForceFiltering", &bTemp)) ForceFiltering->Set3StateValue((wxCheckBoxState)bTemp); else @@ -671,19 +662,9 @@ void CISOProperties::LoadGameConfig() UseRE0Fix->Set3StateValue(wxCHK_UNDETERMINED); GameIni.Get("Video", "Hack", &iTemp, -1); - if (iTemp == -1) - { - iTemp = 0; - bRefreshList = true; - } Hack->SetSelection(iTemp); GameIni.Get("EmuState", "EmulationStateId", &iTemp, -1); - if (iTemp == -1) - { - iTemp = 0; - bRefreshList = true; - } EmuState->SetSelection(iTemp); GameIni.Get("EmuState", "EmulationIssues", &sTemp); @@ -730,12 +711,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - - if (ProjHack1->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "ProjectionHax1"); - else - GameIni.Set("Video", "ProjectionHax1", ProjHack1->Get3StateValue()); - if (ForceFiltering->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "ForceFiltering"); else @@ -751,11 +726,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Video", "EFBCopyDisableHotKey", EFBCopyDisableHotKey->Get3StateValue()); - if (ProjHack1->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "ProjectionHax1"); - else - GameIni.Set("Video", "ProjectionHax1", ProjHack1->Get3StateValue()); - if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "EFBToTextureEnable"); else @@ -781,7 +751,7 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("HLEaudio", "UseRE0Fix", UseRE0Fix->Get3StateValue()); - GameIni.Set("Video", "Hack", EmuState->GetSelection()); + GameIni.Set("Video", "Hack", Hack->GetSelection()); GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection()); GameIni.Set("EmuState", "EmulationIssues", EmuIssues->GetValue()); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 48cae0e39d..44edd5d803 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -84,7 +84,7 @@ class CISOProperties : public wxDialog // Wii wxCheckBox *EnableProgressiveScan, *EnableWideScreen; // Video - wxCheckBox *ProjHack1, *ForceFiltering, + wxCheckBox *ForceFiltering, *EFBCopyDisable, *EFBCopyDisableHotKey, *EFBToTextureEnable, *SafeTextureCache, *DstAlphaPass, *UseXFB; wxStaticText *Hacktext; @@ -158,7 +158,6 @@ class CISOProperties : public wxDialog ID_USEDUALCORE, ID_IDLESKIP, ID_TLBHACK, - ID_PROJHACK1, ID_FORCEFILTERING, ID_EFBCOPYDISABLE, ID_EFBCOPYDISABLEHOTKEY, diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 989723ae10..10e8b89f19 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -77,7 +77,7 @@ void VertexShaderManager::Shutdown() // ======================================================================================= // Syncs the shader constant buffers with xfmem // ---------------- -void VertexShaderManager::SetConstants(bool proj_hax_1 ,bool Hack_hack1 ,float Hack_value1 ,bool Hack_hack2 ,float Hack_value2 ,bool freeLook) +void VertexShaderManager::SetConstants(bool Hack_hack1 ,float Hack_value1 ,bool Hack_hack2 ,float Hack_value2 ,bool freeLook) { //nTransformMatricesChanged[0] = 0; nTransformMatricesChanged[1] = 256; //nNormalMatricesChanged[0] = 0; nNormalMatricesChanged[1] = 96; @@ -261,9 +261,8 @@ void VertexShaderManager::SetConstants(bool proj_hax_1 ,bool Hack_hack1 ,float H g_fProjectionMatrix[8] = 0.0f; g_fProjectionMatrix[9] = 0.0f; - g_fProjectionMatrix[10] = (Hack_hack1 ? -(Hack_value1 + xfregs.rawProjection[4]) : xfregs.rawProjection[4]); - - g_fProjectionMatrix[11] = (Hack_hack2 ? -(Hack_value2 + xfregs.rawProjection[5]) : xfregs.rawProjection[5]) + (proj_hax_1 ? 0.1f : 0.0f); + g_fProjectionMatrix[10] = (Hack_hack1 ? -(Hack_value1 + xfregs.rawProjection[4]) : xfregs.rawProjection[4]); + g_fProjectionMatrix[11] = (Hack_hack2 ? -(Hack_value2 + xfregs.rawProjection[5]) : xfregs.rawProjection[5]) + (0.1f); g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h index b2429f727d..2d01471a8d 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.h +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h @@ -28,7 +28,7 @@ public: static void Shutdown(); // constant management - static void SetConstants(bool proj_hax_1, bool Hack_hack1, float Hack_value1, bool Hack_hack2, float Hack_value2, bool freeLook); + static void SetConstants(bool Hack_hack1, float Hack_value1, bool Hack_hack2, float Hack_value2, bool freeLook); static void SetViewport(float* _Viewport); static void SetViewportChanged(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index f974ccf604..77e1a62f6a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -235,7 +235,7 @@ void Flush() if (numVertices) { // set global constants - VertexShaderManager::SetConstants(false, false, 0, false, 0, false); + VertexShaderManager::SetConstants( false, 0, false, 0, false); PixelShaderManager::SetConstants(); PixelShaderCache::SetShader(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp index d3e73cdb3f..08620be4b5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Config.cpp @@ -80,9 +80,7 @@ void Config::Load() iniFile.Get("Hacks", "EFBCopyDisable", &bEFBCopyDisable, 0); iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); - //iniFile.Get("Hacks", "ProjectionHax1", &bProjectionHax1, 0); iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToRAM, 0); - //iniFile.Get("Hacks", "Hack", &bHack, false); } void Config::GameIniLoad() { @@ -102,18 +100,12 @@ void Config::GameIniLoad() { if (iniFile->Exists("Video", "EFBCopyDisableHotKey")) iniFile->Get("Video", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); - //if (iniFile->Exists("Video", "ProjectionHax1")) - // iniFile->Get("Video", "ProjectionHax1", &bProjectionHax1, 0); - if (iniFile->Exists("Video", "EFBToTextureEnable")) iniFile->Get("Video", "EFBToTextureEnable", &bCopyEFBToRAM, 0); if (iniFile->Exists("Video", "SafeTextureCache")) iniFile->Get("Video", "SafeTextureCache", &bSafeTextureCache, false); - // if (iniFile->Exists("Video", "SMGhack")) - // iniFile->Get("Video", "SMGhack", &bSMGhack, false); - if (iniFile->Exists("Video", "MSAA")) iniFile->Get("Video", "MSAA", &iMultisampleMode, 0); @@ -173,9 +165,7 @@ void Config::Save() iniFile.Set("Hacks", "EFBCopyDisable", bEFBCopyDisable); iniFile.Set("Hacks", "EFBCopyDisableHotKey", bEFBCopyDisableHotKey); - //iniFile.Set("Hacks", "ProjectionHax1", bProjectionHax1); iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToRAM); - //iniFile.Set("Hacks", "SMGhack", bSMGhack); iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini"); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Config.h b/Source/Plugins/Plugin_VideoOGL/Src/Config.h index 7101c0bf43..045778c461 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Config.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Config.h @@ -93,7 +93,6 @@ struct Config // Hacks bool bEFBCopyDisable; bool bEFBCopyDisableHotKey; - bool bProjectionHax1; bool bHack; bool bCopyEFBToRAM; bool bSafeTextureCache; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 9437251d4f..262ed4dabe 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -364,12 +364,10 @@ void ConfigDialog::CreateGUIControls() // Hacks controls m_SafeTextureCache = new wxCheckBox(m_PageAdvanced, ID_SAFETEXTURECACHE, wxT("Use Safe texture cache"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - //m_ProjectionHax1 = new wxCheckBox(m_PageAdvanced, ID_PROJECTIONHACK1, wxT("ZTP Bloom hack"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - //m_Hack = new wxCheckBox(m_PageAdvanced, ID_HACK, wxT("Mario Galaxy Hack"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_PhackvalueCB = new wxChoice(m_PageAdvanced, ID_PHACKVALUE, wxDefaultPosition, wxDefaultSize, arrayStringFor_PhackvalueCB, 0, wxDefaultValidator); m_PhackvalueCB->Append(wxT("None")); - m_PhackvalueCB->Append(wxT("Zelda Twighlight Princess Bloom hack")); + m_PhackvalueCB->Append(wxT("Zelda Twilight Princess Bloom hack")); m_PhackvalueCB->Append(wxT("Super Mario Galaxy")); m_PhackvalueCB->Append(wxT("Mario Kart Wii")); m_PhackvalueCB->Append(wxT("Sonic and the Black Knight")); @@ -379,25 +377,19 @@ void ConfigDialog::CreateGUIControls() // Default values m_SafeTextureCache->SetValue(g_Config.bSafeTextureCache); - //m_ProjectionHax1->SetValue(g_Config.bProjectionHax1); - //m_Hack->SetValue(g_Config.bHack); // Tool tips m_SafeTextureCache->SetToolTip(wxT("This is useful to prevent Metroid Prime from crashing, but can cause problems in other games." "\n[This option will apply immediately and does not require a restart. However it may not" " be entirely safe to change it midgames.]")); - //m_ProjectionHax1->SetToolTip(wxT("This should get ZTP's Bloom to show")); + m_DstAlphaPass->SetToolTip(wxT("This renders a second time to set alpha to a constant value," "\nDisabling it may speed up some games, but could also cause glitches.")); m_DisableFog->SetToolTip(wxT("This option should not require a restart.")); - //m_SMGh->SetToolTip(wxT("SMG hack for Super Mario Galaxy, Mario Kart Wii and other game probably it will be disable for other game and during SMG ending sequence or movies use the M key to turn this option on or off")); // Sizers sHacks = new wxGridBagSizer(0, 0); - //sHacks->Add(m_ProjectionHax1, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL, 5); sHacks->Add(m_SafeTextureCache, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 5); - - //sHacks->Add(m_Hack, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 5); sHacks->Add(m_PhackvalueCB, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL, 5); sbHacks = new wxStaticBoxSizer(wxVERTICAL, m_PageAdvanced, wxT("Hacks")); @@ -601,9 +593,6 @@ void ConfigDialog::AdvancedSettingsChanged(wxCommandEvent& event) g_Config.bEFBCopyDisableHotKey = m_EFBCopyDisableHotKey->IsChecked(); break; // Hacks - /*case ID_PROJECTIONHACK1: - g_Config.bProjectionHax1 = m_ProjectionHax1->IsChecked(); - break;*/ case ID_SAFETEXTURECACHE: g_Config.bSafeTextureCache = m_SafeTextureCache->IsChecked(); break; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index 233d6db871..e77dd4ada6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -125,7 +125,6 @@ class ConfigDialog : public wxDialog wxCheckBox *m_CheckBox_DisableCopyEFB; wxRadioButton *m_Radio_CopyEFBToRAM, *m_Radio_CopyEFBToGL; wxCheckBox *m_EFBCopyDisableHotKey; - //wxCheckBox *m_ProjectionHax1; wxCheckBox *m_Hack; wxCheckBox *m_SafeTextureCache; // Screen size diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index d8ec763427..48b3b99939 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -281,7 +281,7 @@ void Flush() Renderer::SetRenderMode(Renderer::RM_Normal); // set global constants - VertexShaderManager::SetConstants(g_Config.bProjectionHax1, g_Config.bPhackvalue1, g_Config.fhackvalue1, g_Config.bPhackvalue2, g_Config.fhackvalue2, g_Config.bFreeLook); + VertexShaderManager::SetConstants(g_Config.bPhackvalue1, g_Config.fhackvalue1, g_Config.bPhackvalue2, g_Config.fhackvalue2, g_Config.bFreeLook); PixelShaderManager::SetConstants(); // finally bind