actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

"aspect ratio" is ambiguous; s/m_fAspectRatio/m_fDisplayAspectRatio/

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-16 22:57:11 +00:00
parent 10b175566b
commit 7b43001220
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ PrefsManager::PrefsManager() :
m_iMovieColorDepth ( Options, "MovieColorDepth", 16 ), m_iMovieColorDepth ( Options, "MovieColorDepth", 16 ),
m_iMaxTextureResolution ( Options, "MaxTextureResolution", 2048 ), m_iMaxTextureResolution ( Options, "MaxTextureResolution", 2048 ),
m_iRefreshRate ( Options, "RefreshRate", REFRESH_DEFAULT ), m_iRefreshRate ( Options, "RefreshRate", REFRESH_DEFAULT ),
m_fAspectRatio ( Options, "AspectRatio", 4/3.0f ), m_fDisplayAspectRatio ( Options, "DisplayAspectRatio", 4/3.0f ),
m_bShowStats ( Options, "ShowStats", m_bShowStats ( Options, "ShowStats",
#ifdef DEBUG #ifdef DEBUG
true true
stepmania/src/PrefsManager.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
Preference<int> m_iMovieColorDepth; Preference<int> m_iMovieColorDepth;
Preference<int> m_iMaxTextureResolution; Preference<int> m_iMaxTextureResolution;
Preference<int> m_iRefreshRate; Preference<int> m_iRefreshRate;
Preference<float> m_fAspectRatio; Preference<float> m_fDisplayAspectRatio;
Preference<bool> m_bShowStats; Preference<bool> m_bShowStats;
Preference<bool> m_bShowBanners; Preference<bool> m_bShowBanners;
stepmania/src/ScreenDimensions.cpp
+4 -4
View File
@@ -23,8 +23,8 @@ ThemeMetric<float> THEME_SCREEN_HEIGHT("Common","ScreenHeight");
float ScreenWidth() float ScreenWidth()
{ {
float fScale = 1; float fScale = 1;
if( PREFSMAN->m_fAspectRatio > ASPECT_4_TO_3 ) if( PREFSMAN->m_fDisplayAspectRatio > ASPECT_4_TO_3 )
fScale = PREFSMAN->m_fAspectRatio / ASPECT_4_TO_3; fScale = PREFSMAN->m_fDisplayAspectRatio / ASPECT_4_TO_3;
ASSERT( fScale >= 1 ); ASSERT( fScale >= 1 );
return THEME_SCREEN_WIDTH * fScale; return THEME_SCREEN_WIDTH * fScale;
} }
@@ -32,8 +32,8 @@ float ScreenWidth()
float ScreenHeight() float ScreenHeight()
{ {
float fScale = 1; float fScale = 1;
if( PREFSMAN->m_fAspectRatio < ASPECT_4_TO_3 ) if( PREFSMAN->m_fDisplayAspectRatio < ASPECT_4_TO_3 )
fScale = ASPECT_4_TO_3 / PREFSMAN->m_fAspectRatio; fScale = ASPECT_4_TO_3 / PREFSMAN->m_fDisplayAspectRatio;
ASSERT( fScale >= 1 ); ASSERT( fScale >= 1 );
return THEME_SCREEN_HEIGHT * fScale; return THEME_SCREEN_HEIGHT * fScale;
} }
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1 -1
View File
@@ -447,7 +447,7 @@ static void RefreshRate( int &sel, bool ToSel, const ConfOption *pConfOption )
static void AspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption ) static void AspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
const float mapping[] = { 3/4.f,1,4/3.0f,16/10.0f,16/9.f, 8/3.f }; const float mapping[] = { 3/4.f,1,4/3.0f,16/10.0f,16/9.f, 8/3.f };
MoveMap( sel, PREFSMAN->m_fAspectRatio.Value(), ToSel, mapping, ARRAYSIZE(mapping) ); MoveMap( sel, PREFSMAN->m_fDisplayAspectRatio.Value(), ToSel, mapping, ARRAYSIZE(mapping) );
} }
/* Sound options */ /* Sound options */
stepmania/src/StepMania.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ static RageDisplay::VideoModeParams GetCurVideoModeParams()
WINDOW_TITLE, WINDOW_TITLE,
THEME->GetPathToG("Common window icon"), THEME->GetPathToG("Common window icon"),
PREFSMAN->m_bPAL, PREFSMAN->m_bPAL,
PREFSMAN->m_fAspectRatio PREFSMAN->m_fDisplayAspectRatio
); );
} }