From 095ba7bcd622627aa6eb45e0cfc3ae7266622b58 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Mon, 9 Mar 2009 20:18:36 +0000 Subject: [PATCH] Reintroduce force filter. I had even forgot to remove the feature, i had only removed the checkbox :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2634 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 13 ++++++++++--- Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 22046344ce..6e5e8a635a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -35,6 +35,7 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog) EVT_CHOICE(ID_MSAAMODECB, ConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_NATIVERESOLUTION, ConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_USEXFB, ConfigDialog::GeneralSettingsChanged) + EVT_CHECKBOX(ID_FORCEFILTERING, ConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_AUTOSCALE, ConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_KEEPAR_4_3, ConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_KEEPAR_16_9, ConfigDialog::GeneralSettingsChanged) @@ -229,6 +230,7 @@ void ConfigDialog::CreateGUIControls() m_MaxAnisotropyCB->Append(wxT("8x")); m_MaxAnisotropyCB->Append(wxT("16x")); m_MaxAnisotropyCB->SetSelection(g_Config.iMaxAnisotropy - 1); + m_ForceFiltering = new wxCheckBox(m_PageGeneral, ID_FORCEFILTERING, wxT("Force bi/trilinear filtering"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Usage: The wxGBPosition() must have a column and row sGeneral = new wxBoxSizer(wxVERTICAL); @@ -261,6 +263,7 @@ void ConfigDialog::CreateGUIControls() sEnhancements->Add(m_MaxAnisotropyCB, wxGBPosition(0, 1), wxGBSpan(1, 2), wxALL, 5); sEnhancements->Add(MSAAText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sEnhancements->Add(m_MSAAModeCB, wxGBPosition(1, 1), wxGBSpan(1, 2), wxALL, 5); + sEnhancements->Add(m_ForceFiltering, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5); sbEnhancements->Add(sEnhancements); sGeneral->Add(sbEnhancements, 0, wxEXPAND|wxALL, 5); m_PageGeneral->SetSizer(sGeneral); @@ -427,20 +430,24 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) case ID_AUTOSCALE: g_Config.bAutoScale = m_AutoScale->IsChecked(); break; - case ID_KEEPAR_4_3: + case ID_KEEPAR_4_3: g_Config.bKeepAR43 = m_KeepAR43->IsChecked(); // Don't allow both at the same time if (g_Config.bKeepAR43) { g_Config.bKeepAR169 = false; m_KeepAR169->SetValue(false); } break; - case ID_KEEPAR_16_9: + case ID_KEEPAR_16_9: g_Config.bKeepAR169 = m_KeepAR169->IsChecked(); // Don't allow both at the same time if (g_Config.bKeepAR169) { g_Config.bKeepAR43 = false; m_KeepAR43->SetValue(false); } break; - case ID_CROP: + case ID_CROP: g_Config.bCrop = m_Crop->IsChecked(); break; + case ID_FORCEFILTERING: + g_Config.bForceFiltering = m_ForceFiltering->IsChecked(); + break; + #ifndef _WIN32 case ID_HIDECURSOR: g_Config.bHideCursor = m_HideCursor->IsChecked(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index 1931a0281f..9af962d3b5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -77,6 +77,7 @@ class ConfigDialog : public wxDialog wxCheckBox *m_VSync; wxCheckBox *m_RenderToMainWindow; wxCheckBox *m_NativeResolution; + wxCheckBox *m_ForceFiltering; wxCheckBox *m_KeepAR43, *m_KeepAR169, *m_Crop; wxCheckBox *m_UseXFB; wxCheckBox *m_AutoScale; @@ -136,7 +137,7 @@ class ConfigDialog : public wxDialog ID_FULLSCREENCB, ID_WMTEXT, ID_WINDOWRESOLUTIONCB, - + ID_FORCEFILTERING, ID_MAXANISOTROPY, ID_MSAAMODECB, ID_MSAAMODETEXT,