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

[Glide64] Get force_calc_sphere to be private

This commit is contained in:
zilmar 2017-03-13 17:11:14 +11:00
parent 19cfdc174a
commit 59eeb448f6
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/3dmath.cpp
View File

@ -76,7 +76,7 @@ void calc_light(VERTEX *v)
//* //*
void calc_linear(VERTEX *v) void calc_linear(VERTEX *v)
{ {
if (g_settings->force_calc_sphere) if (g_settings->force_calc_sphere())
{ {
calc_sphere(v); calc_sphere(v);
return; return;

6
Source/Glide64/Settings.cpp
View File

@ -74,7 +74,7 @@ CSettings::CSettings() :
m_clip_zmin(false), //enable near z clipping m_clip_zmin(false), //enable near z clipping
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
force_calc_sphere(0), //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 pal230(0), //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)
@ -161,7 +161,7 @@ void CSettings::RegisterSettings(void)
game_setting(Set_alt_tex_size, "alt_tex_size", false); game_setting(Set_alt_tex_size, "alt_tex_size", false);
game_setting(Set_use_sts1_only, "use_sts1_only", false); game_setting(Set_use_sts1_only, "use_sts1_only", false);
game_setting(Set_force_calc_sphere, "force_calc_sphere", 0); game_setting(Set_force_calc_sphere, "force_calc_sphere", false);
game_setting(Set_correct_viewport, "correct_viewport", 0); game_setting(Set_correct_viewport, "correct_viewport", 0);
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);
@ -714,7 +714,7 @@ void CSettings::ReadGameSettings(const char * name)
m_alt_tex_size = GetSetting(Set_alt_tex_size) != 0; m_alt_tex_size = GetSetting(Set_alt_tex_size) != 0;
m_use_sts1_only = GetSetting(Set_use_sts1_only) != 0; m_use_sts1_only = GetSetting(Set_use_sts1_only) != 0;
g_settings->force_calc_sphere = GetSetting(Set_force_calc_sphere); m_force_calc_sphere = GetSetting(Set_force_calc_sphere) != 0;
g_settings->correct_viewport = GetSetting(Set_correct_viewport); g_settings->correct_viewport = GetSetting(Set_correct_viewport);
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;

3
Source/Glide64/Settings.h
View File

@ -248,7 +248,7 @@ public:
inline bool clip_zmin(void) const { return m_clip_zmin; } //enable near z clipping inline bool clip_zmin(void) const { return m_clip_zmin; } //enable near z clipping
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
int 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 int pal230; //set special scale for PAL games
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)
@ -367,6 +367,7 @@ private:
bool m_clip_zmin; bool m_clip_zmin;
bool m_clip_zmax; bool m_clip_zmax;
bool m_adjust_aspect; bool m_adjust_aspect;
bool m_force_calc_sphere;
hacks_t m_hacks; hacks_t m_hacks;
}; };