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

remove auto aspect ratio. We can't have the aspect ratio changing mid-game when the screen resolution changes (toggling fullscreen)

Browse Source
This commit is contained in:
Chris Danford
2006-02-06 20:15:33 +00:00
parent dbafa29a88
commit 3ed40f6559
5 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
+3
View File
@@ -154,6 +154,7 @@ PrefsManager::PrefsManager() :
m_bWindowed ( "Windowed", TRUE_IF_DEBUG ),
m_iDisplayWidth ( "DisplayWidth", 640 ),
m_iDisplayHeight ( "DisplayHeight", 480 ),
m_fDisplayAspectRatio ( "DisplayAspectRatio", 4/3.f ),
m_iDisplayColorDepth ( "DisplayColorDepth", 16 ),
m_iTextureColorDepth ( "TextureColorDepth", 16 ),
m_iMovieColorDepth ( "MovieColorDepth", 16 ),
@@ -430,6 +431,8 @@ void PrefsManager::ReadPrefsFromIni( const IniFile &ini, const RString &sSection
IPreference::ReadAllPrefsFromNode( ini.GetChild(sSection) );
// validate
if( m_fDisplayAspectRatio < 0 )
m_fDisplayAspectRatio.Set( 4/3.f );
m_iSongsPerPlay.Set( clamp(m_iSongsPerPlay.Get(),0,MAX_SONGS_PER_PLAY) );
m_RandomBackgroundMode.Set( (RandomBackgroundMode)clamp((int)m_RandomBackgroundMode.Get(),0,(int)NUM_RandomBackgroundMode-1) );
}
stepmania/src/PrefsManager.h
+1
View File
@@ -43,6 +43,7 @@ public:
Preference<bool> m_bWindowed;
Preference<int> m_iDisplayWidth;
Preference<int> m_iDisplayHeight;
Preference<float> m_fDisplayAspectRatio;
Preference<int> m_iDisplayColorDepth;
Preference<int> m_iTextureColorDepth;
Preference<int> m_iMovieColorDepth;
stepmania/src/ScreenDimensions.cpp
+3 -22
View File
@@ -26,25 +26,6 @@ static ThemeMetric<float> THEME_SCREEN_HEIGHT("Common","ScreenHeight");
*/
#define THEME_NATIVE_ASPECT (THEME_SCREEN_WIDTH/THEME_SCREEN_HEIGHT)
#define ASPECT_AUTO -1
static Preference<float> g_fDisplayAspectRatio( "DisplayAspectRatio", ASPECT_AUTO );
float ScreenDimensions::GetScreenAspectRatio()
{
float fAspect = g_fDisplayAspectRatio;
if( fAspect == ASPECT_AUTO )
{
/* Most PC monitor resolutions have square pixels (PAR 1:1), so the DAR
* is simply width:height. 1280x1024 is an exception; treat it as 4:3,
* not 5:4. */
if( PREFSMAN->m_iDisplayWidth == 1280 && PREFSMAN->m_iDisplayHeight == 1024 )
fAspect = 4.0f/3.0f;
else
fAspect = PREFSMAN->m_iDisplayWidth / (float)PREFSMAN->m_iDisplayHeight;
}
return fAspect;
}
float ScreenDimensions::GetThemeAspectRatio()
{
return THEME_NATIVE_ASPECT;
@@ -52,7 +33,7 @@ float ScreenDimensions::GetThemeAspectRatio()
float ScreenDimensions::GetScreenWidth()
{
float fAspect = GetScreenAspectRatio();
float fAspect = PREFSMAN->m_fDisplayAspectRatio;
float fScale = 1;
if( fAspect > THEME_NATIVE_ASPECT )
fScale = fAspect / THEME_NATIVE_ASPECT;
@@ -62,7 +43,7 @@ float ScreenDimensions::GetScreenWidth()
float ScreenDimensions::GetScreenHeight()
{
float fAspect = GetScreenAspectRatio();
float fAspect = PREFSMAN->m_fDisplayAspectRatio;
float fScale = 1;
if( fAspect < THEME_NATIVE_ASPECT )
fScale = THEME_NATIVE_ASPECT / fAspect;
@@ -86,7 +67,7 @@ void ScreenDimensions::ReloadScreenDimensions()
LUA->SetGlobal( "SCREEN_CENTER_Y", (int) SCREEN_CENTER_Y );
}
LuaFunction_NoArgs( GetScreenAspectRatio, ScreenDimensions::GetScreenAspectRatio() );
LuaFunction_NoArgs( GetScreenAspectRatio, PREFSMAN->m_fDisplayAspectRatio.Get() );
LuaFunction_NoArgs( GetThemeAspectRatio, ScreenDimensions::GetThemeAspectRatio() );
stepmania/src/ScreenDimensions.h
-1
View File
@@ -5,7 +5,6 @@
namespace ScreenDimensions
{
float GetScreenAspectRatio();
float GetThemeAspectRatio();
float GetScreenWidth();
float GetScreenHeight();
stepmania/src/ScreenOptionsMasterPrefs.cpp
+2 -2
View File
@@ -506,7 +506,7 @@ static void RefreshRate( int &sel, bool ToSel, const ConfOption *pConfOption )
static void DisplayAspectRatio( int &sel, bool ToSel, const ConfOption *pConfOption )
{
const float mapping[] = { -1,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, pConfOption, ToSel, mapping, ARRAYSIZE(mapping) );
}
@@ -614,7 +614,7 @@ static void InitializeConfOptions()
g_ConfOptions.back().m_iEffects = OPT_APPLY_GRAPHICS;
ADD( ConfOption( "DisplayResolution", DisplayResolutionM, DisplayResolutionChoices ) );
g_ConfOptions.back().m_iEffects = OPT_APPLY_GRAPHICS | OPT_APPLY_ASPECT_RATIO;
ADD( ConfOption( "DisplayAspectRatio", DisplayAspectRatio, "Auto","|3:4","|1:1","|4:3","|16:10","|16:9","|8:3" ) );
ADD( ConfOption( "DisplayAspectRatio", DisplayAspectRatio, "|3:4","|1:1","|4:3","|16:10","|16:9","|8:3" ) );
g_ConfOptions.back().m_iEffects = OPT_APPLY_ASPECT_RATIO;
ADD( ConfOption( "DisplayColorDepth", DisplayColorDepth, "16bit","32bit" ) );
g_ConfOptions.back().m_iEffects = OPT_APPLY_GRAPHICS;