rename "AntiAliasing" to "SmoothLines"
This commit is contained in:
@@ -2351,7 +2351,7 @@ Line3=conf,DisplayColor
|
||||
Line4=conf,TextureResolution
|
||||
Line5=conf,TextureColor
|
||||
Line6=conf,MovieColor
|
||||
Line7=conf,AntiAliasing
|
||||
Line7=conf,SmoothLines
|
||||
Line8=conf,KeepTexturesInMemory
|
||||
Line9=conf,RefreshRate
|
||||
Line10=conf,WaitForVsync
|
||||
|
||||
@@ -103,7 +103,7 @@ PrefsManager::PrefsManager()
|
||||
m_iCoinsPerCredit = 1;
|
||||
m_Premium = NO_PREMIUM;
|
||||
m_iBoostAppPriority = -1;
|
||||
m_bAntiAliasing = false;
|
||||
m_bSmoothLines = false;
|
||||
m_ShowSongOptions = YES;
|
||||
m_bDancePointsForOni = false;
|
||||
m_bPercentageScoring = false;
|
||||
@@ -356,7 +356,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
|
||||
#endif
|
||||
ini.GetValue( "Options", "CoursesToShowRanking", m_sCoursesToShowRanking );
|
||||
ini.GetValue( "Options", "GetRankingName", (int&)m_iGetRankingName);
|
||||
ini.GetValue( "Options", "AntiAliasing", m_bAntiAliasing );
|
||||
ini.GetValue( "Options", "SmoothLines", m_bSmoothLines );
|
||||
ini.GetValue( "Options", "GlobalOffsetSeconds", m_fGlobalOffsetSeconds );
|
||||
ini.GetValue( "Options", "ShowBeginnerHelper", m_bShowBeginnerHelper );
|
||||
ini.GetValue( "Options", "Language", m_sLanguage );
|
||||
@@ -506,7 +506,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
|
||||
#endif
|
||||
ini.SetValue( "Options", "CoursesToShowRanking", m_sCoursesToShowRanking );
|
||||
ini.SetValue( "Options", "GetRankingName", m_iGetRankingName);
|
||||
ini.SetValue( "Options", "AntiAliasing", m_bAntiAliasing );
|
||||
ini.SetValue( "Options", "SmoothLines", m_bSmoothLines );
|
||||
ini.SetValue( "Options", "GlobalOffsetSeconds", m_fGlobalOffsetSeconds );
|
||||
|
||||
ini.SetValue( "Options", "TenFooterInRed", m_bTenFooterInRed );
|
||||
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
int m_iLastSeenMemory;
|
||||
#endif
|
||||
CString m_sVideoRenderers;
|
||||
bool m_bAntiAliasing;
|
||||
bool m_bSmoothLines;
|
||||
CString m_sSoundDrivers;
|
||||
int m_iSoundWriteAhead;
|
||||
CString m_sMovieDrivers;
|
||||
|
||||
@@ -131,7 +131,7 @@ void RageDisplay::ResetStats()
|
||||
|
||||
void RageDisplay::StatsAddVerts( int iNumVertsRendered ) { g_iVertsRenderedSinceLastCheck += iNumVertsRendered; }
|
||||
|
||||
/* Draw a line as a quad. GL_LINES with antialiasing off can draw line
|
||||
/* Draw a line as a quad. GL_LINES with SmoothLines off can draw line
|
||||
* ends at odd angles--they're forced to axis-alignment regardless of the
|
||||
* angle of the line. */
|
||||
void RageDisplay::DrawPolyLine(const RageSpriteVertex &p1, const RageSpriteVertex &p2, float LineWidth )
|
||||
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
int rate_,
|
||||
bool vsync_,
|
||||
bool interlaced_,
|
||||
bool bAntiAliasing_,
|
||||
bool bSmoothLines_,
|
||||
CString sWindowTitle_,
|
||||
CString sIconFile_
|
||||
#ifdef _XBOX
|
||||
@@ -93,7 +93,7 @@ public:
|
||||
rate = rate_;
|
||||
vsync = vsync_;
|
||||
interlaced = interlaced_;
|
||||
bAntiAliasing = bAntiAliasing_;
|
||||
bSmoothLines = bSmoothLines_;
|
||||
sWindowTitle = sWindowTitle_;
|
||||
sIconFile = sIconFile_;
|
||||
#ifdef _XBOX
|
||||
@@ -108,7 +108,7 @@ public:
|
||||
int bpp;
|
||||
int rate;
|
||||
bool vsync;
|
||||
bool bAntiAliasing;
|
||||
bool bSmoothLines;
|
||||
bool interlaced;
|
||||
#ifdef _XBOX
|
||||
bool PAL;
|
||||
|
||||
@@ -909,7 +909,7 @@ void RageDisplay_OGL::DrawLineStrip( const RageSpriteVertex v[], int iNumVerts,
|
||||
{
|
||||
ASSERT( iNumVerts >= 2 );
|
||||
|
||||
if( !GetVideoModeParams().bAntiAliasing )
|
||||
if( !GetVideoModeParams().bSmoothLines )
|
||||
{
|
||||
RageDisplay::DrawLineStrip(v, iNumVerts, LineWidth );
|
||||
return;
|
||||
|
||||
@@ -349,7 +349,7 @@ MOVE( WaitForVsync, PREFSMAN->m_bVsync );
|
||||
MOVE( ShowStats, PREFSMAN->m_bShowStats );
|
||||
MOVE( ShowBanners, PREFSMAN->m_bShowBanners );
|
||||
MOVE( KeepTexturesInMemory, PREFSMAN->m_bDelayedTextureDelete );
|
||||
MOVE( AntiAliasing, PREFSMAN->m_bAntiAliasing );
|
||||
MOVE( SmoothLines, PREFSMAN->m_bSmoothLines );
|
||||
|
||||
static void DisplayResolution( int &sel, bool ToSel, const CStringArray &choices )
|
||||
{
|
||||
@@ -476,8 +476,8 @@ static const ConfOption g_ConfOptions[] =
|
||||
ConfOption( "Texture\nResolution", TextureResolution, "256","512","1024","2048" ),
|
||||
ConfOption( "Texture\nColor", TextureColor, "16BIT","32BIT" ),
|
||||
ConfOption( "Movie\nColor", MovieColor, "16BIT","32BIT" ),
|
||||
ConfOption( "Keep Textures\nIn Memory", KeepTexturesInMemory, "NO","YES" ),
|
||||
ConfOption( "AntiAliasing", AntiAliasing, "OFF","YES" ),
|
||||
ConfOption( "Keep Textures\nIn Memory", KeepTexturesInMemory, "NO","OFF" ),
|
||||
ConfOption( "SmoothLines", SmoothLines, "OFF","YES" ),
|
||||
ConfOption( "Refresh\nRate", RefreshRate, "DEFAULT","60","70","72","75","80","85","90","100","120","150" ),
|
||||
ConfOption( "Wait For\nVsync", WaitForVsync, "NO", "YES" ),
|
||||
ConfOption( "Show\nStats", ShowStats, "OFF","ON" ),
|
||||
@@ -506,7 +506,7 @@ int ConfOption::GetEffects() const
|
||||
{ DisplayColor, OPT_APPLY_GRAPHICS },
|
||||
{ TextureResolution, OPT_APPLY_GRAPHICS },
|
||||
{ KeepTexturesInMemory, OPT_APPLY_GRAPHICS },
|
||||
{ AntiAliasing, OPT_APPLY_GRAPHICS },
|
||||
{ SmoothLines, OPT_APPLY_GRAPHICS },
|
||||
{ RefreshRate, OPT_APPLY_GRAPHICS },
|
||||
{ WaitForVsync, OPT_APPLY_GRAPHICS },
|
||||
{ GameSel, OPT_RESET_GAME },
|
||||
|
||||
@@ -142,7 +142,7 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams()
|
||||
PREFSMAN->m_iRefreshRate,
|
||||
PREFSMAN->m_bVsync,
|
||||
PREFSMAN->m_bInterlaced,
|
||||
PREFSMAN->m_bAntiAliasing,
|
||||
PREFSMAN->m_bSmoothLines,
|
||||
THEME->GetMetric("Common","WindowTitle"),
|
||||
THEME->GetPathToG("Common window icon")
|
||||
#ifdef _XBOX
|
||||
@@ -169,7 +169,7 @@ static void StoreActualGraphicOptions( bool initial )
|
||||
PREFSMAN->m_iTextureColorDepth,
|
||||
PREFSMAN->m_iRefreshRate,
|
||||
PREFSMAN->m_bVsync ? "Vsync" : "NoVsync",
|
||||
PREFSMAN->m_bAntiAliasing? "AA" : "NoAA" );
|
||||
PREFSMAN->m_bSmoothLines? "AA" : "NoAA" );
|
||||
if( initial )
|
||||
LOG->Info( "%s", log.c_str() );
|
||||
else
|
||||
@@ -392,7 +392,7 @@ struct VideoCardDefaults
|
||||
int iTextureColor;
|
||||
int iMovieColor;
|
||||
int iTextureSize;
|
||||
bool bAntiAliasing;
|
||||
bool bSmoothLines;
|
||||
} const g_VideoCardDefaults[] =
|
||||
{
|
||||
{
|
||||
@@ -582,7 +582,7 @@ static void CheckVideoDefaultSettings()
|
||||
PREFSMAN->m_iTextureColorDepth = pDefaults->iTextureColor;
|
||||
PREFSMAN->m_iMovieColorDepth = pDefaults->iMovieColor;
|
||||
PREFSMAN->m_iMaxTextureResolution = pDefaults->iTextureSize;
|
||||
PREFSMAN->m_bAntiAliasing = pDefaults->bAntiAliasing;
|
||||
PREFSMAN->m_bSmoothLines = pDefaults->bSmoothLines;
|
||||
|
||||
// Update last seen video card
|
||||
PREFSMAN->m_sLastSeenVideoDriver = GetVideoDriverName();
|
||||
|
||||
Reference in New Issue
Block a user