1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00

Toggle AA state like Qt GUI

This commit is contained in:
oddMLan 2020-06-15 04:28:36 -07:00 committed by Sergey Lipskiy
parent 9bf9202c47
commit cbc0dfd90e

View File

@ -426,15 +426,15 @@ void CVideoTab::LoadSettings(bool /*blockCustomSettings*/) {
if (config.frameBufferEmulation.N64DepthCompare == 0) { if (config.frameBufferEmulation.N64DepthCompare == 0) {
if (!m_AAInfoWarning) { if (!m_AAInfoWarning) {
HideMSAADepthWarning(true); HideMSAADepthWarning(true);
DisallowMSAA(false);
RedrawWindow(); RedrawWindow();
} }
DisallowMSAA(false);
} else { } else {
if (m_AAInfoWarning) { if (m_AAInfoWarning) {
HideMSAADepthWarning(false); HideMSAADepthWarning(false);
DisallowMSAA(true);
RedrawWindow(); RedrawWindow();
} }
DisallowMSAA(true);
} }
CButton(GetDlgItem(IDC_NOAA_RADIO)).SetCheck(config.video.multisampling == 0 && config.video.fxaa == 0 ? BST_CHECKED : BST_UNCHECKED); CButton(GetDlgItem(IDC_NOAA_RADIO)).SetCheck(config.video.multisampling == 0 && config.video.fxaa == 0 ? BST_CHECKED : BST_UNCHECKED);
@ -525,12 +525,17 @@ 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 = if (CButton(GetDlgItem(IDC_FXAA_RADIO)).GetCheck() == BST_CHECKED
(CButton(GetDlgItem(IDC_FXAA_RADIO)).GetCheck() == BST_CHECKED || CButton(GetDlgItem(IDC_NOAA_RADIO)).GetCheck() == BST_CHECKED
|| CComboBox(m_FrameBufferTab.GetDlgItem(IDC_CMB_N64_DEPTH_COMPARE)).GetCurSel() != 0 || CComboBox(m_FrameBufferTab.GetDlgItem(IDC_CMB_N64_DEPTH_COMPARE)).GetCurSel() != 0) {
|| CButton(GetDlgItem(IDC_NOAA_RADIO)).GetCheck() == BST_CHECKED config.video.multisampling = 0;
) ? 0 } else {
: pow2(m_AliasingSlider.GetPos()); config.video.multisampling = pow2(m_AliasingSlider.GetPos());
}
if (CButton(GetDlgItem(IDC_MSAA_RADIO)).GetCheck() == BST_CHECKED
&& CComboBox(m_FrameBufferTab.GetDlgItem(IDC_CMB_N64_DEPTH_COMPARE)).GetCurSel() != 0) {
config.video.fxaa = 1;
}
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)