VideoConfig: Rename StereoMode::TAB to StereoMode::TopAndBottom
This commit is contained in:
@@ -241,8 +241,11 @@ void EnhancementsWidget::CreateWidgets()
|
|||||||
m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue()));
|
m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue()));
|
||||||
|
|
||||||
auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE);
|
auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE);
|
||||||
if (current_stereo_mode != StereoMode::SideBySide && current_stereo_mode != StereoMode::TAB)
|
if (current_stereo_mode != StereoMode::SideBySide &&
|
||||||
|
current_stereo_mode != StereoMode::TopAndBottom)
|
||||||
|
{
|
||||||
m_3d_per_eye_resolution->hide();
|
m_3d_per_eye_resolution->hide();
|
||||||
|
}
|
||||||
|
|
||||||
main_layout->addWidget(enhancements_box);
|
main_layout->addWidget(enhancements_box);
|
||||||
main_layout->addWidget(stereoscopy_box);
|
main_layout->addWidget(stereoscopy_box);
|
||||||
@@ -257,10 +260,15 @@ void EnhancementsWidget::ConnectWidgets()
|
|||||||
auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE);
|
auto current_stereo_mode = Get(m_game_layer, Config::GFX_STEREO_MODE);
|
||||||
LoadPostProcessingShaders();
|
LoadPostProcessingShaders();
|
||||||
|
|
||||||
if (current_stereo_mode == StereoMode::SideBySide || current_stereo_mode == StereoMode::TAB)
|
if (current_stereo_mode == StereoMode::SideBySide ||
|
||||||
|
current_stereo_mode == StereoMode::TopAndBottom)
|
||||||
|
{
|
||||||
m_3d_per_eye_resolution->show();
|
m_3d_per_eye_resolution->show();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
m_3d_per_eye_resolution->hide();
|
m_3d_per_eye_resolution->hide();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(m_post_processing_effect, &QComboBox::currentIndexChanged, this,
|
connect(m_post_processing_effect, &QComboBox::currentIndexChanged, this,
|
||||||
|
|||||||
@@ -569,13 +569,13 @@ void HotkeyScheduler::Run()
|
|||||||
|
|
||||||
if (IsHotkey(HK_TOGGLE_STEREO_TOP_AND_BOTTOM))
|
if (IsHotkey(HK_TOGGLE_STEREO_TOP_AND_BOTTOM))
|
||||||
{
|
{
|
||||||
if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::TAB)
|
if (Config::Get(Config::GFX_STEREO_MODE) != StereoMode::TopAndBottom)
|
||||||
{
|
{
|
||||||
// Disable post-processing shader, as stereoscopy itself is currently a shader
|
// Disable post-processing shader, as stereoscopy itself is currently a shader
|
||||||
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) == DUBOIS_ALGORITHM_SHADER)
|
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) == DUBOIS_ALGORITHM_SHADER)
|
||||||
Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, "");
|
Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, "");
|
||||||
|
|
||||||
Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::TAB);
|
Config::SetCurrent(Config::GFX_STEREO_MODE, StereoMode::TopAndBottom);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1018,7 +1018,7 @@ static bool UseGeometryShaderForPostProcess(bool is_intermediary_buffer)
|
|||||||
case StereoMode::Passive:
|
case StereoMode::Passive:
|
||||||
return is_intermediary_buffer;
|
return is_intermediary_buffer;
|
||||||
case StereoMode::SideBySide:
|
case StereoMode::SideBySide:
|
||||||
case StereoMode::TAB:
|
case StereoMode::TopAndBottom:
|
||||||
case StereoMode::Off:
|
case StereoMode::Off:
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -392,7 +392,7 @@ Presenter::ConvertStereoRectangle(const MathUtil::Rectangle<int>& rc) const
|
|||||||
{
|
{
|
||||||
// Resize target to half its original size
|
// Resize target to half its original size
|
||||||
auto draw_rc = rc;
|
auto draw_rc = rc;
|
||||||
if (g_ActiveConfig.stereo_mode == StereoMode::TAB)
|
if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom)
|
||||||
{
|
{
|
||||||
// The height may be negative due to flipped rectangles
|
// The height may be negative due to flipped rectangles
|
||||||
int height = rc.bottom - rc.top;
|
int height = rc.bottom - rc.top;
|
||||||
@@ -409,7 +409,7 @@ Presenter::ConvertStereoRectangle(const MathUtil::Rectangle<int>& rc) const
|
|||||||
// Create two target rectangle offset to the sides of the backbuffer
|
// Create two target rectangle offset to the sides of the backbuffer
|
||||||
auto left_rc = draw_rc;
|
auto left_rc = draw_rc;
|
||||||
auto right_rc = draw_rc;
|
auto right_rc = draw_rc;
|
||||||
if (g_ActiveConfig.stereo_mode == StereoMode::TAB)
|
if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom)
|
||||||
{
|
{
|
||||||
left_rc.top -= m_backbuffer_height / 4;
|
left_rc.top -= m_backbuffer_height / 4;
|
||||||
left_rc.bottom -= m_backbuffer_height / 4;
|
left_rc.bottom -= m_backbuffer_height / 4;
|
||||||
@@ -483,7 +483,7 @@ float Presenter::CalculateDrawAspectRatio(bool allow_stretch) const
|
|||||||
// resolution
|
// resolution
|
||||||
resulting_aspect_ratio *= 2.0;
|
resulting_aspect_ratio *= 2.0;
|
||||||
}
|
}
|
||||||
else if (g_ActiveConfig.stereo_mode == StereoMode::TAB)
|
else if (g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom)
|
||||||
{
|
{
|
||||||
// Render twice as tall if using top-and-bottom 3D, since the 3D will halve the vertical
|
// Render twice as tall if using top-and-bottom 3D, since the 3D will halve the vertical
|
||||||
// resolution
|
// resolution
|
||||||
@@ -831,7 +831,7 @@ void Presenter::RenderXFBToScreen(const MathUtil::Rectangle<int>& target_rc,
|
|||||||
g_gfx->SelectMainBuffer();
|
g_gfx->SelectMainBuffer();
|
||||||
}
|
}
|
||||||
else if (g_ActiveConfig.stereo_mode == StereoMode::SideBySide ||
|
else if (g_ActiveConfig.stereo_mode == StereoMode::SideBySide ||
|
||||||
g_ActiveConfig.stereo_mode == StereoMode::TAB)
|
g_ActiveConfig.stereo_mode == StereoMode::TopAndBottom)
|
||||||
{
|
{
|
||||||
const auto [left_rc, right_rc] = ConvertStereoRectangle(target_rc);
|
const auto [left_rc, right_rc] = ConvertStereoRectangle(target_rc);
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ enum class StereoMode : int
|
|||||||
{
|
{
|
||||||
Off,
|
Off,
|
||||||
SideBySide,
|
SideBySide,
|
||||||
TAB,
|
TopAndBottom,
|
||||||
Anaglyph,
|
Anaglyph,
|
||||||
QuadBuffer,
|
QuadBuffer,
|
||||||
Passive
|
Passive
|
||||||
|
|||||||
Reference in New Issue
Block a user