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

[Glide64] Get pal230 to be private

This commit is contained in:
zilmar 2017-03-13 17:14:36 +11:00
parent 59eeb448f6
commit ff805e9b3f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/Main.cpp
View File

@ -163,7 +163,7 @@ void _ChangeSize()
WriteTrace(TraceResolution, TraceDebug, "size: %d x %d", (int)rdp.vi_width, (int)rdp.vi_height); WriteTrace(TraceResolution, TraceDebug, "size: %d x %d", (int)rdp.vi_width, (int)rdp.vi_height);
rdp.scale_x = (float)g_settings->res_x() / rdp.vi_width; rdp.scale_x = (float)g_settings->res_x() / rdp.vi_width;
if (region > 0 && g_settings->pal230) if (region > 0 && g_settings->pal230())
{ {
// odd... but pal games seem to want 230 as height... // odd... but pal games seem to want 230 as height...
rdp.scale_y = res_scl_y * (230.0f / rdp.vi_height) * aspect; rdp.scale_y = res_scl_y * (230.0f / rdp.vi_height) * aspect;

6
Source/Glide64/Settings.cpp
View File

@ -75,7 +75,7 @@ CSettings::CSettings() :
m_clip_zmax(false), //enable far plane clipping; m_clip_zmax(false), //enable far plane clipping;
m_adjust_aspect(false), //adjust screen aspect for wide screen mode m_adjust_aspect(false), //adjust screen aspect for wide screen mode
m_force_calc_sphere(false), //use spheric mapping only, Ridge Racer 64 m_force_calc_sphere(false), //use spheric mapping only, Ridge Racer 64
pal230(0), //set special scale for PAL games m_pal230(false), //set special scale for PAL games
correct_viewport(0), //correct viewport values correct_viewport(0), //correct viewport values
zmode_compare_less(0), //force GR_CMP_LESS for zmode=0 (opaque)and zmode=1 (interpenetrating) zmode_compare_less(0), //force GR_CMP_LESS for zmode=0 (opaque)and zmode=1 (interpenetrating)
old_style_adither(0), //apply alpha dither regardless of alpha_dither_mode old_style_adither(0), //apply alpha dither regardless of alpha_dither_mode
@ -166,7 +166,7 @@ void CSettings::RegisterSettings(void)
game_setting(Set_increase_texrect_edge, "increase_texrect_edge", false); game_setting(Set_increase_texrect_edge, "increase_texrect_edge", false);
game_setting(Set_decrease_fillrect_edge, "decrease_fillrect_edge", false); game_setting(Set_decrease_fillrect_edge, "decrease_fillrect_edge", false);
game_setting(Set_texture_correction, "texture_correction", true); game_setting(Set_texture_correction, "texture_correction", true);
game_setting(Set_pal230, "pal230", 0); game_setting(Set_pal230, "pal230", false);
game_setting(Set_stipple_mode, "stipple_mode", STIPPLE_Rotate); game_setting(Set_stipple_mode, "stipple_mode", STIPPLE_Rotate);
game_setting(Set_stipple_pattern, "stipple_pattern", 0x3E0F83E0); game_setting(Set_stipple_pattern, "stipple_pattern", 0x3E0F83E0);
@ -719,7 +719,7 @@ void CSettings::ReadGameSettings(const char * name)
m_increase_texrect_edge = GetSetting(Set_increase_texrect_edge) != 0; m_increase_texrect_edge = GetSetting(Set_increase_texrect_edge) != 0;
m_decrease_fillrect_edge = GetSetting(Set_decrease_fillrect_edge) != 0; m_decrease_fillrect_edge = GetSetting(Set_decrease_fillrect_edge) != 0;
m_texture_correction = GetSetting(Set_texture_correction) != 0; m_texture_correction = GetSetting(Set_texture_correction) != 0;
g_settings->pal230 = GetSetting(Set_pal230) == 1 ? 1 : 0; m_pal230 = GetSetting(Set_pal230) != 0;
m_stipple_mode = (StippleMode_t)GetSetting(Set_stipple_mode); m_stipple_mode = (StippleMode_t)GetSetting(Set_stipple_mode);
int stipple_pattern = GetSetting(Set_stipple_pattern); int stipple_pattern = GetSetting(Set_stipple_pattern);
m_stipple_pattern = stipple_pattern > 0 ? (uint32_t)stipple_pattern : 0x3E0F83E0; m_stipple_pattern = stipple_pattern > 0 ? (uint32_t)stipple_pattern : 0x3E0F83E0;

3
Source/Glide64/Settings.h
View File

@ -249,7 +249,7 @@ public:
inline bool clip_zmax(void) const { return m_clip_zmax; } //enable far plane clipping inline bool clip_zmax(void) const { return m_clip_zmax; } //enable far plane clipping
inline bool adjust_aspect(void) const { return m_adjust_aspect; } //adjust screen aspect for wide screen mode inline bool adjust_aspect(void) const { return m_adjust_aspect; } //adjust screen aspect for wide screen mode
inline bool force_calc_sphere(void) const { return m_force_calc_sphere; } //use spheric mapping only, Ridge Racer 64 inline bool force_calc_sphere(void) const { return m_force_calc_sphere; } //use spheric mapping only, Ridge Racer 64
int pal230; //set special scale for PAL games inline bool pal230(void) const { return m_pal230; } //use spheric mapping only, Ridge Racer 64
int correct_viewport; //correct viewport values int correct_viewport; //correct viewport values
int zmode_compare_less; //force GR_CMP_LESS for zmode=0 (opaque)and zmode=1 (interpenetrating) int zmode_compare_less; //force GR_CMP_LESS for zmode=0 (opaque)and zmode=1 (interpenetrating)
int old_style_adither; //apply alpha dither regardless of alpha_dither_mode int old_style_adither; //apply alpha dither regardless of alpha_dither_mode
@ -368,6 +368,7 @@ private:
bool m_clip_zmax; bool m_clip_zmax;
bool m_adjust_aspect; bool m_adjust_aspect;
bool m_force_calc_sphere; bool m_force_calc_sphere;
bool m_pal230;
hacks_t m_hacks; hacks_t m_hacks;
}; };