MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

GLideNUI-wtl: Fix MSAA saving and Dithering checkboxes

Browse Source
This commit is contained in:
oddMLan 2020-04-27 00:58:24 -07:00 committed by Sergey Lipskiy
parent 01a1e05432
commit 84e92d1240
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GLideNUI-wtl/ConfigDlg.cpp
View File

@ -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));
SetIcon(hIconSmall, FALSE);
m_FrameBufferTab = new CFrameBufferTab();
m_VideoTab = new CVideoTab(*this, *m_FrameBufferTab, m_strIniPath.c_str());
m_EmulationTab = new CEmulationTab(*this);
m_OsdTab = new COsdTab();
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_FRAME_BUFFER, new CFrameBufferTab);
AddTab(TAB_FRAME_BUFFER, m_FrameBufferTab);
AddTab(TAB_TEXTURE_ENHANCEMENT, new CTextureEnhancementTab);
AddTab(TAB_OSD, m_OsdTab);
#ifdef DEBUG_DUMP

4
src/GLideNUI-wtl/ConfigDlg.h
View File

@ -6,6 +6,8 @@
#include "resource.h"
#include <vector>
class CFrameBufferTab;
class CVideoTab;
class CEmulationTab;
class COsdTab;
@ -61,6 +63,8 @@ protected:
std::string m_strIniPath;
const char * m_romName;
bool m_blockReInit;
CFrameBufferTab * m_FrameBufferTab;
CVideoTab * m_VideoTab;
CEmulationTab * m_EmulationTab;
COsdTab * m_OsdTab;
uint32_t m_TabLeft, m_ProfileLeft;

18
src/GLideNUI-wtl/config-video.cpp
View File

@ -47,11 +47,12 @@ static u32 powof(u32 dim)
return i;
}
CVideoTab::CVideoTab(CConfigDlg & Dlg, const char * strIniPath) :
CVideoTab::CVideoTab(CConfigDlg & Dlg, CFrameBufferTab & FrameBufferTab, const char * strIniPath) :
CConfigTab(IDD_TAB_VIDEO),
m_strIniPath(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);
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_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering == 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_HIRES_NOISE)).SetCheck(config.generalEmulation.enableHiresNoiseDithering != 0 ? BST_CHECKED : BST_UNCHECKED);
CComboBox translationsComboBox(GetDlgItem(IDC_CMB_LANGUAGE));
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.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();
if (CButton(GetDlgItem(IDC_BILINEAR_3POINT)).GetCheck() == BST_CHECKED)

5
src/GLideNUI-wtl/config-video.h
View File

@ -3,6 +3,7 @@
#pragma once
#include "config-tab.h"
#include "config-overscan.h"
#include "config-framebuffer.h"
#include "wtl-BitmapPicture.h"
#include "wtl-tooltip.h"
#include "resource.h"
@ -12,6 +13,7 @@
#include <regex>
class CConfigDlg;
class CFrameBufferTab;
class CVideoTab :
public CConfigTab,
@ -33,7 +35,7 @@ public:
REFLECT_NOTIFICATIONS()
END_MSG_MAP()
CVideoTab(CConfigDlg & Dlg, const char * strIniPath);
CVideoTab(CConfigDlg & Dlg, CFrameBufferTab & FrameBufferTab, const char * strIniPath);
~CVideoTab();
BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/);
@ -57,4 +59,5 @@ public:
std::string m_strIniPath;
LanguageList m_LangList;
CConfigDlg & m_Dlg;
CFrameBufferTab & m_FrameBufferTab;
};