mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 23:59:27 +01:00
Remove setting to enable or disable Bounding Box calculation.
This commit is contained in:
parent
8912315596
commit
d281b4d7e1
@ -47,7 +47,6 @@ $Max Shop Points
|
|||||||
026EE7F0 000003E7
|
026EE7F0 000003E7
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
UseBBox = 1
|
|
||||||
ProjectionHack = 0
|
ProjectionHack = 0
|
||||||
PH_SZNear = 0
|
PH_SZNear = 0
|
||||||
PH_SZFar = 0
|
PH_SZFar = 0
|
||||||
|
@ -17,9 +17,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
EFBToTextureEnable = False
|
EFBToTextureEnable = False
|
||||||
EFBCopyEnable = True
|
EFBCopyEnable = True
|
||||||
|
@ -17,9 +17,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
[ActionReplay]
|
[ActionReplay]
|
||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
EFBToTextureEnable = False
|
EFBToTextureEnable = False
|
||||||
EFBCopyEnable = True
|
EFBCopyEnable = True
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
EmulationStateId = 3
|
EmulationStateId = 3
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[OnLoad]
|
[OnLoad]
|
||||||
# Add memory patches to be loaded once on boot here.
|
# Add memory patches to be loaded once on boot here.
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
EmulationStateId = 3
|
EmulationStateId = 3
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[OnLoad]
|
[OnLoad]
|
||||||
# Add memory patches to be loaded once on boot here.
|
# Add memory patches to be loaded once on boot here.
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
EmulationStateId = 3
|
EmulationStateId = 3
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[OnLoad]
|
[OnLoad]
|
||||||
# Add memory patches to be loaded once on boot here.
|
# Add memory patches to be loaded once on boot here.
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[OnLoad]
|
[OnLoad]
|
||||||
# Add memory patches to be loaded once on boot here.
|
# Add memory patches to be loaded once on boot here.
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
EmulationStateId = 4
|
EmulationStateId = 4
|
||||||
EmulationIssues =
|
EmulationIssues =
|
||||||
|
|
||||||
[Video]
|
|
||||||
UseBBox = True
|
|
||||||
|
|
||||||
[OnLoad]
|
[OnLoad]
|
||||||
# Add memory patches to be loaded once on boot here.
|
# Add memory patches to be loaded once on boot here.
|
||||||
|
|
||||||
|
@ -25,5 +25,3 @@ PH_SZFar = 0
|
|||||||
PH_ExtraParam = 0
|
PH_ExtraParam = 0
|
||||||
PH_ZNear =
|
PH_ZNear =
|
||||||
PH_ZFar =
|
PH_ZFar =
|
||||||
UseBBox = 1
|
|
||||||
|
|
||||||
|
@ -19,7 +19,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
UseBBox = True
|
|
||||||
ProjectionHack = 0
|
ProjectionHack = 0
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
|
@ -18,7 +18,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
UseBBox = True
|
|
||||||
ProjectionHack = 0
|
ProjectionHack = 0
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
|
@ -18,7 +18,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
UseBBox = True
|
|
||||||
ProjectionHack = 0
|
ProjectionHack = 0
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
|
@ -18,7 +18,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
|
|||||||
# Add action replay cheats here.
|
# Add action replay cheats here.
|
||||||
|
|
||||||
[Video]
|
[Video]
|
||||||
UseBBox = True
|
|
||||||
ProjectionHack = 0
|
ProjectionHack = 0
|
||||||
|
|
||||||
[Video_Hacks]
|
[Video_Hacks]
|
||||||
|
@ -403,10 +403,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
|||||||
// Wii Console
|
// Wii Console
|
||||||
EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"));
|
EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"));
|
||||||
|
|
||||||
// Video
|
|
||||||
UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox"));
|
|
||||||
UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games."));
|
|
||||||
|
|
||||||
wxBoxSizer* const sEmuState = new wxBoxSizer(wxHORIZONTAL);
|
wxBoxSizer* const sEmuState = new wxBoxSizer(wxHORIZONTAL);
|
||||||
wxStaticText* const EmuStateText = new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
|
wxStaticText* const EmuStateText = new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
|
||||||
arrayStringFor_EmuState.Add(_("Not Set"));
|
arrayStringFor_EmuState.Add(_("Not Set"));
|
||||||
@ -439,14 +435,10 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
|||||||
}
|
}
|
||||||
sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
|
sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
|
||||||
|
|
||||||
wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
|
|
||||||
sbVideoOverrides->Add(UseBBox, 0, wxLEFT, 5);
|
|
||||||
|
|
||||||
wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
|
wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
|
||||||
sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
|
sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
|
||||||
sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
|
sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
|
||||||
sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND);
|
sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND);
|
||||||
sbGameConfig->Add(sbVideoOverrides, 0, wxEXPAND);
|
|
||||||
sConfigPage->Add(sbGameConfig, 0, wxEXPAND|wxALL, 5);
|
sConfigPage->Add(sbGameConfig, 0, wxEXPAND|wxALL, 5);
|
||||||
sEmuState->Add(EmuStateText, 0, wxALIGN_CENTER_VERTICAL);
|
sEmuState->Add(EmuStateText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
sEmuState->Add(EmuState, 0, wxEXPAND);
|
sEmuState->Add(EmuState, 0, wxEXPAND);
|
||||||
@ -1017,7 +1009,6 @@ void CISOProperties::LoadGameConfig()
|
|||||||
SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging);
|
SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging);
|
||||||
SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE);
|
SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE);
|
||||||
SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen);
|
SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen);
|
||||||
SetCheckboxValueFromGameini("Video", "UseBBox", UseBBox);
|
|
||||||
|
|
||||||
IniFile::Section* default_video = GameIniDefault.GetOrCreateSection("Video");
|
IniFile::Section* default_video = GameIniDefault.GetOrCreateSection("Video");
|
||||||
|
|
||||||
@ -1091,7 +1082,6 @@ bool CISOProperties::SaveGameConfig()
|
|||||||
SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging);
|
SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging);
|
||||||
SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE);
|
SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE);
|
||||||
SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen);
|
SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen);
|
||||||
SaveGameIniValueFrom3StateCheckbox("Video", "UseBBox", UseBBox);
|
|
||||||
|
|
||||||
#define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \
|
#define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \
|
||||||
if (GameIniDefault.Exists((section), (key))) { \
|
if (GameIniDefault.Exists((section), (key))) { \
|
||||||
|
@ -71,8 +71,6 @@ private:
|
|||||||
wxCheckBox *VBeam, *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE;
|
wxCheckBox *VBeam, *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE;
|
||||||
// Wii
|
// Wii
|
||||||
wxCheckBox *EnableWideScreen;
|
wxCheckBox *EnableWideScreen;
|
||||||
// Video
|
|
||||||
wxCheckBox *UseBBox;
|
|
||||||
|
|
||||||
wxArrayString arrayStringFor_EmuState;
|
wxArrayString arrayStringFor_EmuState;
|
||||||
wxChoice *EmuState;
|
wxChoice *EmuState;
|
||||||
|
@ -171,8 +171,7 @@ void VertexLoader::CompileVertexTranslator()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Get the pointer to this vertex's buffer data for the bounding box
|
// Get the pointer to this vertex's buffer data for the bounding box
|
||||||
if (g_ActiveConfig.bUseBBox)
|
WriteCall(BoundingBox::SetVertexBufferPosition);
|
||||||
WriteCall(BoundingBox::SetVertexBufferPosition);
|
|
||||||
|
|
||||||
// Colors
|
// Colors
|
||||||
const u64 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
|
const u64 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1};
|
||||||
@ -382,8 +381,7 @@ void VertexLoader::CompileVertexTranslator()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update the bounding box
|
// Update the bounding box
|
||||||
if (g_ActiveConfig.bUseBBox)
|
WriteCall(BoundingBox::Update);
|
||||||
WriteCall(BoundingBox::Update);
|
|
||||||
|
|
||||||
if (m_VtxDesc.PosMatIdx)
|
if (m_VtxDesc.PosMatIdx)
|
||||||
{
|
{
|
||||||
|
@ -195,7 +195,6 @@ void VideoConfig::GameIniLoad()
|
|||||||
CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]);
|
CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]);
|
||||||
CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]);
|
CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]);
|
||||||
CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]);
|
CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]);
|
||||||
CHECK_SETTING("Video", "UseBBox", bUseBBox);
|
|
||||||
CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable);
|
CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable);
|
||||||
|
|
||||||
if (gfx_override_exists)
|
if (gfx_override_exists)
|
||||||
|
@ -114,7 +114,6 @@ struct VideoConfig final
|
|||||||
int iPhackvalue[3];
|
int iPhackvalue[3];
|
||||||
std::string sPhackvalue[2];
|
std::string sPhackvalue[2];
|
||||||
float fAspectRatioHackW, fAspectRatioHackH;
|
float fAspectRatioHackW, fAspectRatioHackH;
|
||||||
bool bUseBBox;
|
|
||||||
bool bEnablePixelLighting;
|
bool bEnablePixelLighting;
|
||||||
bool bFastDepthCalc;
|
bool bFastDepthCalc;
|
||||||
int iLog; // CONF_ bits
|
int iLog; // CONF_ bits
|
||||||
|
Loading…
x
Reference in New Issue
Block a user