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

Right, display the goods on song timing.

Browse Source 
Maybe we need to adjust the metrics used here.
This commit is contained in:
Jason Felds
2011-09-12 19:47:43 -04:00
parent 047bc7a5dc
commit 16916a7d67
1 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteField.cpp
+28 -40
View File
@@ -980,33 +980,27 @@ void NoteField::DrawPrimitives()
} }
} }
if( GAMESTATE->m_bIsUsingStepTiming ) // Tickcount text
for (i = 0; i < segs[SEGMENT_TICKCOUNT].size(); i++)
{ {
// Tickcount text TickcountSegment *seg = static_cast<TickcountSegment *>(segs[SEGMENT_TICKCOUNT][i]);
for (i = 0; i < segs[SEGMENT_TICKCOUNT].size(); i++) if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
{ {
TickcountSegment *seg = static_cast<TickcountSegment *>(segs[SEGMENT_TICKCOUNT][i]); float fBeat = seg->GetBeat();
if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw ) if( IS_ON_SCREEN(fBeat) )
{ DrawTickcountText( fBeat, seg->GetTicks() );
float fBeat = seg->GetBeat();
if( IS_ON_SCREEN(fBeat) )
DrawTickcountText( fBeat, seg->GetTicks() );
}
} }
} }
if( GAMESTATE->m_bIsUsingStepTiming ) // Combo text
for (i = 0; i < segs[SEGMENT_COMBO].size(); i++)
{ {
// Combo text ComboSegment *seg = static_cast<ComboSegment *>(segs[SEGMENT_COMBO][i]);
for (i = 0; i < segs[SEGMENT_COMBO].size(); i++) if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
{ {
ComboSegment *seg = static_cast<ComboSegment *>(segs[SEGMENT_COMBO][i]); float fBeat = seg->GetBeat();
if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw ) if( IS_ON_SCREEN(fBeat) )
{ DrawComboText( fBeat, seg->GetCombo(), seg->GetMissCombo() );
float fBeat = seg->GetBeat();
if( IS_ON_SCREEN(fBeat) )
DrawComboText( fBeat, seg->GetCombo(), seg->GetMissCombo() );
}
} }
} }
@@ -1022,34 +1016,28 @@ void NoteField::DrawPrimitives()
} }
} }
if( GAMESTATE->m_bIsUsingStepTiming ) // Speed text
for (i = 0; i < segs[SEGMENT_SPEED].size(); i++)
{ {
// Speed text SpeedSegment *seg = static_cast<SpeedSegment *>(segs[SEGMENT_SPEED][i]);
for (i = 0; i < segs[SEGMENT_SPEED].size(); i++) if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
{ {
SpeedSegment *seg = static_cast<SpeedSegment *>(segs[SEGMENT_SPEED][i]); float fBeat = seg->GetBeat();
if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw ) if( IS_ON_SCREEN(fBeat) )
{ DrawSpeedText(fBeat, seg->GetRatio(),
float fBeat = seg->GetBeat(); seg->GetDelay(), seg->GetUnit() );
if( IS_ON_SCREEN(fBeat) )
DrawSpeedText(fBeat, seg->GetRatio(),
seg->GetDelay(), seg->GetUnit() );
}
} }
} }
// Fake text // Fake text
if( GAMESTATE->m_bIsUsingStepTiming ) for (i = 0; i < segs[SEGMENT_FAKE].size(); i++)
{ {
for (i = 0; i < segs[SEGMENT_FAKE].size(); i++) FakeSegment *seg = static_cast<FakeSegment *>(segs[SEGMENT_FAKE][i]);
if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw )
{ {
FakeSegment *seg = static_cast<FakeSegment *>(segs[SEGMENT_FAKE][i]); float fBeat = seg->GetBeat();
if( seg->GetRow() >= iFirstRowToDraw && seg->GetRow() <= iLastRowToDraw ) if( IS_ON_SCREEN(fBeat) )
{ DrawFakeText( fBeat, seg->GetLength() );
float fBeat = seg->GetBeat();
if( IS_ON_SCREEN(fBeat) )
DrawFakeText( fBeat, seg->GetLength() );
}
} }
} }