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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-19 09:55:05 +00:00
parent 075b132f89
commit be73671d02
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+2 -3
View File
@@ -739,7 +739,7 @@ void MusicWheel::RebuildAllMusicWheelItems()
void MusicWheel::RebuildMusicWheelItems( int iDist ) void MusicWheel::RebuildMusicWheelItems( int iDist )
{ {
vector<WheelItemData *> &data = m_CurWheelItemData; const vector<WheelItemData *> &data = m_CurWheelItemData;
vector<MusicWheelItem *> &items = m_MusicWheelItems; vector<MusicWheelItem *> &items = m_MusicWheelItems;
// rewind to first index that will be displayed; // rewind to first index that will be displayed;
@@ -816,12 +816,11 @@ void MusicWheel::NotesOrTrailChanged( PlayerNumber pn ) // update grade graphics
void MusicWheel::DrawItem( int i ) void MusicWheel::DrawItem( int i )
{ {
MusicWheelItem *display = m_MusicWheelItems[i];
const float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection; const float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection;
if( fabsf(fThisBannerPositionOffsetFromSelection) > NUM_WHEEL_ITEMS_TO_DRAW/2 ) if( fabsf(fThisBannerPositionOffsetFromSelection) > NUM_WHEEL_ITEMS_TO_DRAW/2 )
return; return;
MusicWheelItem *display = m_MusicWheelItems[i];
switch( m_WheelState ) switch( m_WheelState )
{ {
case STATE_SELECTING: case STATE_SELECTING:
stepmania/src/WheelBase.cpp
+5 -1
View File
@@ -157,6 +157,10 @@ void WheelBase::DrawPrimitives()
ActorFrame::DrawPrimitives(); ActorFrame::DrawPrimitives();
} }
void WheelBase::DrawItem( int i )
{
DrawItem( i, m_WheelBaseItems[i], i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection );
}
void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection) void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection)
{ {
@@ -627,7 +631,7 @@ void WheelBase::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemD
void WheelBase::RebuildWheelItems( int iDist ) void WheelBase::RebuildWheelItems( int iDist )
{ {
vector<WheelItemBaseData *> &data = m_WheelBaseItemsData; const vector<WheelItemBaseData *> &data = m_WheelBaseItemsData;
vector<WheelItemBase *> &items = m_WheelBaseItems; vector<WheelItemBase *> &items = m_WheelBaseItems;
// rewind to first index that will be displayed; // rewind to first index that will be displayed;
stepmania/src/WheelBase.h
+1 -1
View File
@@ -24,8 +24,8 @@ public:
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives(); virtual void DrawPrimitives();
virtual void DrawItem( int i );
virtual void DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection); virtual void DrawItem( int i, WheelItemBase *display, const float fThisBannerPositionOffsetFromSelection);
virtual void DrawItem( int i ) { DrawItem( i, m_WheelBaseItems[i], i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection ); }
void TweenOnScreen(bool changing_sort); void TweenOnScreen(bool changing_sort);
void TweenOffScreen(bool changing_sort); void TweenOffScreen(bool changing_sort);