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

quick style pass

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-19 09:19:54 +00:00
parent 142fc408ab
commit 3876bc1a2c
1 changed files with 91 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/WheelBase.cpp
+54 -50
View File
@@ -181,20 +181,22 @@ void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBanner
display->Draw();
}
void WheelBase::UpdateScrollbar(unsigned int size)
void WheelBase::UpdateScrollbar( unsigned int iSize )
{
int total_num_items = size;
float item_at=m_iSelection - m_fPositionOffsetFromSelection;
int iTotalNumItems = iSize;
float fItemAt = m_iSelection - m_fPositionOffsetFromSelection;
if(NUM_WHEEL_ITEMS >= total_num_items)
if( NUM_WHEEL_ITEMS >= iTotalNumItems )
{
m_ScrollBar.SetPercentage( 0, 1 );
} else {
float size = float(NUM_WHEEL_ITEMS) / total_num_items;
float center = item_at / total_num_items;
size *= 0.5f;
}
else
{
float fSize = float(NUM_WHEEL_ITEMS) / iTotalNumItems;
float fCenter = fItemAt / iTotalNumItems;
fSize *= 0.5f;
m_ScrollBar.SetPercentage( center - size, center + size );
m_ScrollBar.SetPercentage( fCenter - fSize, fCenter + fSize );
}
}
@@ -239,11 +241,11 @@ void WheelBase::Update( float fDeltaTime )
/* Do this in at most .1 sec chunks, so we don't get weird if we
* stop for some reason (and so it behaves the same when being
* single stepped). */
float tm = fDeltaTime;
while(tm > 0)
float fTime = fDeltaTime;
while( fTime > 0 )
{
float t = min(tm, 0.1f);
tm -= t;
float t = min( fTime, 0.1f );
fTime -= t;
m_fPositionOffsetFromSelection = clamp( m_fPositionOffsetFromSelection, -0.3f, +0.3f );
@@ -311,14 +313,16 @@ void WheelBase::Update( float fDeltaTime )
}
}
void WheelBase::UpdateItems(float fDeltaTime) {
void WheelBase::UpdateItems( float fDeltaTime )
{
for( unsigned i = 0; i < unsigned(NUM_WHEEL_ITEMS); i++)
{
m_WheelBaseItems[i]->Update( fDeltaTime );
}
}
void WheelBase::UpdateSwitch() {
void WheelBase::UpdateSwitch()
{
switch( m_WheelState )
{
case STATE_TWEENING_ON_SCREEN:
@@ -383,11 +387,11 @@ bool WheelBase::Select() // return true if this selection ends the screen
return false;
}
WheelItemBaseData* WheelBase::GetItem(unsigned int index) // return true if this selection ends the screen
// return true if this selection ends the screen
WheelItemBaseData* WheelBase::GetItem( unsigned int iIndex )
{
if (!m_isEmpty)
if (index < m_WheelBaseItemsData.size())
return m_WheelBaseItemsData[index];
if( !m_isEmpty && iIndex < m_WheelBaseItemsData.size() )
return m_WheelBaseItemsData[iIndex];
return NULL;
}
@@ -397,40 +401,43 @@ int WheelBase::IsMoving() const
return m_Moving && m_TimeBeforeMovingBegins == 0;
}
void WheelBase::TweenOnScreen(bool changing_sort)
void WheelBase::TweenOnScreen( bool bChangingSort )
{
m_WheelState = STATE_TWEENING_ON_SCREEN;
SetItemPosition( *m_sprHighlight, 0 );
COMMAND( m_sprHighlight, "StartOn");
if( changing_sort )
if( bChangingSort )
{
const float delay = fabsf(NUM_WHEEL_ITEMS/2-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
m_sprHighlight->BeginTweening( delay ); // sleep
COMMAND( m_sprHighlight, "FinishOnSort");
} else {
}
else
{
COMMAND( m_sprHighlight, "FinishOn");
}
m_ScrollBar.SetX( SCROLL_BAR_X );
m_ScrollBar.AddX( 30 );
if(changing_sort)
if( bChangingSort )
m_ScrollBar.BeginTweening( 0.2f ); // sleep
else
m_ScrollBar.BeginTweening( 0.7f ); // sleep
m_ScrollBar.BeginTweening( 0.2f , Actor::TWEEN_ACCELERATE );
m_ScrollBar.AddX( -30 );
TweenOnScreenUpdateItems(changing_sort);
TweenOnScreenUpdateItems( bChangingSort );
if( changing_sort )
if( bChangingSort )
HurryTweening( 0.25f );
m_fTimeLeftInState = GetTweenTimeLeft() + 0.100f;
}
void WheelBase::TweenOnScreenUpdateItems(bool changing_sort) {
void WheelBase::TweenOnScreenUpdateItems( bool bChangingSort )
{
for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
{
WheelItemBase *display = m_WheelBaseItems[i];
@@ -441,19 +448,19 @@ void WheelBase::TweenOnScreenUpdateItems(bool changing_sort) {
const float delay = fabsf(i-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
display->BeginTweening( delay ); // sleep
COMMAND( display, "FinishOn");
if( changing_sort )
if( bChangingSort )
display->HurryTweening( 0.25f );
}
}
void WheelBase::TweenOffScreen(bool changing_sort)
void WheelBase::TweenOffScreen( bool bChangingSort )
{
m_WheelState = STATE_TWEENING_OFF_SCREEN;
SetItemPosition( *m_sprHighlight, 0 );
COMMAND( m_sprHighlight, "StartOff");
if( changing_sort )
if( bChangingSort )
{
/* When changing sort, tween the overlay with the item in the center;
* having it separate looks messy when we're moving fast. */
@@ -470,15 +477,15 @@ void WheelBase::TweenOffScreen(bool changing_sort)
m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE );
m_ScrollBar.SetX( SCROLL_BAR_X+30 );
TweenOffScreenUpdateItems(changing_sort);
TweenOffScreenUpdateItems( bChangingSort );
if( changing_sort )
if( bChangingSort )
HurryTweening( 0.25f );
m_fTimeLeftInState = GetTweenTimeLeft() + 0.100f;
}
void WheelBase::TweenOffScreenUpdateItems(bool changing_sort)
void WheelBase::TweenOffScreenUpdateItems( bool bChangingSort )
{
for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
{
@@ -490,7 +497,7 @@ void WheelBase::TweenOffScreenUpdateItems(bool changing_sort)
const float delay = fabsf(i-WHEEL_ITEM_OFF_DELAY_CENTER) * WHEEL_ITEM_OFF_DELAY_OFFSET;
display->BeginTweening( delay ); // sleep
COMMAND( display, "FinishOff");
if( changing_sort )
if( bChangingSort )
display->HurryTweening( 0.25f );
}
}
@@ -595,14 +602,14 @@ void WheelBase::AddItem(WheelItemBaseData* itemdata)
}
}
void WheelBase::ChangeMusic(int dist)
void WheelBase::ChangeMusic( int iDist )
{
m_iSelection += dist;
m_iSelection += iDist;
wrap( m_iSelection, m_WheelBaseItemsData.size() );
RebuildWheelItems( dist );
RebuildWheelItems( iDist );
m_fPositionOffsetFromSelection += dist;
m_fPositionOffsetFromSelection += iDist;
// SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
@@ -619,7 +626,7 @@ void WheelBase::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemD
}
}
void WheelBase::RebuildWheelItems( int dist )
void WheelBase::RebuildWheelItems( int iDist )
{
// rewind to first index that will be displayed;
int iFirstVisibleIndex = m_iSelection;
@@ -634,7 +641,7 @@ void WheelBase::RebuildWheelItems( int dist )
// iIndex is now the index of the lowest WheelItem to draw
if( dist == -999999 )
if( iDist == -999999 )
{
// Refresh all
for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
@@ -651,10 +658,10 @@ void WheelBase::RebuildWheelItems( int dist )
else
{
// Shift items and refresh only those that have changed.
CircularShift( m_WheelBaseItems, dist );
if( dist > 0 )
CircularShift( m_WheelBaseItems, iDist );
if( iDist > 0 )
{
for( int i=NUM_WHEEL_ITEMS-dist; i<NUM_WHEEL_ITEMS; i++ )
for( int i=NUM_WHEEL_ITEMS-iDist; i<NUM_WHEEL_ITEMS; i++ )
{
int iIndex = iFirstVisibleIndex + i;
wrap( iIndex, m_WheelBaseItemsData.size() );
@@ -665,9 +672,9 @@ void WheelBase::RebuildWheelItems( int dist )
display->LoadFromWheelItemBaseData( data );
}
}
else if( dist < 0 )
else if( iDist < 0 )
{
for( int i=0; i<-dist; i++ )
for( int i=0; i < -iDist; i++ )
{
int iIndex = iFirstVisibleIndex + i;
wrap( iIndex, m_WheelBaseItemsData.size() );
@@ -689,10 +696,9 @@ WheelItemBaseData* WheelBase::LastSelected( )
void WheelBase::RemoveItem( int index )
{
if (!m_isEmpty)
{
if (index < (int)m_WheelBaseItemsData.size())
{
if( m_isEmpty || index >= (int)m_WheelBaseItemsData.size() )
return;
vector<WheelItemBaseData *>::iterator i = m_WheelBaseItemsData.begin();
i += index;
@@ -711,8 +717,6 @@ void WheelBase::RemoveItem( int index )
RebuildWheelItems();
}
}
}
int WheelBase::FirstVisibleIndex()
{