From 7a7d1a7b55a0cb8edf1fcee1ec99d1dc70b449cb Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 15 Apr 2010 09:23:59 +0000 Subject: [PATCH] Re-added Skies of Arcadia projection hack. Fixes issue 2514. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5372 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 1 + Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 12 ++++++------ Source/Core/VideoCommon/Src/VertexShaderManager.h | 1 + Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h | 6 +----- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index ec2a62cafa..c542e14a4f 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -321,6 +321,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) arrayStringFor_Hack.Add(_("Zelda Twilight Princess Bloom hack")); arrayStringFor_Hack.Add(_("Sonic and the Black Knight")); arrayStringFor_Hack.Add(_("Bleach Versus Crusade")); + arrayStringFor_Hack.Add(_("Skies of Arcadia")); Hack = new wxChoice(m_GameConfig, ID_HACK, wxDefaultPosition, wxDefaultSize, arrayStringFor_Hack, 0, wxDefaultValidator); // Emulation State diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 352434464b..6569fb0b89 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -90,6 +90,12 @@ void UpdateProjectionHack(int iPhackvalue) bPhackvalue1 = 0; bProjHack1 = 0; break; + case PROJECTION_HACK_SKIES_OF_ARCADIA: + bPhackvalue1 = 1; + fhackvalue1 = 0.04f; + bPhackvalue2 = 0; + bProjHack1 = 0; + break; /* // Unused - kept for reference case PROJECTION_HACK_FINAL_FANTASY_CC_ECHO_OF_TIME: bPhackvalue1 = 1; @@ -118,12 +124,6 @@ void UpdateProjectionHack(int iPhackvalue) fhackvalue2 = 1.9988f; bProjHack1 = 1; break; - case PROJECTION_HACK_SKIES_OF_ARCADIA: - bPhackvalue1 = 1; - fhackvalue1 = 0.04f; - bPhackvalue2 = 0; - bProjHack1 = 0; - break; */ } diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h index 05d3f7ae87..1ea8c284f6 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.h +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h @@ -26,6 +26,7 @@ enum PROJECTION_HACK_ZELDA_TP_BLOOM_HACK = 1, PROJECTION_HACK_SONIC_AND_THE_BLACK_KNIGHT = 2, PROJECTION_HACK_BLEACH_VERSUS_CRUSADE = 3, + PROJECTION_HACK_SKIES_OF_ARCADIA = 4 }; struct ProjectionHack diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 7d64172d7e..71eab112d9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -193,6 +193,7 @@ void GFXConfigDialogOGL::InitializeGUILists() arrayStringFor_PhackvalueCB.Add(wxT("Zelda Twilight Princess Bloom hack")); arrayStringFor_PhackvalueCB.Add(wxT("Sonic and the Black Knight")); arrayStringFor_PhackvalueCB.Add(wxT("Bleach Versus Crusade")); + arrayStringFor_PhackvalueCB.Add(wxT("Skies of Arcadia")); } void GFXConfigDialogOGL::InitializeGUIValues() diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index ff4471b572..d145242543 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -37,11 +37,7 @@ enum OGL_HACK_ZELDA_TP_BLOOM_HACK = 1, 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 + OGL_HACK_SKIES_OF_ARCADIA = 4 };