mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
GLideNUI-wtl: Fix MSAA saving and Dithering checkboxes
This commit is contained in:
parent
01a1e05432
commit
84e92d1240
|
@ -43,13 +43,15 @@ LRESULT CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPar
|
||||||
HICON hIconSmall = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
|
HICON hIconSmall = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
|
||||||
SetIcon(hIconSmall, FALSE);
|
SetIcon(hIconSmall, FALSE);
|
||||||
|
|
||||||
|
m_FrameBufferTab = new CFrameBufferTab();
|
||||||
|
m_VideoTab = new CVideoTab(*this, *m_FrameBufferTab, m_strIniPath.c_str());
|
||||||
m_EmulationTab = new CEmulationTab(*this);
|
m_EmulationTab = new CEmulationTab(*this);
|
||||||
m_OsdTab = new COsdTab();
|
m_OsdTab = new COsdTab();
|
||||||
|
|
||||||
m_Tabs.Attach(GetDlgItem(IDC_TABS));
|
m_Tabs.Attach(GetDlgItem(IDC_TABS));
|
||||||
AddTab(TAB_VIDEO, new CVideoTab(*this, m_strIniPath.c_str()));
|
AddTab(TAB_VIDEO, m_VideoTab);
|
||||||
AddTab(TAB_EMULATION, m_EmulationTab);
|
AddTab(TAB_EMULATION, m_EmulationTab);
|
||||||
AddTab(TAB_FRAME_BUFFER, new CFrameBufferTab);
|
AddTab(TAB_FRAME_BUFFER, m_FrameBufferTab);
|
||||||
AddTab(TAB_TEXTURE_ENHANCEMENT, new CTextureEnhancementTab);
|
AddTab(TAB_TEXTURE_ENHANCEMENT, new CTextureEnhancementTab);
|
||||||
AddTab(TAB_OSD, m_OsdTab);
|
AddTab(TAB_OSD, m_OsdTab);
|
||||||
#ifdef DEBUG_DUMP
|
#ifdef DEBUG_DUMP
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
class CFrameBufferTab;
|
||||||
|
class CVideoTab;
|
||||||
class CEmulationTab;
|
class CEmulationTab;
|
||||||
class COsdTab;
|
class COsdTab;
|
||||||
|
|
||||||
|
@ -61,6 +63,8 @@ protected:
|
||||||
std::string m_strIniPath;
|
std::string m_strIniPath;
|
||||||
const char * m_romName;
|
const char * m_romName;
|
||||||
bool m_blockReInit;
|
bool m_blockReInit;
|
||||||
|
CFrameBufferTab * m_FrameBufferTab;
|
||||||
|
CVideoTab * m_VideoTab;
|
||||||
CEmulationTab * m_EmulationTab;
|
CEmulationTab * m_EmulationTab;
|
||||||
COsdTab * m_OsdTab;
|
COsdTab * m_OsdTab;
|
||||||
uint32_t m_TabLeft, m_ProfileLeft;
|
uint32_t m_TabLeft, m_ProfileLeft;
|
||||||
|
|
|
@ -47,11 +47,12 @@ static u32 powof(u32 dim)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
CVideoTab::CVideoTab(CConfigDlg & Dlg, const char * strIniPath) :
|
CVideoTab::CVideoTab(CConfigDlg & Dlg, CFrameBufferTab & FrameBufferTab, const char * strIniPath) :
|
||||||
CConfigTab(IDD_TAB_VIDEO),
|
CConfigTab(IDD_TAB_VIDEO),
|
||||||
m_strIniPath(strIniPath),
|
m_strIniPath(strIniPath),
|
||||||
m_LangList(GetLanguageList(strIniPath)),
|
m_LangList(GetLanguageList(strIniPath)),
|
||||||
m_Dlg(Dlg)
|
m_Dlg(Dlg),
|
||||||
|
m_FrameBufferTab(FrameBufferTab)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,9 +377,9 @@ void CVideoTab::LoadSettings(bool /*blockCustomSettings*/) {
|
||||||
}
|
}
|
||||||
|
|
||||||
CComboBox(GetDlgItem(IDC_CMB_PATTERN)).SetCurSel(config.generalEmulation.rdramImageDitheringMode);
|
CComboBox(GetDlgItem(IDC_CMB_PATTERN)).SetCurSel(config.generalEmulation.rdramImageDitheringMode);
|
||||||
CButton(GetDlgItem(IDC_CHK_APPLY_TO_OUTPUT)).SetCheck(config.generalEmulation.enableDitheringPattern == 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_APPLY_TO_OUTPUT)).SetCheck(config.generalEmulation.enableDitheringPattern != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
CButton(GetDlgItem(IDC_CHK_5BIT_QUANTIZATION)).SetCheck(config.generalEmulation.enableDitheringQuantization == 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_5BIT_QUANTIZATION)).SetCheck(config.generalEmulation.enableDitheringQuantization != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering == 0 ? BST_CHECKED : BST_UNCHECKED);
|
CButton(GetDlgItem(IDC_CHK_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering != 0 ? BST_CHECKED : BST_UNCHECKED);
|
||||||
|
|
||||||
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
|
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
|
||||||
translationsComboBox.SetCurSel(-1);
|
translationsComboBox.SetCurSel(-1);
|
||||||
|
@ -443,7 +444,12 @@ void CVideoTab::SaveSettings()
|
||||||
);
|
);
|
||||||
|
|
||||||
config.video.fxaa = CButton(GetDlgItem(IDC_FXAA_RADIO)).GetCheck() == BST_CHECKED ? 1 : 0;
|
config.video.fxaa = CButton(GetDlgItem(IDC_FXAA_RADIO)).GetCheck() == BST_CHECKED ? 1 : 0;
|
||||||
config.video.multisampling = pow2(m_AliasingSlider.GetPos());
|
config.video.multisampling =
|
||||||
|
(CButton(GetDlgItem(IDC_FXAA_RADIO)).GetCheck() == BST_CHECKED
|
||||||
|
|| CComboBox(m_FrameBufferTab.GetDlgItem(IDC_CMB_N64_DEPTH_COMPARE)).GetCurSel() != 0
|
||||||
|
|| CButton(GetDlgItem(IDC_NOAA_RADIO)).GetCheck() == BST_CHECKED
|
||||||
|
) ? 0
|
||||||
|
: pow2(m_AliasingSlider.GetPos());
|
||||||
config.texture.maxAnisotropy = m_AnisotropicSlider.GetPos();
|
config.texture.maxAnisotropy = m_AnisotropicSlider.GetPos();
|
||||||
|
|
||||||
if (CButton(GetDlgItem(IDC_BILINEAR_3POINT)).GetCheck() == BST_CHECKED)
|
if (CButton(GetDlgItem(IDC_BILINEAR_3POINT)).GetCheck() == BST_CHECKED)
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "config-tab.h"
|
#include "config-tab.h"
|
||||||
#include "config-overscan.h"
|
#include "config-overscan.h"
|
||||||
|
#include "config-framebuffer.h"
|
||||||
#include "wtl-BitmapPicture.h"
|
#include "wtl-BitmapPicture.h"
|
||||||
#include "wtl-tooltip.h"
|
#include "wtl-tooltip.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
@ -12,6 +13,7 @@
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
|
||||||
class CConfigDlg;
|
class CConfigDlg;
|
||||||
|
class CFrameBufferTab;
|
||||||
|
|
||||||
class CVideoTab :
|
class CVideoTab :
|
||||||
public CConfigTab,
|
public CConfigTab,
|
||||||
|
@ -33,7 +35,7 @@ public:
|
||||||
REFLECT_NOTIFICATIONS()
|
REFLECT_NOTIFICATIONS()
|
||||||
END_MSG_MAP()
|
END_MSG_MAP()
|
||||||
|
|
||||||
CVideoTab(CConfigDlg & Dlg, const char * strIniPath);
|
CVideoTab(CConfigDlg & Dlg, CFrameBufferTab & FrameBufferTab, const char * strIniPath);
|
||||||
~CVideoTab();
|
~CVideoTab();
|
||||||
|
|
||||||
BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/);
|
BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/);
|
||||||
|
@ -57,4 +59,5 @@ public:
|
||||||
std::string m_strIniPath;
|
std::string m_strIniPath;
|
||||||
LanguageList m_LangList;
|
LanguageList m_LangList;
|
||||||
CConfigDlg & m_Dlg;
|
CConfigDlg & m_Dlg;
|
||||||
|
CFrameBufferTab & m_FrameBufferTab;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user