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

OpenGL:Removing some OpenGL projection hacks that are no longer required and some GUI changes so when EFB Copy is disabled it greys out the two options. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4036 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-08-23 03:14:07 +00:00
parent 652639d1c4
commit b254d6b453
4 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -46,7 +46,7 @@ void AboutDolphin::CreateGUIControls()
DolphinLogo = new wxBitmap(iDolphinLogo);
sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0);
sbDolphinLogo->SetBitmap(*DolphinLogo);
std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR +"\n" "Copyright (c) 2003\n"
std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR +"\n" "Copyright (c) 2003-2009\n"
"Dolphin is a Gamecube/Wii emulator, which was originally written by F|RES and ector.\n"
"Today Dolphin is an open source project with many contributors.\n\n"
"Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik, or9 and Hotquik for their reverse engineering and docs/demos.\n\n"

2
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -323,8 +323,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize);
arrayStringFor_Hack.Add(_("None"));
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"));

22
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -182,6 +182,7 @@ void GFXConfigDialogOGL::CreateGUIControls()
wxStaticText *IRText = new wxStaticText(m_PageGeneral, ID_IRTEXT, wxT("Internal resolution Settings:"), wxDefaultPosition, wxDefaultSize, 0);
wxStaticText *RText = new wxStaticText(m_PageGeneral, ID_RTEXT, wxT("Resolution Settings:"), wxDefaultPosition, wxDefaultSize, 0);
wxStaticText *WMText = new wxStaticText(m_PageGeneral, ID_WMTEXT, wxT("Window mode:"), wxDefaultPosition, wxDefaultSize , 0 );
wxStaticText *WM2Text = new wxStaticText(m_PageGeneral, ID_WM2TEXT, wxT("Window mode:"), wxDefaultPosition, wxDefaultSize , 0 );
wxStaticText *FMText = new wxStaticText(m_PageGeneral, ID_FMTEXT, wxT("Fullscreen mode:"), wxDefaultPosition, wxDefaultSize , 0 );
m_WindowResolutionCB = new wxComboBox(m_PageGeneral, ID_WINDOWRESOLUTIONCB, arrayStringFor_WindowResolutionCB[0], wxDefaultPosition, wxDefaultSize, arrayStringFor_WindowResolutionCB, wxCB_READONLY, wxDefaultValidator);
m_WindowResolutionCB->SetValue(wxString::FromAscii(g_Config.iInternalRes));
@ -325,7 +326,7 @@ void GFXConfigDialogOGL::CreateGUIControls()
sBasic->Add(m_KeepAR169, wxGBPosition(3, 2), wxGBSpan(1, 1), wxALL, 5);
sBasic->Add(m_Crop, wxGBPosition(3, 3), wxGBSpan(1, 1), wxALL, 5);
sBasic->Add(WMText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
sBasic->Add(WM2Text, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
sBasic->Add(m_Fullscreen, wxGBPosition(4, 1), wxGBSpan(1, 1), wxALL, 5);
// This option is configured from the main Dolphin.exe settings for _WIN32
@ -440,8 +441,6 @@ void GFXConfigDialogOGL::CreateGUIControls()
m_PhackvalueCB = new wxChoice(m_PageAdvanced, ID_PHACKVALUE, wxDefaultPosition, wxDefaultSize, arrayStringFor_PhackvalueCB, 0, wxDefaultValidator);
m_PhackvalueCB->Append(wxT("None"));
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"));
m_PhackvalueCB->Append(wxT("Bleach Versus Crusade"));
m_PhackvalueCB->Append(wxT("Final Fantasy CC Echo of Time"));
@ -764,6 +763,11 @@ void GFXConfigDialogOGL::UpdateGUI()
// Disable the internal resolution option if it's set to native
m_WindowResolutionCB->Enable(!(g_Config.bNativeResolution || g_Config.b2xResolution));
m_WindowFSResolutionCB->Enable(!(g_Config.bNativeResolution || g_Config.b2xResolution));
//Disable the Copy to options when EFBCopy is disabled
m_Radio_CopyEFBToRAM->Enable(!(g_Config.bEFBCopyDisable));
m_Radio_CopyEFBToGL->Enable(!(g_Config.bEFBCopyDisable));
}
@ -780,18 +784,6 @@ void Config::UpdateProjectionHack()
g_Config.bPhackvalue1 = 1;
g_Config.bProjHack1 = 1;
break;
case OGL_HACK_SUPER_MARIO_GALAXY:
g_Config.bPhackvalue1 = 1;
g_Config.fhackvalue1 = 0.00006f;
g_Config.bPhackvalue2 = 0;
g_Config.bProjHack1 = 0;
break;
case OGL_HACK_MARIO_KART_WII:
g_Config.bPhackvalue1 = 1;
g_Config.fhackvalue1 = 0.0006f;
g_Config.bPhackvalue2 = 0;
g_Config.bProjHack1 = 0;
break;
case OGL_HACK_SONIC_AND_THE_BLACK_KNIGHT:
g_Config.bPhackvalue1 = 1;
g_Config.fhackvalue1 = 0.00002f;

17
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
View File

@ -35,15 +35,13 @@ enum
{
OGL_HACK_NONE = 0,
OGL_HACK_ZELDA_TP_BLOOM_HACK = 1,
OGL_HACK_SUPER_MARIO_GALAXY = 2,
OGL_HACK_MARIO_KART_WII = 3,
OGL_HACK_SONIC_AND_THE_BLACK_KNIGHT = 4,
OGL_HACK_BLEACH_VERSUS_CRUSADE = 5,
OGL_HACK_FINAL_FANTASY_CC_ECHO_OF_TIME = 6,
OGL_HACK_HARVESTMOON_MM = 7,
OGL_HACK_BATEN_KAITOS = 8,
OGL_HACK_BATEN_KAITOS_ORIGIN = 9,
OGL_HACK_SKIES_OF_ARCADIA = 10
OGL_HACK_SONIC_AND_THE_BLACK_KNIGHT = 2,
OGL_HACK_BLEACH_VERSUS_CRUSADE = 3,
OGL_HACK_FINAL_FANTASY_CC_ECHO_OF_TIME = 4,
OGL_HACK_HARVESTMOON_MM = 5,
OGL_HACK_BATEN_KAITOS = 6,
OGL_HACK_BATEN_KAITOS_ORIGIN = 7,
OGL_HACK_SKIES_OF_ARCADIA = 8
};
@ -160,6 +158,7 @@ class GFXConfigDialogOGL : public wxDialog
ID_FSTEXT,
ID_FULLSCREENCB,
ID_WMTEXT,
ID_WM2TEXT,
ID_FMTEXT,
ID_IRTEXT,
ID_RTEXT,