Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14100 from AndrewGDX/master

Browse Source 
Improved stereoscopic 3D settings
This commit is contained in:
Jordan Woyak
2025-11-12 16:43:21 -06:00
committed by GitHub
parent 8495e01668 113c86f1b4
commit c08fda96ca
12 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.cpp
+11
View File
@@ -1,6 +1,8 @@
// Copyright 2023 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <QPointer>
#include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h"
ConfigFloatSlider::ConfigFloatSlider(float minimum, float maximum,
@@ -38,3 +40,12 @@ void ConfigFloatSlider::OnConfigChanged()
{
setValue(std::round((ReadValue(m_setting) - m_minimum) / m_step));
}
ConfigFloatLabel::ConfigFloatLabel(const QString& text, ConfigFloatSlider* widget) : QLabel(text)
{
connect(&Settings::Instance(), &Settings::ConfigChanged, this, [this, widget = QPointer{widget}] {
// Label shares font changes with ConfigFloatSlider to mark game ini settings.
if (widget)
setFont(widget->font());
});
}
Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.h
+8
View File
@@ -3,6 +3,8 @@
#pragma once
#include <QLabel>
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipSlider.h"
@@ -29,3 +31,9 @@ private:
float m_step;
const Config::Info<float> m_setting;
};
class ConfigFloatLabel final : public QLabel
{
public:
ConfigFloatLabel(const QString& text, ConfigFloatSlider* widget);
};
Source/Core/DolphinQt/Config/GameConfigWidget.cpp
+27 -9
View File
@@ -24,9 +24,9 @@
#include "Core/ConfigManager.h"
#include "DolphinQt/Config/ConfigControls/ConfigBool.h"
#include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
#include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h"
#include "DolphinQt/Config/ConfigControls/ConfigInteger.h"
#include "DolphinQt/Config/ConfigControls/ConfigRadio.h"
#include "DolphinQt/Config/ConfigControls/ConfigSlider.h"
#include "DolphinQt/Config/GameConfigEdit.h"
#include "DolphinQt/Config/Graphics/GraphicsPane.h"
#include "DolphinQt/QtUtils/QtUtils.h"
@@ -140,26 +140,35 @@ void GameConfigWidget::CreateWidgets()
auto* stereoscopy_layout = new QGridLayout;
stereoscopy_box->setLayout(stereoscopy_layout);
m_depth_slider = new ConfigSlider(100, 200, Config::GFX_STEREO_DEPTH_PERCENTAGE, layer);
m_convergence_spin = new ConfigInteger(0, INT32_MAX, Config::GFX_STEREO_CONVERGENCE, layer);
m_depth_slider =
new ConfigFloatSlider(100, 200, Config::GFX_STEREO_DEPTH_PERCENTAGE, 1.0f, layer);
m_convergence_slider =
new ConfigFloatSlider(0, 1000, Config::GFX_STEREO_CONVERGENCE, 0.01f, layer);
auto* const depth_slider_value = new QLabel();
auto* const convergence_slider_value = new QLabel();
m_use_monoscopic_shadows =
new ConfigBool(tr("Monoscopic Shadows"), Config::GFX_STEREO_EFB_MONO_DEPTH, layer);
m_depth_slider->SetDescription(
tr("This value is multiplied with the depth set in the graphics configuration."));
m_convergence_spin->SetDescription(
m_convergence_slider->SetDescription(
tr("This value is added to the convergence value set in the graphics configuration."));
m_use_monoscopic_shadows->SetDescription(
tr("Use a single depth buffer for both eyes. Needed for a few games."));
stereoscopy_layout->addWidget(new ConfigSliderLabel(tr("Depth Percentage:"), m_depth_slider), 0,
stereoscopy_layout->addWidget(new ConfigFloatLabel(tr("Depth Percentage:"), m_depth_slider), 0,
0);
stereoscopy_layout->addWidget(m_depth_slider, 0, 1);
stereoscopy_layout->addWidget(new ConfigIntegerLabel(tr("Convergence:"), m_convergence_spin), 1,
stereoscopy_layout->addWidget(depth_slider_value, 0, 2);
stereoscopy_layout->addWidget(new ConfigFloatLabel(tr("Convergence:"), m_convergence_slider), 1,
0);
stereoscopy_layout->addWidget(m_convergence_spin, 1, 1);
stereoscopy_layout->addWidget(m_convergence_slider, 1, 1);
stereoscopy_layout->addWidget(convergence_slider_value, 1, 2);
stereoscopy_layout->addWidget(m_use_monoscopic_shadows, 2, 0);
depth_slider_value->setText(QString::asprintf("%.0f%%", m_depth_slider->GetValue()));
convergence_slider_value->setText(QString::asprintf("%.2f", m_convergence_slider->GetValue()));
auto* general_layout = new QVBoxLayout;
general_layout->addWidget(core_box);
general_layout->addWidget(stereoscopy_box);
@@ -239,6 +248,15 @@ void GameConfigWidget::CreateWidgets()
m_prev_tab_index = index;
});
connect(m_depth_slider, &ConfigFloatSlider::valueChanged, this, [this, depth_slider_value] {
depth_slider_value->setText(QString::asprintf("%.0f%%", m_depth_slider->GetValue()));
});
connect(m_convergence_slider, &ConfigFloatSlider::valueChanged, this,
[this, convergence_slider_value] {
convergence_slider_value->setText(
QString::asprintf("%.2f", m_convergence_slider->GetValue()));
});
const QString help_msg = tr(
"Italics mark default game settings, bold marks user settings.\nRight-click to remove user "
"settings.\nGraphics tabs don't display the value of a default game setting.\nAnti-Aliasing "
@@ -320,7 +338,7 @@ void GameConfigWidget::LoadSettings()
update_bool(m_emulate_disc_speed, true);
update_int(m_depth_slider);
update_int(m_convergence_spin);
update_int(m_convergence_slider);
}
void GameConfigWidget::SetItalics()
@@ -337,7 +355,7 @@ void GameConfigWidget::SetItalics()
for (auto* config : findChildren<ConfigBool*>())
italics(config);
for (auto* config : findChildren<ConfigSlider*>())
for (auto* config : findChildren<ConfigFloatSlider*>())
italics(config);
for (auto* config : findChildren<ConfigInteger*>())
italics(config);
Source/Core/DolphinQt/Config/GameConfigWidget.h
+3 -3
View File
@@ -19,7 +19,7 @@ class Layer;
class ConfigBool;
class ConfigInteger;
class ConfigSlider;
class ConfigFloatSlider;
class ConfigStringChoice;
class QPushButton;
class QTabWidget;
@@ -50,8 +50,8 @@ private:
ConfigBool* m_use_monoscopic_shadows;
ConfigStringChoice* m_deterministic_dual_core;
ConfigSlider* m_depth_slider;
ConfigInteger* m_convergence_spin;
ConfigFloatSlider* m_depth_slider;
ConfigFloatSlider* m_convergence_slider;
const UICommon::GameFile& m_game;
std::string m_game_id;
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
+20 -7
View File
@@ -16,7 +16,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigBool.h"
#include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
#include "DolphinQt/Config/ConfigControls/ConfigSlider.h"
#include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h"
#include "DolphinQt/Config/GameConfigWidget.h"
#include "DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.h"
#include "DolphinQt/Config/Graphics/GraphicsPane.h"
@@ -214,10 +214,12 @@ void EnhancementsWidget::CreateWidgets()
m_3d_mode = new ConfigChoice({tr("Off"), tr("Side-by-Side"), tr("Top-and-Bottom"), tr("Anaglyph"),
tr("HDMI 3D"), tr("Passive")},
Config::GFX_STEREO_MODE, m_game_layer);
m_3d_depth =
new ConfigSlider(0, Config::GFX_STEREO_DEPTH_MAXIMUM, Config::GFX_STEREO_DEPTH, m_game_layer);
m_3d_convergence = new ConfigSlider(0, Config::GFX_STEREO_CONVERGENCE_MAXIMUM,
Config::GFX_STEREO_CONVERGENCE, m_game_layer, 100);
m_3d_depth = new ConfigFloatSlider(0, Config::GFX_STEREO_DEPTH_MAXIMUM, Config::GFX_STEREO_DEPTH,
1.0f, m_game_layer);
m_3d_convergence = new ConfigFloatSlider(0, Config::GFX_STEREO_CONVERGENCE_MAXIMUM,
Config::GFX_STEREO_CONVERGENCE, 0.01f, m_game_layer);
m_3d_depth_value = new QLabel();
m_3d_convergence_value = new QLabel();
m_3d_swap_eyes = new ConfigBool(tr("Swap Eyes"), Config::GFX_STEREO_SWAP_EYES, m_game_layer);
@@ -226,13 +228,18 @@ void EnhancementsWidget::CreateWidgets()
stereoscopy_layout->addWidget(new QLabel(tr("Stereoscopic 3D Mode:")), 0, 0);
stereoscopy_layout->addWidget(m_3d_mode, 0, 1);
stereoscopy_layout->addWidget(new ConfigSliderLabel(tr("Depth:"), m_3d_depth), 1, 0);
stereoscopy_layout->addWidget(new ConfigFloatLabel(tr("Depth:"), m_3d_depth), 1, 0);
stereoscopy_layout->addWidget(m_3d_depth, 1, 1);
stereoscopy_layout->addWidget(new ConfigSliderLabel(tr("Convergence:"), m_3d_convergence), 2, 0);
stereoscopy_layout->addWidget(m_3d_depth_value, 1, 2);
stereoscopy_layout->addWidget(new ConfigFloatLabel(tr("Convergence:"), m_3d_convergence), 2, 0);
stereoscopy_layout->addWidget(m_3d_convergence, 2, 1);
stereoscopy_layout->addWidget(m_3d_convergence_value, 2, 2);
stereoscopy_layout->addWidget(m_3d_swap_eyes, 3, 0);
stereoscopy_layout->addWidget(m_3d_per_eye_resolution, 4, 0);
m_3d_depth_value->setText(QString::asprintf("%.0f", m_3d_depth->GetValue()));
m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue()));
auto current_stereo_mode = ReadSetting(Config::GFX_STEREO_MODE);
if (current_stereo_mode != StereoMode::SBS && current_stereo_mode != StereoMode::TAB)
m_3d_per_eye_resolution->hide();
@@ -263,6 +270,12 @@ void EnhancementsWidget::ConnectWidgets()
&EnhancementsWidget::ConfigureColorCorrection);
connect(m_configure_post_processing_effect, &QPushButton::clicked, this,
&EnhancementsWidget::ConfigurePostProcessingShader);
connect(m_3d_depth, &ConfigFloatSlider::valueChanged, this,
[this] { m_3d_depth_value->setText(QString::asprintf("%.0f", m_3d_depth->GetValue())); });
connect(m_3d_convergence, &ConfigFloatSlider::valueChanged, this, [this] {
m_3d_convergence_value->setText(QString::asprintf("%.2f", m_3d_convergence->GetValue()));
});
}
template <typename T>
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
+6 -3
View File
@@ -9,9 +9,10 @@ class ConfigBool;
class ConfigChoice;
class ConfigComplexChoice;
class ConfigStringChoice;
class ConfigSlider;
class ConfigFloatSlider;
class GraphicsPane;
class QPushButton;
class QLabel;
class ToolTipPushButton;
namespace Config
@@ -63,8 +64,10 @@ private:
// Stereoscopy
ConfigChoice* m_3d_mode;
ConfigSlider* m_3d_depth;
ConfigSlider* m_3d_convergence;
ConfigFloatSlider* m_3d_depth;
QLabel* m_3d_depth_value;
ConfigFloatSlider* m_3d_convergence;
QLabel* m_3d_convergence_value;
ConfigBool* m_3d_swap_eyes;
ConfigBool* m_3d_per_eye_resolution;
Source/Core/DolphinQt/HotkeyScheduler.cpp
+2 -2
View File
@@ -608,7 +608,7 @@ void HotkeyScheduler::Run()
const auto stereo_depth = Config::Get(Config::GFX_STEREO_DEPTH);
if (IsHotkey(HK_DECREASE_DEPTH, true))
Config::SetCurrent(Config::GFX_STEREO_DEPTH, std::max(stereo_depth - 1, 0));
Config::SetCurrent(Config::GFX_STEREO_DEPTH, std::max(stereo_depth - 1, 0.0f));
if (IsHotkey(HK_INCREASE_DEPTH, true))
Config::SetCurrent(Config::GFX_STEREO_DEPTH,
@@ -617,7 +617,7 @@ void HotkeyScheduler::Run()
const auto stereo_convergence = Config::Get(Config::GFX_STEREO_CONVERGENCE);
if (IsHotkey(HK_DECREASE_CONVERGENCE, true))
Config::SetCurrent(Config::GFX_STEREO_CONVERGENCE, std::max(stereo_convergence - 5, 0));
Config::SetCurrent(Config::GFX_STEREO_CONVERGENCE, std::max(stereo_convergence - 5, 0.0f));
if (IsHotkey(HK_INCREASE_CONVERGENCE, true))
Config::SetCurrent(Config::GFX_STEREO_CONVERGENCE,