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

simplify RangeOverlaps

Browse Source 
add ContainedByRange
This commit is contained in:
Glenn Maynard
2004-04-29 00:33:09 +00:00
parent 7b9802b2bf
commit efc61b33d6
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteField.cpp
+3 -8
View File
@@ -568,6 +568,8 @@ void NoteField::DrawPrimitives()
}
const bool bIsActive = m_ActiveHoldNotes[hn];
const bool bIsHoldingNote = m_HeldHoldNotes[hn];
const float fLife = GetHoldNoteLife( hn );
if( bIsActive )
SearchForSongBeat()->m_GhostArrowRow.SetHoldIsActive( hn.iTrack );
@@ -576,16 +578,9 @@ void NoteField::DrawPrimitives()
bool bIsInSelectionRange = false;
if( m_fBeginMarker!=-1 && m_fEndMarker!=-1 )
bIsInSelectionRange =
m_fBeginMarker <= hn.GetStartBeat() &&
hn.GetStartBeat() <= m_fEndMarker &&
m_fBeginMarker <= hn.GetEndBeat() &&
hn.GetEndBeat() <= m_fEndMarker;
bIsInSelectionRange = hn.ContainedByRange( BeatToNoteRow( m_fBeginMarker ), BeatToNoteRow( m_fEndMarker ) );
NoteDisplayCols *nd = CurDisplay->second;
const bool bIsHoldingNote = m_HeldHoldNotes[hn];
const float fLife = GetHoldNoteLife( hn );
nd->display[c].DrawHold( hn, bIsHoldingNote, bIsActive, fLife, bIsInSelectionRange ? fSelectedRangeGlow : m_fPercentFadeToFail, false, m_fYReverseOffsetPixels );
}