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

[Glide64] Remove screen shot type setting

This commit is contained in:
zilmar 2017-01-29 06:11:28 +11:00
parent 03da86382d
commit a5e9e080f1
9 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Glide64/Config.cpp
View File

@ -354,14 +354,6 @@ public:
m_cbxVSync.SetCheck(g_settings->vsync ? BST_CHECKED : BST_UNCHECKED);
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_cmbScreenShotFormat.Attach(GetDlgItem(IDC_CMB_SCREEN_SHOT_FORMAT));
for (int f = 0; f < NumOfFormats; f++)
{
m_cmbScreenShotFormat.SetItemData(m_cmbScreenShotFormat.AddString(ScreenShotFormats[f].format), ScreenShotFormats[f].type);
}
SetComboBoxIndex(m_cmbScreenShotFormat, g_settings->ssformat);
TTSetTxt(IDC_CMB_SCREEN_SHOT_FORMAT, "Select a format, in which screen shots will be saved");
m_cbxTextureSettings.Attach(GetDlgItem(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT));
m_cbxTextureSettings.SetCheck(g_settings->texenh_options ? BST_CHECKED : BST_UNCHECKED);
@ -412,7 +404,6 @@ public:
CSettings oldsettings = *g_settings;
g_settings->res_data = m_WindowRes.GetCurSel();
g_settings->vsync = m_cbxVSync.GetCheck() == BST_CHECKED;
g_settings->ssformat = m_cmbScreenShotFormat.GetCurSel();
g_settings->texenh_options = m_cbxTextureSettings.GetCheck() == BST_CHECKED;
g_settings->clock = m_cbxClockEnabled.GetCheck() == BST_CHECKED;
g_settings->clock_24_hr = m_cbxClock24.GetCheck() == BST_CHECKED;
@ -448,7 +439,6 @@ private:
COptionsSheet * m_options_page;
CComboBox m_WindowRes, m_cmbFSResolution;
CComboBox m_cmbScreenShotFormat;
CButton m_cbxVSync;
CButton m_cbxTextureSettings;
CButton m_cbxClockEnabled, m_cbxClock24;

2
Source/Glide64/Glide64.rc
View File

@ -106,8 +106,6 @@ BEGIN
GROUPBOX "Other",IDC_STATIC,7,132,303,36
CONTROL "Show texture enhancement options",IDC_CHK_SHOW_TEXTURE_ENHANCEMENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,140,123,11
LTEXT "Screenshot format:",IDC_STATIC,14,153,65,11
COMBOBOX IDC_CMB_SCREEN_SHOT_FORMAT,79,151,42,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
IDD_EMULATION_SETTINGS DIALOGEX 0, 0, 311, 177

11
Source/Glide64/Main.cpp
View File

@ -1605,13 +1605,9 @@ void newSwapBuffers()
romName.Replace(" ", "_");
romName.Replace(":", ";");
if (g_settings->ssformat >= NumOfFormats)
{
g_settings->ssformat = 0;
}
for (int i = 1;; i++)
{
stdstr_f filename("Glide64_%s_%s%d.%s", romName.c_str(), i < 10 ? "0" : "", i, ScreenShotFormats[g_settings->ssformat].extension);
stdstr_f filename("Glide64_%s_%s%d.png", romName.c_str(), i < 10 ? "0" : "", i);
path.SetNameExtension(filename.c_str());
if (!path.Exists())
{
@ -1670,10 +1666,7 @@ void newSwapBuffers()
}
// Unlock the backbuffer
grLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_BACKBUFFER);
if (ScreenShotFormats[g_settings->ssformat].type == rdpBITMAP_TYPE_PNG)
{
write_png_file(path, image_width, image_height, ssimg);
}
write_png_file(path, image_width, image_height, ssimg);
capture_screen = 0;
}
}

4
Source/Glide64/Settings.cpp
View File

@ -18,7 +18,6 @@ res_data(GR_RESOLUTION_640x480),
#endif
advanced_options(0),
texenh_options(0),
ssformat(0),
vsync(0),
clock(0),
@ -123,7 +122,6 @@ void CSettings::RegisterSettings(void)
general_setting(Set_wrpResolution, "wrpResolution", GetCurrentResIndex());
#endif
general_setting(Set_vsync, "vsync", 1);
general_setting(Set_ssformat, "ssformat", 1);
general_setting(Set_clock, "clock", 0);
general_setting(Set_clock_24_hr, "clock_24_hr", 0);
general_setting(Set_texenh_options, "texenh_options", 0);
@ -280,7 +278,6 @@ void CSettings::ReadSettings()
this->wrpResolution = GetSetting(Set_wrpResolution);
#endif
this->vsync = GetSetting(Set_vsync);
this->ssformat = (uint8_t)GetSetting(Set_ssformat);
this->clock = GetSetting(Set_clock);
this->clock_24_hr = GetSetting(Set_clock_24_hr);
this->rotate = GetSetting(Set_Rotate);
@ -516,7 +513,6 @@ void CSettings::WriteSettings(void)
SetSetting(Set_Resolution, (int)g_settings->res_data);
SetSetting(Set_wrpResolution, g_settings->wrpResolution);
#endif
SetSetting(Set_ssformat, g_settings->ssformat);
SetSetting(Set_vsync, g_settings->vsync);
SetSetting(Set_clock, g_settings->clock);
SetSetting(Set_clock_24_hr, g_settings->clock_24_hr);

1
Source/Glide64/Settings.h
View File

@ -33,7 +33,6 @@ public:
int advanced_options;
int texenh_options;
int ssformat;
int vsync;
int clock;

2
Source/Glide64/SettingsID.h
View File

@ -13,7 +13,7 @@
enum
{
// General Settings
Set_CardId, Set_vsync, Set_ssformat, Set_clock,
Set_vsync, Set_clock,
Set_clock_24_hr, Set_Rotate, Set_texenh_options, Set_hotkeys, Set_wrpVRAM,
Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe,
Set_wfmode, Set_logging, Set_log_clear, Set_elogging, Set_run_in_window,

6
Source/Glide64/rdp.cpp
View File

@ -59,12 +59,6 @@
extern CriticalSection * g_ProcessDListCS;
#endif
const int NumOfFormats = 1;
SCREEN_SHOT_FORMAT ScreenShotFormats[NumOfFormats] =
{
{ "PNG", "png", rdpBITMAP_TYPE_PNG },
};
const char *ACmp[] = { "NONE", "THRESHOLD", "UNKNOWN", "DITHER" };
const char *Mode0[] = { "COMBINED", "TEXEL0",

16
Source/Glide64/rdp.h
View File

@ -179,22 +179,6 @@ typedef struct {
uint32_t dxt;
} LOAD_TILE_INFO;
enum rdpBitmapType
{
rdpBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
rdpBITMAP_TYPE_PNG,
};
typedef struct
{
const char * format;
const char * extension;
rdpBitmapType type;
} SCREEN_SHOT_FORMAT;
extern const int NumOfFormats;
extern SCREEN_SHOT_FORMAT ScreenShotFormats[];
typedef struct
{
int num_tmu;

1
Source/Glide64/resource.h
View File

@ -19,7 +19,6 @@
#define IDC_CHK_USE_FRAME_BUFFER_OBJECT 1008
#define IDC_CHK_CLOCK_ENABLED 1012
#define IDC_CHK_CLOCK_24 1013
#define IDC_CMB_SCREEN_SHOT_FORMAT 1015
#define IDC_CHK_SHOW_TEXTURE_ENHANCEMENT 1016
#define IDC_INFO 1017
#define IDC_CMB_FILTERING_MODE 1018