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

CENTER_* -> SCREEN_CENTER

Browse Source
This commit is contained in:
Chris Danford
2004-11-05 06:35:10 +00:00
parent 3d084e2a2c
commit 72bd480883
27 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimationLayer.cpp
+7 -7
View File
@@ -221,7 +221,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( CString sPath )
Sprite* pSprite = new Sprite; Sprite* pSprite = new Sprite;
m_SubActors.push_back( pSprite ); m_SubActors.push_back( pSprite );
pSprite->Load( sPath ); pSprite->Load( sPath );
pSprite->SetXY( CENTER_X, CENTER_Y ); pSprite->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
} }
break; break;
case EFFECT_STRETCH_STILL: case EFFECT_STRETCH_STILL:
@@ -572,7 +572,7 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
if( Stretch ) if( Stretch )
pActor->StretchTo( FullScreenRectF ); pActor->StretchTo( FullScreenRectF );
else else
pActor->SetXY( CENTER_X, CENTER_Y ); pActor->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
} }
} }
break; break;
@@ -691,8 +691,8 @@ void BGAnimationLayer::Update( float fDeltaTime )
float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM); float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM);
fRadius *= fRadius; fRadius *= fRadius;
fRadius *= 200; fRadius *= 200;
m_SubActors[i].SetX( CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius ); m_SubActors[i].SetX( SCREEN_CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
m_SubActors[i].SetY( CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius ); m_SubActors[i].SetY( SCREEN_CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
} }
break; break;
case EFFECT_PARTICLES_SPIRAL_IN: case EFFECT_PARTICLES_SPIRAL_IN:
@@ -707,8 +707,8 @@ void BGAnimationLayer::Update( float fDeltaTime )
float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM); float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM);
fRadius *= fRadius; fRadius *= fRadius;
fRadius *= 200; fRadius *= 200;
m_SubActors[i].SetX( CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius ); m_SubActors[i].SetX( SCREEN_CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
m_SubActors[i].SetY( CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius ); m_SubActors[i].SetY( SCREEN_CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
} }
break; break;
*/ */
@@ -947,7 +947,7 @@ void BGAnimationLayer::DrawPrimitives()
if( m_fFOV != -1 ) if( m_fFOV != -1 )
{ {
DISPLAY->CameraPushMatrix(); DISPLAY->CameraPushMatrix();
DISPLAY->LoadMenuPerspective( m_fFOV, CENTER_X, CENTER_Y ); DISPLAY->LoadMenuPerspective( m_fFOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
} }
if( m_bLighting ) if( m_bLighting )
stepmania/src/BeginnerHelper.cpp
+2 -2
View File
@@ -140,9 +140,9 @@ bool BeginnerHelper::Initialize( int iDancePadType )
{ {
m_sBackground.Load( THEME->GetPathToG("BeginnerHelper background") ); m_sBackground.Load( THEME->GetPathToG("BeginnerHelper background") );
this->AddChild(&m_sBackground); this->AddChild(&m_sBackground);
m_sBackground.SetXY(CENTER_X, CENTER_Y); m_sBackground.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
m_sFlash.Load(THEME->GetPathToG("BeginnerHelper flash")); m_sFlash.Load(THEME->GetPathToG("BeginnerHelper flash"));
m_sFlash.SetXY(CENTER_X, CENTER_Y); m_sFlash.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
m_sFlash.SetDiffuseAlpha(0); m_sFlash.SetDiffuseAlpha(0);
} }
stepmania/src/LuaHelpers.cpp
+2 -2
View File
@@ -178,9 +178,9 @@ void Lua::UpdateGlobals()
lua_setglobal( L, "SCREEN_TOP" ); lua_setglobal( L, "SCREEN_TOP" );
lua_pushnumber( L, SCREEN_BOTTOM ); lua_pushnumber( L, SCREEN_BOTTOM );
lua_setglobal( L, "SCREEN_BOTTOM" ); lua_setglobal( L, "SCREEN_BOTTOM" );
lua_pushnumber( L, CENTER_X ); lua_pushnumber( L, SCREEN_CENTER_X );
lua_setglobal( L, "SCREEN_CENTER_X" ); lua_setglobal( L, "SCREEN_CENTER_X" );
lua_pushnumber( L, CENTER_Y ); lua_pushnumber( L, SCREEN_CENTER_Y );
lua_setglobal( L, "SCREEN_CENTER_Y" ); lua_setglobal( L, "SCREEN_CENTER_Y" );
} }
stepmania/src/MusicWheel.cpp
+2 -2
View File
@@ -828,8 +828,8 @@ void MusicWheel::DrawPrimitives()
// construct view and project matrix // construct view and project matrix
// RageVector3 Up( 0.0f, 1.0f, 0.0f ); // RageVector3 Up( 0.0f, 1.0f, 0.0f );
// RageVector3 Eye( CENTER_X, CENTER_Y, 550 ); // RageVector3 Eye( SCREEN_CENTER_X, SCREEN_CENTER_Y, 550 );
// RageVector3 At( CENTER_X, CENTER_Y, 0 ); // RageVector3 At( SCREEN_CENTER_X, SCREEN_CENTER_Y, 0 );
// DISPLAY->LookAt(Eye, At, Up); // DISPLAY->LookAt(Eye, At, Up);
} }
stepmania/src/NoteFieldPositioning.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void NoteFieldMode::BeginDrawTrack(int tn)
* for a transformation. However, this is a big waste of matrix * for a transformation. However, this is a big waste of matrix
* stack space, as each of these will push. Profile this. XXX */ * stack space, as each of these will push. Profile this. XXX */
if(m_fFov) if(m_fFov)
DISPLAY->LoadMenuPerspective(m_fFov, CENTER_X, CENTER_Y); DISPLAY->LoadMenuPerspective(m_fFov, SCREEN_CENTER_X, SCREEN_CENTER_Y);
if(tn != -1) if(tn != -1)
{ {
stepmania/src/Player.cpp
+1 -1
View File
@@ -540,7 +540,7 @@ void PlayerMinus::DrawPrimitives()
float fCenterY = (GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2; float fCenterY = (GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2;
// float fHeight = GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD; // float fHeight = GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD;
DISPLAY->LoadMenuPerspective( 45, SCALE(fSkew,0.f,1.f,this->GetX(),CENTER_X), fCenterY ); DISPLAY->LoadMenuPerspective( 45, SCALE(fSkew,0.f,1.f,this->GetX(),SCREEN_CENTER_X), fCenterY );
float fOriginalY = m_pNoteField->GetY(); float fOriginalY = m_pNoteField->GetY();
stepmania/src/RageDisplay.cpp
+5 -5
View File
@@ -188,7 +188,7 @@ void RageDisplay::SetDefaultRenderStates()
SetAlphaTest( true ); SetAlphaTest( true );
SetBlendMode( BLEND_NORMAL ); SetBlendMode( BLEND_NORMAL );
SetTextureFiltering( true ); SetTextureFiltering( true );
LoadMenuPerspective(0, CENTER_X, CENTER_Y); // 0 FOV = ortho LoadMenuPerspective(0, SCREEN_CENTER_X, SCREEN_CENTER_Y); // 0 FOV = ortho
ChangeCentering(0,0,0,0); ChangeCentering(0,0,0,0);
} }
@@ -454,8 +454,8 @@ void RageDisplay::LoadMenuPerspective( float fovDegrees, float fVanishPointX, fl
fVanishPointX = SCALE( fVanishPointX, SCREEN_LEFT, SCREEN_RIGHT, SCREEN_RIGHT, SCREEN_LEFT ); fVanishPointX = SCALE( fVanishPointX, SCREEN_LEFT, SCREEN_RIGHT, SCREEN_RIGHT, SCREEN_LEFT );
fVanishPointY = SCALE( fVanishPointY, SCREEN_TOP, SCREEN_BOTTOM, SCREEN_BOTTOM, SCREEN_TOP ); fVanishPointY = SCALE( fVanishPointY, SCREEN_TOP, SCREEN_BOTTOM, SCREEN_BOTTOM, SCREEN_TOP );
fVanishPointX -= CENTER_X; fVanishPointX -= SCREEN_CENTER_X;
fVanishPointY -= CENTER_Y; fVanishPointY -= SCREEN_CENTER_Y;
/* It's the caller's responsibility to push first. */ /* It's the caller's responsibility to push first. */
@@ -470,8 +470,8 @@ void RageDisplay::LoadMenuPerspective( float fovDegrees, float fVanishPointX, fl
g_ViewStack.LoadMatrix( g_ViewStack.LoadMatrix(
RageLookAt( RageLookAt(
-fVanishPointX+CENTER_X, -fVanishPointY+CENTER_Y, fDistCameraFromImage, -fVanishPointX+SCREEN_CENTER_X, -fVanishPointY+SCREEN_CENTER_Y, fDistCameraFromImage,
-fVanishPointX+CENTER_X, -fVanishPointY+CENTER_Y, 0, -fVanishPointX+SCREEN_CENTER_X, -fVanishPointY+SCREEN_CENTER_Y, 0,
0.0f, 1.0f, 0.0f) ); 0.0f, 1.0f, 0.0f) );
} }
} }
stepmania/src/ScreenBookkeeping.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme
m_textTitle.LoadFromFont( THEME->GetPathToF("Common title") ); m_textTitle.LoadFromFont( THEME->GetPathToF("Common title") );
m_textTitle.SetText( "header" ); m_textTitle.SetText( "header" );
m_textTitle.SetXY( CENTER_X, 60 ); m_textTitle.SetXY( SCREEN_CENTER_X, 60 );
m_textTitle.SetDiffuse( RageColor(1,1,1,1) ); m_textTitle.SetDiffuse( RageColor(1,1,1,1) );
m_textTitle.SetZoom( 0.8f ); m_textTitle.SetZoom( 0.8f );
this->AddChild( &m_textTitle ); this->AddChild( &m_textTitle );
@@ -29,7 +29,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme
for( int i=0; i<NUM_BOOKKEEPING_COLS; i++ ) for( int i=0; i<NUM_BOOKKEEPING_COLS; i++ )
{ {
float fX = SCALE( i, 0.f, NUM_BOOKKEEPING_COLS-1, SCREEN_LEFT+50, SCREEN_RIGHT-160 ); float fX = SCALE( i, 0.f, NUM_BOOKKEEPING_COLS-1, SCREEN_LEFT+50, SCREEN_RIGHT-160 );
float fY = CENTER_Y+16; float fY = SCREEN_CENTER_Y+16;
m_textCols[i].LoadFromFont( THEME->GetPathToF("Common normal") ); m_textCols[i].LoadFromFont( THEME->GetPathToF("Common normal") );
m_textCols[i].SetText( ssprintf("%d",i) ); m_textCols[i].SetText( ssprintf("%d",i) );
m_textCols[i].SetXY( fX, fY ); m_textCols[i].SetXY( fX, fY );
stepmania/src/ScreenCenterImage.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ ScreenCenterImage::ScreenCenterImage( CString sClassName ) : ScreenWithMenuEleme
m_textInstructions.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textInstructions.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textInstructions.SetText( "" ); m_textInstructions.SetText( "" );
m_textInstructions.SetXY( CENTER_X, CENTER_Y ); m_textInstructions.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_textInstructions.SetDiffuse( RageColor(0,1,0,0) ); m_textInstructions.SetDiffuse( RageColor(0,1,0,0) );
m_textInstructions.SetZoom( 0.8f ); m_textInstructions.SetZoom( 0.8f );
this->AddChild( &m_textInstructions ); this->AddChild( &m_textInstructions );
stepmania/src/ScreenDimensions.h
+2 -2
View File
@@ -13,8 +13,8 @@ extern ThemeMetric<float> SCREEN_HEIGHT;
#define SCREEN_TOP (0) #define SCREEN_TOP (0)
#define SCREEN_BOTTOM (SCREEN_HEIGHT) #define SCREEN_BOTTOM (SCREEN_HEIGHT)
#define CENTER_X (SCREEN_LEFT + (SCREEN_RIGHT - SCREEN_LEFT)/2.0f) #define SCREEN_CENTER_X (SCREEN_LEFT + (SCREEN_RIGHT - SCREEN_LEFT)/2.0f)
#define CENTER_Y (SCREEN_TOP + (SCREEN_BOTTOM - SCREEN_TOP)/2.0f) #define SCREEN_CENTER_Y (SCREEN_TOP + (SCREEN_BOTTOM - SCREEN_TOP)/2.0f)
#define SCREEN_NEAR (-1000) #define SCREEN_NEAR (-1000)
#define SCREEN_FAR (1000) #define SCREEN_FAR (1000)
stepmania/src/ScreenEdit.cpp
+10 -10
View File
@@ -34,40 +34,40 @@ const float RECORD_HOLD_SECONDS = 0.3f;
// //
#define DEBUG_X (SCREEN_LEFT + 10) #define DEBUG_X (SCREEN_LEFT + 10)
#define DEBUG_Y (CENTER_Y-100) #define DEBUG_Y (SCREEN_CENTER_Y-100)
#define SHORTCUTS_X (CENTER_X - 150) #define SHORTCUTS_X (SCREEN_CENTER_X - 150)
#define SHORTCUTS_Y (CENTER_Y) #define SHORTCUTS_Y (SCREEN_CENTER_Y)
#define HELP_X (SCREEN_LEFT) #define HELP_X (SCREEN_LEFT)
#define HELP_Y (CENTER_Y) #define HELP_Y (SCREEN_CENTER_Y)
#define HELP_TEXT_X (SCREEN_LEFT + 4) #define HELP_TEXT_X (SCREEN_LEFT + 4)
#define HELP_TEXT_Y (40) #define HELP_TEXT_Y (40)
#define INFO_X (SCREEN_RIGHT) #define INFO_X (SCREEN_RIGHT)
#define INFO_Y (CENTER_Y) #define INFO_Y (SCREEN_CENTER_Y)
#define INFO_TEXT_X (SCREEN_RIGHT - 114) #define INFO_TEXT_X (SCREEN_RIGHT - 114)
#define INFO_TEXT_Y (40) #define INFO_TEXT_Y (40)
#define MENU_WIDTH (110) #define MENU_WIDTH (110)
#define EDIT_X (CENTER_X) #define EDIT_X (SCREEN_CENTER_X)
#define EDIT_GRAY_Y_STANDARD (SCREEN_TOP+60) #define EDIT_GRAY_Y_STANDARD (SCREEN_TOP+60)
#define EDIT_GRAY_Y_REVERSE (SCREEN_BOTTOM-60) #define EDIT_GRAY_Y_REVERSE (SCREEN_BOTTOM-60)
#define PLAYER_X (CENTER_X) #define PLAYER_X (SCREEN_CENTER_X)
#define PLAYER_Y (CENTER_Y) #define PLAYER_Y (SCREEN_CENTER_Y)
#define PLAYER_HEIGHT (360) #define PLAYER_HEIGHT (360)
#define PLAYER_Y_STANDARD (PLAYER_Y-PLAYER_HEIGHT/2) #define PLAYER_Y_STANDARD (PLAYER_Y-PLAYER_HEIGHT/2)
#define PLAYER_Y_REVERSE (PLAYER_Y+PLAYER_HEIGHT/2) #define PLAYER_Y_REVERSE (PLAYER_Y+PLAYER_HEIGHT/2)
#define ACTION_MENU_ITEM_X (CENTER_X-200) #define ACTION_MENU_ITEM_X (SCREEN_CENTER_X-200)
#define ACTION_MENU_ITEM_START_Y (SCREEN_TOP + 24) #define ACTION_MENU_ITEM_START_Y (SCREEN_TOP + 24)
#define ACTION_MENU_ITEM_SPACING_Y (18) #define ACTION_MENU_ITEM_SPACING_Y (18)
#define NAMING_MENU_ITEM_X (CENTER_X-200) #define NAMING_MENU_ITEM_X (SCREEN_CENTER_X-200)
#define NAMING_MENU_ITEM_START_Y (SCREEN_TOP + 24) #define NAMING_MENU_ITEM_START_Y (SCREEN_TOP + 24)
#define NAMING_MENU_ITEM_SPACING_Y (18) #define NAMING_MENU_ITEM_SPACING_Y (18)
stepmania/src/ScreenEz2SelectMusic.cpp
+3 -3
View File
@@ -113,7 +113,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem
#ifdef DEBUG #ifdef DEBUG
m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") ); m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") );
m_debugtext.SetXY( CENTER_X, CENTER_Y ); m_debugtext.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
this->AddChild(&m_debugtext); this->AddChild(&m_debugtext);
#endif #endif
@@ -199,14 +199,14 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem
m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenEz2SelectMusic options message") ); m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenEz2SelectMusic options message") );
m_sprOptionsMessage.StopAnimating(); m_sprOptionsMessage.StopAnimating();
m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y ); m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_sprOptionsMessage.SetZoom( 1 ); m_sprOptionsMessage.SetZoom( 1 );
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
this->AddChild( &m_sprOptionsMessage ); this->AddChild( &m_sprOptionsMessage );
if(USE_MODE_SWITCHER == 1) if(USE_MODE_SWITCHER == 1)
{ {
m_ModeSwitcher.SetXY(CENTER_X,CENTER_Y); m_ModeSwitcher.SetXY(SCREEN_CENTER_X,SCREEN_CENTER_Y);
this->AddChild( &m_ModeSwitcher ); this->AddChild( &m_ModeSwitcher );
} }
stepmania/src/ScreenGameplay.cpp
+3 -3
View File
@@ -1059,8 +1059,8 @@ void ScreenGameplay::LoadNextSong()
{ {
m_Background.Unload(); // BeginnerHelper has its own BG control. m_Background.Unload(); // BeginnerHelper has its own BG control.
m_Background.StopAnimating(); m_Background.StopAnimating();
m_BeginnerHelper.SetX( CENTER_X ); m_BeginnerHelper.SetX( SCREEN_CENTER_X );
m_BeginnerHelper.SetY( CENTER_Y ); m_BeginnerHelper.SetY( SCREEN_CENTER_Y );
} }
else else
{ {
@@ -2485,7 +2485,7 @@ void ScreenGameplay::ShowOniGameOver( PlayerNumber pn )
{ {
m_sprOniGameOver[pn].SetDiffuse( RageColor(1,1,1,1) ); m_sprOniGameOver[pn].SetDiffuse( RageColor(1,1,1,1) );
m_sprOniGameOver[pn].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END ); m_sprOniGameOver[pn].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
m_sprOniGameOver[pn].SetY( CENTER_Y ); m_sprOniGameOver[pn].SetY( SCREEN_CENTER_Y );
m_sprOniGameOver[pn].SetEffectBob( 4, RageVector3(0,6,0) ); m_sprOniGameOver[pn].SetEffectBob( 4, RageVector3(0,6,0) );
} }
stepmania/src/ScreenInstructions.cpp
+2 -2
View File
@@ -40,13 +40,13 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements
RageException::Throw( "The PlayMode has not been set. A theme must set the PlayMode before showing ScreenInstructions." ); RageException::Throw( "The PlayMode has not been set. A theme must set the PlayMode before showing ScreenInstructions." );
m_sprHowToPlay.Load( THEME->GetPathG(m_sName,PlayModeToString(GAMESTATE->m_PlayMode)) ); m_sprHowToPlay.Load( THEME->GetPathG(m_sName,PlayModeToString(GAMESTATE->m_PlayMode)) );
m_sprHowToPlay.SetXY( CENTER_X, CENTER_Y ); m_sprHowToPlay.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
this->AddChild( &m_sprHowToPlay ); this->AddChild( &m_sprHowToPlay );
m_sprHowToPlay.SetX( SCREEN_LEFT-SCREEN_WIDTH ); m_sprHowToPlay.SetX( SCREEN_LEFT-SCREEN_WIDTH );
m_sprHowToPlay.BeginTweening( 0.4f ); // sleep m_sprHowToPlay.BeginTweening( 0.4f ); // sleep
m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE ); m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE );
m_sprHowToPlay.SetX( CENTER_X ); m_sprHowToPlay.SetX( SCREEN_CENTER_X );
this->SortByDrawOrder(); this->SortByDrawOrder();
stepmania/src/ScreenMapControllers.cpp
+3 -3
View File
@@ -51,14 +51,14 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
CString sSecondary = GAMESTATE->GetCurrentGame()->m_szSecondaryFunction[b]; CString sSecondary = GAMESTATE->GetCurrentGame()->m_szSecondaryFunction[b];
m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") ); m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") );
m_textName[b].SetXY( CENTER_X, -6 ); m_textName[b].SetXY( SCREEN_CENTER_X, -6 );
m_textName[b].SetText( sName ); m_textName[b].SetText( sName );
m_textName[b].SetZoom( 0.7f ); m_textName[b].SetZoom( 0.7f );
m_textName[b].SetShadowLength( 2 ); m_textName[b].SetShadowLength( 2 );
m_Line[b].AddChild( &m_textName[b] ); m_Line[b].AddChild( &m_textName[b] );
m_textName2[b].LoadFromFont( THEME->GetPathToF("Common title") ); m_textName2[b].LoadFromFont( THEME->GetPathToF("Common title") );
m_textName2[b].SetXY( CENTER_X, +6 ); m_textName2[b].SetXY( SCREEN_CENTER_X, +6 );
m_textName2[b].SetText( sSecondary ); m_textName2[b].SetText( sSecondary );
m_textName2[b].SetZoom( 0.5f ); m_textName2[b].SetZoom( 0.5f );
m_textName2[b].SetShadowLength( 2 ); m_textName2[b].SetShadowLength( 2 );
@@ -83,7 +83,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
m_textError.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textError.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textError.SetText( "" ); m_textError.SetText( "" );
m_textError.SetXY( CENTER_X, CENTER_Y ); m_textError.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_textError.SetDiffuse( RageColor(0,1,0,0) ); m_textError.SetDiffuse( RageColor(0,1,0,0) );
m_textError.SetZoom( 0.8f ); m_textError.SetZoom( 0.8f );
this->AddChild( &m_textError ); this->AddChild( &m_textError );
stepmania/src/ScreenMiniMenu.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
m_textTitle.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textTitle.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textTitle.SetText( m_Def.title ); m_textTitle.SetText( m_Def.title );
m_textTitle.SetXY( CENTER_X, CENTER_Y - fHeightOfAll/2 - 30 ); m_textTitle.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y - fHeightOfAll/2 - 30 );
m_textTitle.SetZoom( 0.8f ); m_textTitle.SetZoom( 0.8f );
this->AddChild( &m_textTitle ); this->AddChild( &m_textTitle );
@@ -62,9 +62,9 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
float fY; float fY;
if( m_Def.rows.size() > 1 ) if( m_Def.rows.size() > 1 )
fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, CENTER_Y-fHeightOfAll/2, CENTER_Y+fHeightOfAll/2 ); fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, SCREEN_CENTER_Y-fHeightOfAll/2, SCREEN_CENTER_Y+fHeightOfAll/2 );
else else
fY = CENTER_Y; fY = SCREEN_CENTER_Y;
m_textLabel[i].LoadFromFont( THEME->GetPathToF("Common normal") ); m_textLabel[i].LoadFromFont( THEME->GetPathToF("Common normal") );
m_textLabel[i].SetText( line.name ); m_textLabel[i].SetText( line.name );
stepmania/src/ScreenMusicScroll.cpp
+2 -2
View File
@@ -52,10 +52,10 @@ ScreenMusicScroll::ScreenMusicScroll( CString sClassName ) : ScreenAttract( sCla
for( unsigned i=0; i<m_textLines.size(); i++ ) for( unsigned i=0; i<m_textLines.size(); i++ )
{ {
m_textLines[i]->SetXY( CENTER_X, SCREEN_BOTTOM + 40 ); m_textLines[i]->SetXY( SCREEN_CENTER_X, SCREEN_BOTTOM + 40 );
m_textLines[i]->BeginTweening( SCROLL_DELAY * i ); m_textLines[i]->BeginTweening( SCROLL_DELAY * i );
m_textLines[i]->BeginTweening( 2.0f*SCROLL_SPEED ); m_textLines[i]->BeginTweening( 2.0f*SCROLL_SPEED );
m_textLines[i]->SetXY( CENTER_X, SCREEN_TOP - 40 ); m_textLines[i]->SetXY( SCREEN_CENTER_X, SCREEN_TOP - 40 );
} }
this->MoveToTail( &m_In ); // put it in the back so it covers up the stuff we just added this->MoveToTail( &m_In ); // put it in the back so it covers up the stuff we just added
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -479,7 +479,7 @@ void ScreenNameEntryTraditional::Update( float fDelta )
void ScreenNameEntryTraditional::DrawPrimitives() void ScreenNameEntryTraditional::DrawPrimitives()
{ {
DISPLAY->CameraPushMatrix(); DISPLAY->CameraPushMatrix();
DISPLAY->LoadMenuPerspective( FOV, CENTER_X, CENTER_Y ); DISPLAY->LoadMenuPerspective( FOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
Screen::DrawPrimitives(); Screen::DrawPrimitives();
stepmania/src/ScreenOptions.cpp
+3 -3
View File
@@ -210,7 +210,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
m_sprLineHighlight[p].Load( THEME->GetPathToG("ScreenOptions line highlight") ); m_sprLineHighlight[p].Load( THEME->GetPathToG("ScreenOptions line highlight") );
m_sprLineHighlight[p].SetName( "LineHighlight" ); m_sprLineHighlight[p].SetName( "LineHighlight" );
m_sprLineHighlight[p].SetX( CENTER_X ); m_sprLineHighlight[p].SetX( SCREEN_CENTER_X );
m_framePage.AddChild( &m_sprLineHighlight[p] ); m_framePage.AddChild( &m_sprLineHighlight[p] );
UtilOnCommand( m_sprLineHighlight[p], "ScreenOptions" ); UtilOnCommand( m_sprLineHighlight[p], "ScreenOptions" );
} }
@@ -367,7 +367,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
bt->SetText( THEME->GetMetric("OptionNames","Exit") ); bt->SetText( THEME->GetMetric("OptionNames","Exit") );
bt->SetZoom( ITEMS_ZOOM ); bt->SetZoom( ITEMS_ZOOM );
bt->SetShadowLength( 0 ); bt->SetShadowLength( 0 );
bt->SetX( CENTER_X ); bt->SetX( SCREEN_CENTER_X );
m_framePage.AddChild( bt ); m_framePage.AddChild( bt );
@@ -441,7 +441,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
} }
m_sprFrame.Load( THEME->GetPathToG( "ScreenOptions frame") ); m_sprFrame.Load( THEME->GetPathToG( "ScreenOptions frame") );
m_sprFrame->SetXY( CENTER_X, CENTER_Y ); m_sprFrame->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_framePage.AddChild( m_sprFrame ); m_framePage.AddChild( m_sprFrame );
// poke once at all the explanation metrics so that we catch missing ones early // poke once at all the explanation metrics so that we catch missing ones early
stepmania/src/ScreenPlayerOptions.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") ); m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") );
m_sprOptionsMessage.StopAnimating(); m_sprOptionsMessage.StopAnimating();
m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y ); m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_sprOptionsMessage.SetZoom( 1 ); m_sprOptionsMessage.SetZoom( 1 );
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
//this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions //this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions
stepmania/src/ScreenPrompt.cpp
+4 -4
View File
@@ -8,11 +8,11 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#define QUESTION_X (CENTER_X) #define QUESTION_X (SCREEN_CENTER_X)
#define QUESTION_Y (CENTER_Y - 60) #define QUESTION_Y (SCREEN_CENTER_Y - 60)
#define PROMPT_X (CENTER_X) #define PROMPT_X (SCREEN_CENTER_X)
#define PROMPT_Y (CENTER_Y + 120) #define PROMPT_Y (SCREEN_CENTER_Y + 120)
bool ScreenPrompt::s_bLastAnswer = false; bool ScreenPrompt::s_bLastAnswer = false;
stepmania/src/ScreenRanking.cpp
+2 -2
View File
@@ -212,7 +212,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
m_ListScoreRowItems.SetName( "ListScoreRowItems" ); m_ListScoreRowItems.SetName( "ListScoreRowItems" );
this->AddChild( &m_ListScoreRowItems ); this->AddChild( &m_ListScoreRowItems );
m_ListScoreRowItems.SetXY( CENTER_X, CENTER_Y ); m_ListScoreRowItems.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
} }
{ {
@@ -260,7 +260,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
m_ListCourseRowItems.SetName( "ListCourseRowItems" ); m_ListCourseRowItems.SetName( "ListCourseRowItems" );
this->AddChild( &m_ListCourseRowItems ); this->AddChild( &m_ListCourseRowItems );
m_ListCourseRowItems.SetXY( CENTER_X, CENTER_Y ); m_ListCourseRowItems.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
} }
// calculate which StepsTypes to show // calculate which StepsTypes to show
stepmania/src/ScreenReloadSongs.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ ScreenReloadSongs::ScreenReloadSongs( CString sClassName ): Screen(sClassName)
m_iUpdates = 0; m_iUpdates = 0;
m_Loading.LoadFromFont( THEME->GetPathF("Common", "normal") ); m_Loading.LoadFromFont( THEME->GetPathF("Common", "normal") );
m_Loading.SetXY( CENTER_X, CENTER_Y ); m_Loading.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
this->AddChild( &m_Loading ); this->AddChild( &m_Loading );
m_LoadingWindow = new ScreenReloadSongsLoadingWindow( m_Loading ); m_LoadingWindow = new ScreenReloadSongsLoadingWindow( m_Loading );
stepmania/src/ScreenTestFonts.cpp
+4 -4
View File
@@ -27,22 +27,22 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName ) ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName )
{ {
Hline.SetXY(CENTER_X, CENTER_Y); Hline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
Hline.SetZoomX(LineWidth); Hline.SetZoomX(LineWidth);
Hline.SetDiffuse( RageColor(1, 1, 1, 1) ); Hline.SetDiffuse( RageColor(1, 1, 1, 1) );
this->AddChild(&Hline); this->AddChild(&Hline);
Vline.SetXY(CENTER_X, CENTER_Y); Vline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
Vline.SetZoomY(LineHeight); Vline.SetZoomY(LineHeight);
Vline.SetDiffuse( RageColor(0, 1, 0, .8f) ); Vline.SetDiffuse( RageColor(0, 1, 0, .8f) );
this->AddChild(&Vline); this->AddChild(&Vline);
font.SetXY( CENTER_X, CENTER_Y+100 ); font.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+100 );
font.LoadFromFont( "Themes/default/Fonts/Common Normal" ); font.LoadFromFont( "Themes/default/Fonts/Common Normal" );
font.SetZoom(.5); font.SetZoom(.5);
this->AddChild(&font); this->AddChild(&font);
txt.SetXY( CENTER_X, CENTER_Y ); txt.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
SetFont( "Themes/default/Fonts/Common Normal" ); SetFont( "Themes/default/Fonts/Common Normal" );
SetText( "Foo" ); SetText( "Foo" );
} }
stepmania/src/ScreenTestInput.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements(
m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textInputs.SetText( "" ); m_textInputs.SetText( "" );
m_textInputs.SetXY( CENTER_X, CENTER_Y ); m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_textInputs.SetDiffuse( RageColor(1,1,1,1) ); m_textInputs.SetDiffuse( RageColor(1,1,1,1) );
m_textInputs.SetZoom( 0.8f ); m_textInputs.SetZoom( 0.8f );
this->AddChild( &m_textInputs ); this->AddChild( &m_textInputs );
stepmania/src/ScreenTestLights.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ ScreenTestLights::ScreenTestLights( CString sClassName ) : ScreenWithMenuElement
m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textInputs.SetText( "" ); m_textInputs.SetText( "" );
m_textInputs.SetXY( CENTER_X, CENTER_Y ); m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_textInputs.SetDiffuse( RageColor(1,1,1,1) ); m_textInputs.SetDiffuse( RageColor(1,1,1,1) );
m_textInputs.SetZoom( 0.8f ); m_textInputs.SetZoom( 0.8f );
this->AddChild( &m_textInputs ); this->AddChild( &m_textInputs );
stepmania/src/ScreenTextEntry.cpp
+4 -4
View File
@@ -14,11 +14,11 @@
#include "archutils/Xbox/VirtualKeyboard.h" #include "archutils/Xbox/VirtualKeyboard.h"
#endif #endif
#define QUESTION_X (CENTER_X) #define QUESTION_X (SCREEN_CENTER_X)
#define QUESTION_Y (CENTER_Y - 60) #define QUESTION_Y (SCREEN_CENTER_Y - 60)
#define ANSWER_X (CENTER_X) #define ANSWER_X (SCREEN_CENTER_X)
#define ANSWER_Y (CENTER_Y + 120) #define ANSWER_Y (SCREEN_CENTER_Y + 120)
#define ANSWER_WIDTH (440) #define ANSWER_WIDTH (440)
#define ANSWER_HEIGHT (30) #define ANSWER_HEIGHT (30)