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

[Glide64] Make texture_correction private

This commit is contained in:
zilmar 2017-03-13 07:36:14 +11:00
parent cd34f9a25d
commit 09504e2244
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

@ -66,7 +66,7 @@ CSettings::CSettings() :
m_flame_corona(false), //hack for zeldas flame's corona m_flame_corona(false), //hack for zeldas flame's corona
m_increase_texrect_edge(false), // add 1 to lower right corner coordinates of texrect m_increase_texrect_edge(false), // add 1 to lower right corner coordinates of texrect
m_decrease_fillrect_edge(false), // 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_texture_correction(false), // enable perspective texture correction emulation. is on by default
m_stipple_mode(STIPPLE_Disable), //used for dithered alpha emulation m_stipple_mode(STIPPLE_Disable), //used for dithered alpha emulation
stipple_pattern(0), //used for dithered alpha emulation stipple_pattern(0), //used for dithered alpha emulation
force_microcheck(0), //check microcode each frame, for mixed F3DEX-S2DEX games force_microcheck(0), //check microcode each frame, for mixed F3DEX-S2DEX games
@ -165,7 +165,7 @@ void CSettings::RegisterSettings(void)
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);
game_setting(Set_texture_correction, "texture_correction", 1); game_setting(Set_texture_correction, "texture_correction", true);
game_setting(Set_pal230, "pal230", 0); game_setting(Set_pal230, "pal230", 0);
game_setting(Set_stipple_mode, "stipple_mode", STIPPLE_Rotate); game_setting(Set_stipple_mode, "stipple_mode", STIPPLE_Rotate);
@ -718,7 +718,7 @@ void CSettings::ReadGameSettings(const char * name)
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;
g_settings->texture_correction = GetSetting(Set_texture_correction) == 0 ? 0 : 1; m_texture_correction = GetSetting(Set_texture_correction) != 0;
g_settings->pal230 = GetSetting(Set_pal230) == 1 ? 1 : 0; g_settings->pal230 = GetSetting(Set_pal230) == 1 ? 1 : 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);

3
Source/Glide64/Settings.h
View File

@ -240,7 +240,7 @@ public:
inline bool flame_corona(void) const { return m_flame_corona; } //hack for zeldas flame's corona 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 inline bool increase_texrect_edge(void) const { return m_increase_texrect_edge; } // add 1 to lower right corner coordinates of texrect
inline bool decrease_fillrect_edge(void) const { return m_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 bool texture_correction(void) const { return m_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 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 uint32_t stipple_pattern; //used for dithered alpha emulation
int force_microcheck; //check microcode each frame, for mixed F3DEX-S2DEX games int force_microcheck; //check microcode each frame, for mixed F3DEX-S2DEX games
@ -359,6 +359,7 @@ private:
bool m_flame_corona; bool m_flame_corona;
bool m_increase_texrect_edge; bool m_increase_texrect_edge;
bool m_decrease_fillrect_edge; bool m_decrease_fillrect_edge;
bool m_texture_correction;
StippleMode_t m_stipple_mode; StippleMode_t m_stipple_mode;
hacks_t m_hacks; hacks_t m_hacks;
}; };

2
Source/Glide64/rdp.cpp
View File

@ -350,7 +350,7 @@ void microcheck()
rdp.Persp_en = 1; rdp.Persp_en = 1;
rdp.persp_supported = FALSE; rdp.persp_supported = FALSE;
} }
else if (g_settings->texture_correction) else if (g_settings->texture_correction())
{ {
rdp.persp_supported = TRUE; rdp.persp_supported = TRUE;
} }