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

[Glid64] Move ReadSettings to Settings.cpp

This commit is contained in:
zilmar 2017-01-24 05:19:46 +11:00
parent 50c7d61848
commit 9afe8e6973
2 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Source/Glide64/Main.cpp
View File

@ -265,87 +265,6 @@ void UseUnregisteredSetting(int /*SettingID*/)
}
extern int g_width, g_height;
void ReadSettings()
{
g_settings->card_id = GetSetting(Set_CardId);
#ifdef ANDROID
g_settings->scr_res_x = g_settings->res_x = g_width;
g_settings->scr_res_y = g_settings->res_y = g_height;
#else
g_settings->res_data = (uint32_t)GetSetting(Set_Resolution);
if (g_settings->res_data >= 24) g_settings->res_data = 12;
g_settings->scr_res_x = g_settings->res_x = resolutions[g_settings->res_data][0];
g_settings->scr_res_y = g_settings->res_y = resolutions[g_settings->res_data][1];
g_settings->wrpResolution = GetSetting(Set_wrpResolution);
#endif
g_settings->vsync = GetSetting(Set_vsync);
g_settings->ssformat = (uint8_t)GetSetting(Set_ssformat);
g_settings->clock = GetSetting(Set_clock);
g_settings->clock_24_hr = GetSetting(Set_clock_24_hr);
g_settings->rotate = GetSetting(Set_Rotate);
g_settings->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0;
g_settings->texenh_options = GetSetting(Set_texenh_options);
g_settings->use_hotkeys = GetSetting(Set_hotkeys);
g_settings->wrpVRAM = GetSetting(Set_wrpVRAM);
g_settings->wrpFBO = GetSetting(Set_wrpFBO);
g_settings->wrpAnisotropic = GetSetting(Set_wrpAnisotropic);
#ifndef _ENDUSER_RELEASE_
g_settings->autodetect_ucode = GetSetting(Set_autodetect_ucode);
g_settings->ucode = GetSetting(Set_ucode);
g_settings->wireframe = GetSetting(Set_wireframe);
g_settings->wfmode = GetSetting(Set_wfmode);
g_settings->logging = GetSetting(Set_logging);
g_settings->log_clear = GetSetting(Set_log_clear);
g_settings->run_in_window = GetSetting(Set_run_in_window);
g_settings->elogging = GetSetting(Set_elogging);
g_settings->filter_cache = GetSetting(Set_filter_cache);
g_settings->unk_as_red = GetSetting(Set_unk_as_red);
g_settings->log_unk = GetSetting(Set_log_unk);
g_settings->unk_clear = GetSetting(Set_unk_clear);
#else
g_settings->autodetect_ucode = TRUE;
g_settings->ucode = 2;
g_settings->wireframe = FALSE;
g_settings->wfmode = 0;
g_settings->logging = FALSE;
g_settings->log_clear = FALSE;
g_settings->run_in_window = FALSE;
g_settings->elogging = FALSE;
g_settings->filter_cache = FALSE;
g_settings->unk_as_red = FALSE;
g_settings->log_unk = FALSE;
g_settings->unk_clear = FALSE;
#endif
#ifdef TEXTURE_FILTER
char texture_dir[260];
memset(texture_dir, 0, sizeof(texture_dir));
GetSystemSettingSz(Set_texture_dir, texture_dir, sizeof(texture_dir));
g_settings->texture_dir = texture_dir;
g_settings->ghq_fltr = (uint8_t)GetSetting(Set_ghq_fltr);
g_settings->ghq_cmpr = (uint8_t)GetSetting(Set_ghq_cmpr);
g_settings->ghq_enht = (uint8_t)GetSetting(Set_ghq_enht);
g_settings->ghq_hirs = (uint8_t)GetSetting(Set_ghq_hirs);
g_settings->ghq_enht_cmpr = GetSetting(Set_ghq_enht_cmpr);
g_settings->ghq_enht_tile = GetSetting(Set_ghq_enht_tile);
g_settings->ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp);
g_settings->ghq_enht_gz = GetSetting(Set_ghq_enht_gz);
g_settings->ghq_enht_nobg = GetSetting(Set_ghq_enht_nobg);
g_settings->ghq_hirs_cmpr = GetSetting(Set_ghq_hirs_cmpr);
g_settings->ghq_hirs_tile = GetSetting(Set_ghq_hirs_tile);
g_settings->ghq_hirs_f16bpp = GetSetting(Set_ghq_hirs_f16bpp);
g_settings->ghq_hirs_gz = GetSetting(Set_ghq_hirs_gz);
g_settings->ghq_hirs_altcrc = GetSetting(Set_ghq_hirs_altcrc);
g_settings->ghq_cache_save = GetSetting(Set_ghq_cache_save);
g_settings->ghq_cache_size = GetSetting(Set_ghq_cache_size);
g_settings->ghq_hirs_let_texartists_fly = GetSetting(Set_ghq_hirs_let_texartists_fly);
g_settings->ghq_hirs_dump = GetSetting(Set_ghq_hirs_dump);
#endif
ConfigWrapper();
}
void ReadSpecialSettings(const char * name)
{
@ -1344,6 +1263,7 @@ int CALL InitiateGFX(GFX_INFO Gfx_Info)
ReadSettings();
char name[21] = "DEFAULT";
ReadSpecialSettings(name);
ConfigWrapper();
#ifndef ANDROID
g_settings->res_data_org = g_settings->res_data;
#endif

80
Source/Glide64/Settings.cpp
View File

@ -99,3 +99,83 @@ wrpFBO(0),
wrpAnisotropic(0)
{
}
void ReadSettings()
{
g_settings->card_id = GetSetting(Set_CardId);
#ifdef ANDROID
g_settings->scr_res_x = g_settings->res_x = g_width;
g_settings->scr_res_y = g_settings->res_y = g_height;
#else
g_settings->res_data = (uint32_t)GetSetting(Set_Resolution);
if (g_settings->res_data >= 24) g_settings->res_data = 12;
g_settings->scr_res_x = g_settings->res_x = resolutions[g_settings->res_data][0];
g_settings->scr_res_y = g_settings->res_y = resolutions[g_settings->res_data][1];
g_settings->wrpResolution = GetSetting(Set_wrpResolution);
#endif
g_settings->vsync = GetSetting(Set_vsync);
g_settings->ssformat = (uint8_t)GetSetting(Set_ssformat);
g_settings->clock = GetSetting(Set_clock);
g_settings->clock_24_hr = GetSetting(Set_clock_24_hr);
g_settings->rotate = GetSetting(Set_Rotate);
g_settings->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0;
g_settings->texenh_options = GetSetting(Set_texenh_options);
g_settings->use_hotkeys = GetSetting(Set_hotkeys);
g_settings->wrpVRAM = GetSetting(Set_wrpVRAM);
g_settings->wrpFBO = GetSetting(Set_wrpFBO);
g_settings->wrpAnisotropic = GetSetting(Set_wrpAnisotropic);
#ifndef _ENDUSER_RELEASE_
g_settings->autodetect_ucode = GetSetting(Set_autodetect_ucode);
g_settings->ucode = GetSetting(Set_ucode);
g_settings->wireframe = GetSetting(Set_wireframe);
g_settings->wfmode = GetSetting(Set_wfmode);
g_settings->logging = GetSetting(Set_logging);
g_settings->log_clear = GetSetting(Set_log_clear);
g_settings->run_in_window = GetSetting(Set_run_in_window);
g_settings->elogging = GetSetting(Set_elogging);
g_settings->filter_cache = GetSetting(Set_filter_cache);
g_settings->unk_as_red = GetSetting(Set_unk_as_red);
g_settings->log_unk = GetSetting(Set_log_unk);
g_settings->unk_clear = GetSetting(Set_unk_clear);
#else
g_settings->autodetect_ucode = TRUE;
g_settings->ucode = 2;
g_settings->wireframe = FALSE;
g_settings->wfmode = 0;
g_settings->logging = FALSE;
g_settings->log_clear = FALSE;
g_settings->run_in_window = FALSE;
g_settings->elogging = FALSE;
g_settings->filter_cache = FALSE;
g_settings->unk_as_red = FALSE;
g_settings->log_unk = FALSE;
g_settings->unk_clear = FALSE;
#endif
#ifdef TEXTURE_FILTER
char texture_dir[260];
memset(texture_dir, 0, sizeof(texture_dir));
GetSystemSettingSz(Set_texture_dir, texture_dir, sizeof(texture_dir));
g_settings->texture_dir = texture_dir;
g_settings->ghq_fltr = (uint8_t)GetSetting(Set_ghq_fltr);
g_settings->ghq_cmpr = (uint8_t)GetSetting(Set_ghq_cmpr);
g_settings->ghq_enht = (uint8_t)GetSetting(Set_ghq_enht);
g_settings->ghq_hirs = (uint8_t)GetSetting(Set_ghq_hirs);
g_settings->ghq_enht_cmpr = GetSetting(Set_ghq_enht_cmpr);
g_settings->ghq_enht_tile = GetSetting(Set_ghq_enht_tile);
g_settings->ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp);
g_settings->ghq_enht_gz = GetSetting(Set_ghq_enht_gz);
g_settings->ghq_enht_nobg = GetSetting(Set_ghq_enht_nobg);
g_settings->ghq_hirs_cmpr = GetSetting(Set_ghq_hirs_cmpr);
g_settings->ghq_hirs_tile = GetSetting(Set_ghq_hirs_tile);
g_settings->ghq_hirs_f16bpp = GetSetting(Set_ghq_hirs_f16bpp);
g_settings->ghq_hirs_gz = GetSetting(Set_ghq_hirs_gz);
g_settings->ghq_hirs_altcrc = GetSetting(Set_ghq_hirs_altcrc);
g_settings->ghq_cache_save = GetSetting(Set_ghq_cache_save);
g_settings->ghq_cache_size = GetSetting(Set_ghq_cache_size);
g_settings->ghq_hirs_let_texartists_fly = GetSetting(Set_ghq_hirs_let_texartists_fly);
g_settings->ghq_hirs_dump = GetSetting(Set_ghq_hirs_dump);
#endif
}