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

[Glide64] Make decrease_fillrect_edge private

This commit is contained in:
zilmar 2017-03-13 07:31:03 +11:00
parent ca12d5a740
commit cd34f9a25d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Glide64/Settings.cpp
View File

@ -65,7 +65,7 @@ CSettings::CSettings() :
m_use_sts1_only(false),
m_flame_corona(false), //hack for zeldas flame's corona
m_increase_texrect_edge(false), // add 1 to lower right corner coordinates of texrect
decrease_fillrect_edge(0), // sub 1 from lower right corner coordinates of fillrect
m_decrease_fillrect_edge(false), // sub 1 from lower right corner coordinates of fillrect
texture_correction(0), // enable perspective texture correction emulation. is on by default
m_stipple_mode(STIPPLE_Disable), //used for dithered alpha emulation
stipple_pattern(0), //used for dithered alpha emulation
@ -164,7 +164,7 @@ void CSettings::RegisterSettings(void)
game_setting(Set_force_calc_sphere, "force_calc_sphere", 0);
game_setting(Set_correct_viewport, "correct_viewport", 0);
game_setting(Set_increase_texrect_edge, "increase_texrect_edge", false);
game_setting(Set_decrease_fillrect_edge, "decrease_fillrect_edge", 0);
game_setting(Set_decrease_fillrect_edge, "decrease_fillrect_edge", false);
game_setting(Set_texture_correction, "texture_correction", 1);
game_setting(Set_pal230, "pal230", 0);
game_setting(Set_stipple_mode, "stipple_mode", STIPPLE_Rotate);
@ -717,7 +717,7 @@ void CSettings::ReadGameSettings(const char * name)
g_settings->force_calc_sphere = GetSetting(Set_force_calc_sphere);
g_settings->correct_viewport = GetSetting(Set_correct_viewport);
m_increase_texrect_edge = GetSetting(Set_increase_texrect_edge) != 0;
g_settings->decrease_fillrect_edge = GetSetting(Set_decrease_fillrect_edge);
m_decrease_fillrect_edge = GetSetting(Set_decrease_fillrect_edge) != 0;
g_settings->texture_correction = GetSetting(Set_texture_correction) == 0 ? 0 : 1;
g_settings->pal230 = GetSetting(Set_pal230) == 1 ? 1 : 0;
m_stipple_mode = (StippleMode_t)GetSetting(Set_stipple_mode);

3
Source/Glide64/Settings.h
View File

@ -239,7 +239,7 @@ public:
inline bool use_sts1_only(void) const { return m_use_sts1_only; }
inline bool flame_corona(void) const { return m_flame_corona; } //hack for zeldas flame's corona
inline bool increase_texrect_edge(void) const { return m_increase_texrect_edge; } // add 1 to lower right corner coordinates of texrect
int decrease_fillrect_edge; // sub 1 from lower right corner coordinates of fillrect
inline bool decrease_fillrect_edge(void) const { return m_decrease_fillrect_edge; }; // sub 1 from lower right corner coordinates of fillrect
int texture_correction; // enable perspective texture correction emulation. is on by default
inline StippleMode_t stipple_mode(void) const { return m_stipple_mode; } //used for dithered alpha emulation
uint32_t stipple_pattern; //used for dithered alpha emulation
@ -358,6 +358,7 @@ private:
bool m_use_sts1_only;
bool m_flame_corona;
bool m_increase_texrect_edge;
bool m_decrease_fillrect_edge;
StippleMode_t m_stipple_mode;
hacks_t m_hacks;
};

2
Source/Glide64/rdp.cpp
View File

@ -2284,7 +2284,7 @@ static void rdp_fillrect()
// Update scissor
update_scissor();
if (g_settings->decrease_fillrect_edge && rdp.cycle_mode == 0)
if (g_settings->decrease_fillrect_edge() && rdp.cycle_mode == 0)
{
lr_x--; lr_y--;
}