From 4ca799bc96d13210b2410914f3c44f26cc4a8468 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 20 Dec 2003 21:29:55 +0000 Subject: [PATCH] rename "AntiAliasing" to "SmoothLines" --- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/PrefsManager.cpp | 6 +++--- stepmania/src/PrefsManager.h | 2 +- stepmania/src/RageDisplay.cpp | 2 +- stepmania/src/RageDisplay.h | 6 +++--- stepmania/src/RageDisplay_OGL.cpp | 2 +- stepmania/src/ScreenOptionsMasterPrefs.cpp | 8 ++++---- stepmania/src/StepMania.cpp | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index fa3130e264..a6b3daf244 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -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 diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 51f4c75be4..b180917baa 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -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 ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 6a4e2e0e01..2797ff8ec0 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -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; diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index 74b1cae7d5..1241c62072 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -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 ) diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index 7905cc2972..66d298d70e 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -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; diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 573a3e8fb0..d0e65ffa8c 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -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; diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 7a018a05a9..28b8ea1c16 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -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 }, diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index a4febbf164..6eb45a3655 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -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();