ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Make texenh_options private

This commit is contained in:
zilmar 2017-03-09 18:01:06 +11:00
parent 752ade92f0
commit 880d7c61ff
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Glide64/Config.cpp
View File

@ -310,7 +310,7 @@ public:
TTSetTxt(IDC_CHK_VERTICAL_SYNC, "Vertical sync:\n\nThis option will enable the vertical sync, which will prevent tearing.\nNote: this option will ONLY have effect if vsync is set to \"Software Controlled\"."); TTSetTxt(IDC_CHK_VERTICAL_SYNC, "Vertical sync:\n\nThis option will enable the vertical sync, which will prevent tearing.\nNote: this option will ONLY have effect if vsync is set to \"Software Controlled\".");
m_cbxTextureSettings.Attach(GetDlgItem(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT)); m_cbxTextureSettings.Attach(GetDlgItem(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT));
m_cbxTextureSettings.SetCheck(g_settings->texenh_options ? BST_CHECKED : BST_UNCHECKED); m_cbxTextureSettings.SetCheck(g_settings->texenh_options() ? BST_CHECKED : BST_UNCHECKED);
m_cmbFSResolution.Attach(GetDlgItem(IDC_CMB_FS_RESOLUTION)); m_cmbFSResolution.Attach(GetDlgItem(IDC_CMB_FS_RESOLUTION));
int32_t size = 0; int32_t size = 0;
@ -351,7 +351,7 @@ public:
CSettings oldsettings = *g_settings; CSettings oldsettings = *g_settings;
g_settings->SetScreenRes(m_WindowRes.GetCurSel()); g_settings->SetScreenRes(m_WindowRes.GetCurSel());
g_settings->vsync = m_cbxVSync.GetCheck() == BST_CHECKED; g_settings->vsync = m_cbxVSync.GetCheck() == BST_CHECKED;
g_settings->texenh_options = m_cbxTextureSettings.GetCheck() == BST_CHECKED; g_settings->SetTexenhOptions(m_cbxTextureSettings.GetCheck() == BST_CHECKED);
g_settings->wrpResolution = m_cmbFSResolution.GetCurSel(); g_settings->wrpResolution = m_cmbFSResolution.GetCurSel();
g_settings->wrpAnisotropic = m_cbxAnisotropic.GetCheck() == BST_CHECKED; g_settings->wrpAnisotropic = m_cbxAnisotropic.GetCheck() == BST_CHECKED;
g_settings->wrpVRAM = m_cbxVRAM.GetCheck() == BST_CHECKED ? 0 : atoi(spinVRAM); g_settings->wrpVRAM = m_cbxVRAM.GetCheck() == BST_CHECKED ? 0 : atoi(spinVRAM);
@ -773,7 +773,7 @@ COptionsSheet::~COptionsSheet()
void COptionsSheet::UpdateTextureSettings(void) void COptionsSheet::UpdateTextureSettings(void)
{ {
if (g_settings->texenh_options) if (g_settings->texenh_options())
{ {
if (m_hTextureEnhancement == NULL) if (m_hTextureEnhancement == NULL)
{ {

17
Source/Glide64/Settings.cpp
View File

@ -22,7 +22,7 @@ CSettings::CSettings() :
m_scr_res_y(GetScreenResHeight(GetDefaultScreenRes())), m_scr_res_y(GetScreenResHeight(GetDefaultScreenRes())),
m_ScreenRes(GetDefaultScreenRes()), m_ScreenRes(GetDefaultScreenRes()),
m_advanced_options(false), m_advanced_options(false),
texenh_options(0), m_texenh_options(false),
vsync(0), vsync(0),
m_rotate(Rotate_None), m_rotate(Rotate_None),
m_filtering(Filter_Automatic), m_filtering(Filter_Automatic),
@ -121,7 +121,7 @@ void CSettings::RegisterSettings(void)
general_setting(Set_FullScreenRes, "FullScreenRes", GetCurrentResIndex()); general_setting(Set_FullScreenRes, "FullScreenRes", GetCurrentResIndex());
#endif #endif
general_setting(Set_vsync, "vsync", 1); general_setting(Set_vsync, "vsync", 1);
general_setting(Set_texenh_options, "texenh_options", 0); general_setting(Set_texenh_options, "texenh_options", false);
general_setting(Set_wrpVRAM, "wrpVRAM", 0); general_setting(Set_wrpVRAM, "wrpVRAM", 0);
#ifndef ANDROID #ifndef ANDROID
general_setting(Set_wrpFBO, "wrpFBO", 0); general_setting(Set_wrpFBO, "wrpFBO", 0);
@ -215,6 +215,15 @@ void CSettings::RegisterSettings(void)
} }
void CSettings::SetTexenhOptions(bool value)
{
if (value != m_texenh_options)
{
m_texenh_options = value;
m_dirty = true;
}
}
void CSettings::SetScreenRes(uint32_t value) void CSettings::SetScreenRes(uint32_t value)
{ {
if (value >= GetScreenResolutionCount()) if (value >= GetScreenResolutionCount())
@ -385,7 +394,7 @@ void CSettings::ReadSettings()
this->vsync = GetSetting(Set_vsync); this->vsync = GetSetting(Set_vsync);
m_rotate = (ScreenRotate_t)GetSetting(Set_Rotate); m_rotate = (ScreenRotate_t)GetSetting(Set_Rotate);
m_advanced_options = Set_basic_mode ? GetSystemSetting(Set_basic_mode) == 0 : false; m_advanced_options = Set_basic_mode ? GetSystemSetting(Set_basic_mode) == 0 : false;
this->texenh_options = GetSetting(Set_texenh_options); m_texenh_options = GetSetting(Set_texenh_options) != 0;
this->wrpVRAM = GetSetting(Set_wrpVRAM); this->wrpVRAM = GetSetting(Set_wrpVRAM);
this->wrpFBO = GetSetting(Set_wrpFBO); this->wrpFBO = GetSetting(Set_wrpFBO);
@ -664,7 +673,7 @@ void CSettings::WriteSettings(void)
#endif #endif
SetSetting(Set_vsync, g_settings->vsync); SetSetting(Set_vsync, g_settings->vsync);
SetSetting(Set_Rotate, m_rotate); SetSetting(Set_Rotate, m_rotate);
SetSetting(Set_texenh_options, g_settings->texenh_options); SetSetting(Set_texenh_options, m_texenh_options);
SetSetting(Set_wrpVRAM, g_settings->wrpVRAM); SetSetting(Set_wrpVRAM, g_settings->wrpVRAM);
SetSetting(Set_wrpFBO, g_settings->wrpFBO); SetSetting(Set_wrpFBO, g_settings->wrpFBO);

4
Source/Glide64/Settings.h
View File

@ -146,7 +146,6 @@ public:
}; };
int texenh_options;
int vsync; int vsync;
@ -184,6 +183,7 @@ public:
inline uint32_t scr_res_y(void) const { return m_scr_res_y; } inline uint32_t scr_res_y(void) const { return m_scr_res_y; }
inline uint32_t ScreenRes(void) const { return m_ScreenRes; } inline uint32_t ScreenRes(void) const { return m_ScreenRes; }
inline bool advanced_options(void) const { return m_advanced_options; } inline bool advanced_options(void) const { return m_advanced_options; }
inline bool texenh_options(void) const { return m_texenh_options; }
inline bool FlushLogs(void) const { return m_FlushLogs; } inline bool FlushLogs(void) const { return m_FlushLogs; }
inline ScreenRotate_t rotate(void) const { return m_rotate; } inline ScreenRotate_t rotate(void) const { return m_rotate; }
inline Filtering_t filtering(void) const { return m_filtering; } inline Filtering_t filtering(void) const { return m_filtering; }
@ -256,6 +256,7 @@ public:
int wrpVRAM; int wrpVRAM;
int wrpFBO; int wrpFBO;
int wrpAnisotropic; int wrpAnisotropic;
void SetTexenhOptions(bool value);
void SetScreenRes(uint32_t value); void SetScreenRes(uint32_t value);
void SetAspectmode(AspectMode_t value); void SetAspectmode(AspectMode_t value);
void SetLODmode(PixelLevelOfDetail_t value); void SetLODmode(PixelLevelOfDetail_t value);
@ -296,6 +297,7 @@ private:
SwapMode_t m_swapmode; SwapMode_t m_swapmode;
PixelLevelOfDetail_t m_lodmode; PixelLevelOfDetail_t m_lodmode;
bool m_advanced_options; bool m_advanced_options;
bool m_texenh_options;
TextureFilter_t m_ghq_fltr; TextureFilter_t m_ghq_fltr;
TextureEnhancement_t m_ghq_enht; TextureEnhancement_t m_ghq_enht;
ucode_t m_ucode; ucode_t m_ucode;