Permalink
Browse files

Merge pull request #6924 from flatulation/shaderconfig

Qt: Reimplement post-processing shader configuration window
  • Loading branch information...
spycrab committed May 21, 2018
2 parents d82d9d1 + 93e0a2e commit 42a1545f8e306317d2725658c560d2ff02d740b8
@@ -39,6 +39,7 @@ add_executable(dolphin-emu
Config/Graphics/GraphicsSlider.cpp
Config/Graphics/GraphicsWidget.cpp
Config/Graphics/GraphicsWindow.cpp
Config/Graphics/PostProcessingConfigWindow.cpp
Config/Graphics/SoftwareRendererWidget.cpp
Config/InfoWidget.cpp
Config/LogConfigWidget.cpp
@@ -18,6 +18,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
#include "DolphinQt2/Settings.h"
#include "UICommon/VideoUtils.h"
#include "VideoCommon/PostProcessing.h"
@@ -131,6 +132,8 @@ void EnhancementsWidget::ConnectWidgets()
[this](int) { SaveSettings(); });
connect(m_3d_mode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
[this](int) { SaveSettings(); });
connect(m_configure_pp_effect, &QPushButton::pressed, this,
&EnhancementsWidget::ConfigurePostProcessingShader);
}
void EnhancementsWidget::LoadSettings()
@@ -318,3 +321,9 @@ void EnhancementsWidget::AddDescriptions()
AddDescription(m_3d_convergence, TR_3D_CONVERGENCE_DESCRIPTION);
AddDescription(m_3d_swap_eyes, TR_3D_SWAP_EYES_DESCRIPTION);
}
void EnhancementsWidget::ConfigurePostProcessingShader()
{
const std::string shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER);
PostProcessingConfigWindow(this, shader).exec();
}
@@ -25,6 +25,7 @@ class EnhancementsWidget final : public GraphicsWidget
void CreateWidgets();
void ConnectWidgets();
void AddDescriptions();
void ConfigurePostProcessingShader();
// Enhancements
QComboBox* m_ir_combo;
Oops, something went wrong.

0 comments on commit 42a1545

Please sign in to comment.