mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
OpenGL: Added fog and lighting to the OSD menu. GUI: Removed old and removed Gfx setting from ISOProperties.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4213 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -658,7 +658,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
|||||||
DoFullscreen(!IsFullScreen());
|
DoFullscreen(!IsFullScreen());
|
||||||
}
|
}
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if(event.GetKeyCode() == 'M', '3', '4', '5', '6') // Send this to the video plugin WndProc
|
if(event.GetKeyCode() == 'M', '3', '4', '5', '6', '7') // Send this to the video plugin WndProc
|
||||||
{
|
{
|
||||||
PostMessage((HWND)Core::GetWindowHandle(), WM_USER, OPENGL_WM_USER_KEYDOWN, event.GetKeyCode());
|
PostMessage((HWND)Core::GetWindowHandle(), WM_USER, OPENGL_WM_USER_KEYDOWN, event.GetKeyCode());
|
||||||
}
|
}
|
||||||
|
@ -315,7 +315,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
|||||||
sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
|
sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
|
||||||
ForceFiltering = new wxCheckBox(m_GameConfig, ID_FORCEFILTERING, _("Force Filtering"), 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);
|
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);
|
|
||||||
EFBToTextureEnable = new wxCheckBox(m_GameConfig, ID_EFBTOTEXTUREENABLE, _("Enable EFB To RAM"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
EFBToTextureEnable = new wxCheckBox(m_GameConfig, ID_EFBTOTEXTUREENABLE, _("Enable EFB To RAM"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
||||||
SafeTextureCache = new wxCheckBox(m_GameConfig, ID_SAFETEXTURECACHE, _("Safe Texture Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
SafeTextureCache = new wxCheckBox(m_GameConfig, ID_SAFETEXTURECACHE, _("Safe Texture Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
||||||
DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
|
||||||
@ -361,7 +360,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
|||||||
sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5);
|
sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5);
|
||||||
sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5);
|
sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5);
|
||||||
sbVideoOverrides->Add(EFBCopyDisable, 0, wxEXPAND|wxLEFT, 5);
|
sbVideoOverrides->Add(EFBCopyDisable, 0, wxEXPAND|wxLEFT, 5);
|
||||||
sbVideoOverrides->Add(EFBCopyDisableHotKey, 0, wxEXPAND|wxLEFT, 5);
|
|
||||||
sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5);
|
sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5);
|
||||||
sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5);
|
sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5);
|
||||||
sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5);
|
sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5);
|
||||||
@ -671,11 +669,6 @@ void CISOProperties::LoadGameConfig()
|
|||||||
else
|
else
|
||||||
EFBCopyDisable->Set3StateValue(wxCHK_UNDETERMINED);
|
EFBCopyDisable->Set3StateValue(wxCHK_UNDETERMINED);
|
||||||
|
|
||||||
if (GameIni.Get("Video", "EFBCopyDisableHotKey", &bTemp))
|
|
||||||
EFBCopyDisableHotKey->Set3StateValue((wxCheckBoxState)bTemp);
|
|
||||||
else
|
|
||||||
EFBCopyDisableHotKey->Set3StateValue(wxCHK_UNDETERMINED);
|
|
||||||
|
|
||||||
if (GameIni.Get("Video", "EFBToTextureEnable", &bTemp))
|
if (GameIni.Get("Video", "EFBToTextureEnable", &bTemp))
|
||||||
EFBToTextureEnable->Set3StateValue((wxCheckBoxState)bTemp);
|
EFBToTextureEnable->Set3StateValue((wxCheckBoxState)bTemp);
|
||||||
else
|
else
|
||||||
@ -761,11 +754,6 @@ bool CISOProperties::SaveGameConfig()
|
|||||||
else
|
else
|
||||||
GameIni.Set("Video", "EFBCopyDisable", EFBCopyDisable->Get3StateValue());
|
GameIni.Set("Video", "EFBCopyDisable", EFBCopyDisable->Get3StateValue());
|
||||||
|
|
||||||
if (EFBCopyDisableHotKey->Get3StateValue() == wxCHK_UNDETERMINED)
|
|
||||||
GameIni.DeleteKey("Video", "EFBCopyDisableHotKey");
|
|
||||||
else
|
|
||||||
GameIni.Set("Video", "EFBCopyDisableHotKey", EFBCopyDisableHotKey->Get3StateValue());
|
|
||||||
|
|
||||||
if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED)
|
if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED)
|
||||||
GameIni.DeleteKey("Video", "EFBToTextureEnable");
|
GameIni.DeleteKey("Video", "EFBToTextureEnable");
|
||||||
else
|
else
|
||||||
|
@ -86,7 +86,7 @@ class CISOProperties : public wxDialog
|
|||||||
wxCheckBox *EnableProgressiveScan, *EnableWideScreen;
|
wxCheckBox *EnableProgressiveScan, *EnableWideScreen;
|
||||||
// Video
|
// Video
|
||||||
wxCheckBox *ForceFiltering,
|
wxCheckBox *ForceFiltering,
|
||||||
*EFBCopyDisable, *EFBCopyDisableHotKey, *EFBToTextureEnable,
|
*EFBCopyDisable, *EFBToTextureEnable,
|
||||||
*SafeTextureCache, *DstAlphaPass, *UseXFB;
|
*SafeTextureCache, *DstAlphaPass, *UseXFB;
|
||||||
wxStaticText *Hacktext;
|
wxStaticText *Hacktext;
|
||||||
wxArrayString arrayStringFor_Hack;
|
wxArrayString arrayStringFor_Hack;
|
||||||
@ -161,7 +161,6 @@ class CISOProperties : public wxDialog
|
|||||||
ID_TLBHACK,
|
ID_TLBHACK,
|
||||||
ID_FORCEFILTERING,
|
ID_FORCEFILTERING,
|
||||||
ID_EFBCOPYDISABLE,
|
ID_EFBCOPYDISABLE,
|
||||||
ID_EFBCOPYDISABLEHOTKEY,
|
|
||||||
ID_EFBTOTEXTUREENABLE,
|
ID_EFBTOTEXTUREENABLE,
|
||||||
ID_SAFETEXTURECACHE,
|
ID_SAFETEXTURECACHE,
|
||||||
ID_DSTALPHAPASS,
|
ID_DSTALPHAPASS,
|
||||||
|
@ -127,8 +127,13 @@ void OSDMenu(WPARAM wParam)
|
|||||||
g_Config.bEFBCopyDisable = !g_Config.bEFBCopyDisable;
|
g_Config.bEFBCopyDisable = !g_Config.bEFBCopyDisable;
|
||||||
break;
|
break;
|
||||||
case '6':
|
case '6':
|
||||||
//OSDChoice = 4;
|
OSDChoice = 4;
|
||||||
|
g_Config.bDisableFog = !g_Config.bDisableFog;
|
||||||
break;
|
break;
|
||||||
|
case '7':
|
||||||
|
OSDChoice = 5;
|
||||||
|
g_Config.bDisableLighting = !g_Config.bDisableLighting;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
@ -259,6 +264,7 @@ void OnKeyDown(WPARAM wParam)
|
|||||||
case '4':
|
case '4':
|
||||||
case '5':
|
case '5':
|
||||||
case '6':
|
case '6':
|
||||||
|
case '7':
|
||||||
OSDMenu(wParam);
|
OSDMenu(wParam);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1266,8 +1266,8 @@ void Renderer::DrawDebugText()
|
|||||||
}
|
}
|
||||||
if ((u32)OSDTime > timeGetTime() && g_Config.bEFBCopyDisableHotKey)
|
if ((u32)OSDTime > timeGetTime() && g_Config.bEFBCopyDisableHotKey)
|
||||||
{
|
{
|
||||||
std::string T1 = "";
|
std::string T1 = "", T2 = "";
|
||||||
std::string T2 = "";
|
std::vector<std::string> T0;
|
||||||
|
|
||||||
int W, H;
|
int W, H;
|
||||||
sscanf(g_Config.iInternalRes, "%dx%d", &W, &H);
|
sscanf(g_Config.iInternalRes, "%dx%d", &W, &H);
|
||||||
@ -1291,15 +1291,26 @@ void Renderer::DrawDebugText()
|
|||||||
if (g_Config.bShowFPS)
|
if (g_Config.bShowFPS)
|
||||||
{ T1 += "\n\n"; T2 += "\n\n"; }
|
{ T1 += "\n\n"; T2 += "\n\n"; }
|
||||||
|
|
||||||
|
// The rows
|
||||||
|
T0.push_back(StringFromFormat("3: Internal Resolution: %s\n", OSDM1.c_str()));
|
||||||
|
T0.push_back(StringFromFormat("4: Lock Aspect Ratio: %s%s\n", OSDM21.c_str(), OSDM22.c_str()));
|
||||||
|
T0.push_back(StringFromFormat("5: Copy Embedded Framebuffer to %s: %s\n", OSDM31.c_str(), OSDM32.c_str()));
|
||||||
|
T0.push_back(StringFromFormat("6: Fog: %s\n", g_Config.bDisableFog ? "Disabled" : "Enabled"));
|
||||||
|
T0.push_back(StringFromFormat("7: Material Lighting: %s\n", g_Config.bDisableLighting ? "Disabled" : "Enabled"));
|
||||||
|
|
||||||
// The latest changed setting in yellow
|
// The latest changed setting in yellow
|
||||||
T1 += (OSDChoice == -1) ? StringFromFormat("3: Internal Resolution: %s\n", OSDM1.c_str()) : "\n";
|
T1 += (OSDChoice == -1) ? T0.at(0) : "\n";
|
||||||
T1 += (OSDChoice == -2) ? StringFromFormat("4: Lock Aspect Ratio: %s%s\n", OSDM21.c_str(), OSDM22.c_str()) : "\n";
|
T1 += (OSDChoice == -2) ? T0.at(1) : "\n";
|
||||||
T1 += (OSDChoice == -3) ? StringFromFormat("5: Copy Embedded Framebuffer to %s: %s\n", OSDM31.c_str(), OSDM32.c_str()) : "\n";
|
T1 += (OSDChoice == -3) ? T0.at(2) : "\n";
|
||||||
|
T1 += (OSDChoice == -4) ? T0.at(3) : "\n";
|
||||||
|
T1 += (OSDChoice == -5) ? T0.at(4) : "\n";
|
||||||
|
|
||||||
// The other settings in cyan
|
// The other settings in cyan
|
||||||
T2 += !(OSDChoice == -1) ? StringFromFormat("3: Internal Resolution: %s\n", OSDM1.c_str()) : "\n";
|
T2 += !(OSDChoice == -1) ? T0.at(0) : "\n";
|
||||||
T2 += !(OSDChoice == -2) ? StringFromFormat("4: Lock Aspect Ratio: %s\n", OSDM21.c_str(), OSDM22.c_str()) : "\n";
|
T2 += !(OSDChoice == -2) ? T0.at(1) : "\n";
|
||||||
T2 += !(OSDChoice == -3) ? StringFromFormat("5: Copy Embedded Framebuffer to %s: %s\n", OSDM31.c_str(), OSDM32.c_str()) : "\n";
|
T2 += !(OSDChoice == -3) ? T0.at(2) : "\n";
|
||||||
|
T2 += !(OSDChoice == -4) ? T0.at(3) : "\n";
|
||||||
|
T2 += !(OSDChoice == -5) ? T0.at(4) : "\n";
|
||||||
|
|
||||||
// Render a shadow, and then the text
|
// Render a shadow, and then the text
|
||||||
Renderer::RenderText(T1.c_str(), 21, 21, 0xDD000000);
|
Renderer::RenderText(T1.c_str(), 21, 21, 0xDD000000);
|
||||||
|
Reference in New Issue
Block a user