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

prefer AutoActor over Sprite

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-05 22:30:54 +00:00
parent c411e8a4ac
commit a3c0817d81
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DualScrollBar.cpp
+17 -17
View File
@@ -13,23 +13,23 @@ void DualScrollBar::Load( const CString &sType )
{ {
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
m_sprScrollThumbUnderHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) );
m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(sType,ssprintf("thumb p%i",pn+1)) ); m_sprScrollThumbUnderHalf[pn].Load( THEME->GetPathG(sType,ssprintf("thumb p%i",pn+1)) );
this->AddChild( &m_sprScrollThumbUnderHalf[pn] ); m_sprScrollThumbUnderHalf[pn]->SetName( ssprintf("ThumbP%i", pn+1) );
this->AddChild( m_sprScrollThumbUnderHalf[pn] );
} }
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
m_sprScrollThumbOverHalf[pn].SetName( ssprintf("ThumbP%i", pn+1) );
m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathG(sType, ssprintf("thumb p%i",pn+1)) ); m_sprScrollThumbOverHalf[pn].Load( THEME->GetPathG(sType, ssprintf("thumb p%i",pn+1)) );
this->AddChild( &m_sprScrollThumbOverHalf[pn] ); m_sprScrollThumbOverHalf[pn]->SetName( ssprintf("ThumbP%i", pn+1) );
this->AddChild( m_sprScrollThumbOverHalf[pn] );
} }
m_sprScrollThumbUnderHalf[0].SetCropLeft( .5f ); m_sprScrollThumbUnderHalf[0]->SetCropLeft( .5f );
m_sprScrollThumbUnderHalf[1].SetCropRight( .5f ); m_sprScrollThumbUnderHalf[1]->SetCropRight( .5f );
m_sprScrollThumbOverHalf[0].SetCropRight( .5f ); m_sprScrollThumbOverHalf[0]->SetCropRight( .5f );
m_sprScrollThumbOverHalf[1].SetCropLeft( .5f ); m_sprScrollThumbOverHalf[1]->SetCropLeft( .5f );
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
SetPercentage( pn, 0 ); SetPercentage( pn, 0 );
@@ -39,23 +39,23 @@ void DualScrollBar::Load( const CString &sType )
void DualScrollBar::EnablePlayer( PlayerNumber pn, bool on ) void DualScrollBar::EnablePlayer( PlayerNumber pn, bool on )
{ {
m_sprScrollThumbUnderHalf[pn].SetHidden( !on ); m_sprScrollThumbUnderHalf[pn]->SetHidden( !on );
m_sprScrollThumbOverHalf[pn].SetHidden( !on ); m_sprScrollThumbOverHalf[pn]->SetHidden( !on );
} }
void DualScrollBar::SetPercentage( PlayerNumber pn, float fPercent ) void DualScrollBar::SetPercentage( PlayerNumber pn, float fPercent )
{ {
const float bottom = m_fBarHeight/2 - m_sprScrollThumbUnderHalf[pn].GetZoomedHeight()/2; const float bottom = m_fBarHeight/2 - m_sprScrollThumbUnderHalf[pn]->GetZoomedHeight()/2;
const float top = -bottom; const float top = -bottom;
/* Position both thumbs. */ /* Position both thumbs. */
m_sprScrollThumbUnderHalf[pn].StopTweening(); m_sprScrollThumbUnderHalf[pn]->StopTweening();
m_sprScrollThumbUnderHalf[pn].BeginTweening( m_fBarTime ); m_sprScrollThumbUnderHalf[pn]->BeginTweening( m_fBarTime );
m_sprScrollThumbUnderHalf[pn].SetY( SCALE( fPercent, 0, 1, top, bottom ) ); m_sprScrollThumbUnderHalf[pn]->SetY( SCALE( fPercent, 0, 1, top, bottom ) );
m_sprScrollThumbOverHalf[pn].StopTweening(); m_sprScrollThumbOverHalf[pn]->StopTweening();
m_sprScrollThumbOverHalf[pn].BeginTweening( m_fBarTime ); m_sprScrollThumbOverHalf[pn]->BeginTweening( m_fBarTime );
m_sprScrollThumbOverHalf[pn].SetY( SCALE( fPercent, 0, 1, top, bottom ) ); m_sprScrollThumbOverHalf[pn]->SetY( SCALE( fPercent, 0, 1, top, bottom ) );
} }
/* /*
stepmania/src/DualScrollBar.h
+3 -3
View File
@@ -4,7 +4,7 @@
#define DUAL_SCROLLBAR_H #define DUAL_SCROLLBAR_H
#include "ActorFrame.h" #include "ActorFrame.h"
#include "Sprite.h" #include "AutoActor.h"
#include "PlayerNumber.h" #include "PlayerNumber.h"
class DualScrollBar: public ActorFrame class DualScrollBar: public ActorFrame
@@ -22,8 +22,8 @@ private:
float m_fBarHeight; float m_fBarHeight;
float m_fBarTime; float m_fBarTime;
Sprite m_sprScrollThumbOverHalf[NUM_PLAYERS]; AutoActor m_sprScrollThumbOverHalf[NUM_PLAYERS];
Sprite m_sprScrollThumbUnderHalf[NUM_PLAYERS]; AutoActor m_sprScrollThumbUnderHalf[NUM_PLAYERS];
}; };
#endif #endif
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -179,9 +179,9 @@ void ScreenOptions::Init()
m_ScrollBar.SetName( "ScrollBar" ); m_ScrollBar.SetName( "ScrollBar" );
m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT ); m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT );
m_ScrollBar.SetBarTime( SCROLL_BAR_TIME ); m_ScrollBar.SetBarTime( SCROLL_BAR_TIME );
m_ScrollBar.Load( "DualScrollBar" );
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
m_ScrollBar.EnablePlayer( p, GAMESTATE->IsHumanPlayer(p) ); m_ScrollBar.EnablePlayer( p, GAMESTATE->IsHumanPlayer(p) );
m_ScrollBar.Load( "DualScrollBar" );
SET_XY( m_ScrollBar ); SET_XY( m_ScrollBar );
m_ScrollBar.SetDrawOrder( 2 ); m_ScrollBar.SetDrawOrder( 2 );
m_framePage.AddChild( &m_ScrollBar ); m_framePage.AddChild( &m_ScrollBar );