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

TapSteps -> TapNotes

Browse Source
This commit is contained in:
Chris Danford
2004-05-24 04:17:19 +00:00
parent b3125ac086
commit 0ec2a536d9
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+3 -3
View File
@@ -88,7 +88,7 @@ void NoteData::CopyRange( const NoteData* pFrom, int iFromIndexBegin, int iFromI
From.To4s( *pFrom ); From.To4s( *pFrom );
To.To4s( *this ); To.To4s( *this );
// copy recorded TapSteps // copy recorded TapNotes
int f = iFromIndexBegin, t = iToIndexBegin; int f = iFromIndexBegin, t = iToIndexBegin;
while( f<=iFromIndexEnd ) while( f<=iFromIndexEnd )
@@ -271,7 +271,7 @@ void NoteData::AddHoldNote( HoldNote add )
int iAddStartIndex = add.iStartRow; int iAddStartIndex = add.iStartRow;
int iAddEndIndex = add.iEndRow; int iAddEndIndex = add.iEndRow;
// delete TapSteps under this HoldNote // delete TapNotes under this HoldNote
for( i=iAddStartIndex+1; i<=iAddEndIndex; i++ ) for( i=iAddStartIndex+1; i<=iAddEndIndex; i++ )
SetTapNote(add.iTrack, i, TAP_EMPTY); SetTapNote(add.iTrack, i, TAP_EMPTY);
@@ -345,7 +345,7 @@ void NoteData::PruneUnusedAttacksFromMap()
} }
// Remove all items from m_AttackMap that don't have corresponding // Remove all items from m_AttackMap that don't have corresponding
// TapSteps in use. // TapNotes in use.
for( TapNote tn = TAP_ATTACK_BEGIN; tn<=TAP_ATTACK_END; tn++ ) for( TapNote tn = TAP_ATTACK_BEGIN; tn<=TAP_ATTACK_END; tn++ )
{ {
bool bInAttackMap = m_AttackMap.find(tn) != m_AttackMap.end(); bool bInAttackMap = m_AttackMap.find(tn) != m_AttackMap.end();
stepmania/src/NoteData.h
+2 -2
View File
@@ -99,7 +99,7 @@ public:
// //
// used in edit/record // used in edit/record
// //
void AddHoldNote( HoldNote newNote ); // add note hold note merging overlapping HoldNotes and destroying TapSteps underneath void AddHoldNote( HoldNote newNote ); // add note hold note merging overlapping HoldNotes and destroying TapNotes underneath
void RemoveHoldNote( int index ); void RemoveHoldNote( int index );
HoldNote &GetHoldNote( int index ) { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; } HoldNote &GetHoldNote( int index ) { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; }
const HoldNote &GetHoldNote( int index ) const { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; } const HoldNote &GetHoldNote( int index ) const { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; }
@@ -138,7 +138,7 @@ public:
void LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] ); // -1 for iOriginalTracksToTakeFrom means no track void LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] ); // -1 for iOriginalTracksToTakeFrom means no track
void LoadTransformedSlidingWindow( const NoteData* pOriginal, int iNewNumTracks ); // used by autogen void LoadTransformedSlidingWindow( const NoteData* pOriginal, int iNewNumTracks ); // used by autogen
// Convert between HoldNote representation and '2' and '3' markers in TapSteps // Convert between HoldNote representation and '2' and '3' markers in TapNotes
void Convert2sAnd3sToHoldNotes(); void Convert2sAnd3sToHoldNotes();
void ConvertHoldNotesTo2sAnd3s(); void ConvertHoldNotesTo2sAnd3s();
void To2sAnd3s( const NoteData &out ); void To2sAnd3s( const NoteData &out );
stepmania/src/NoteDataUtil.cpp
+5 -5
View File
@@ -392,7 +392,7 @@ void NoteDataUtil::RemoveHoldNotes(NoteData &in, float fStartBeat, float fEndBea
int iStartIndex = BeatToNoteRow( fStartBeat ); int iStartIndex = BeatToNoteRow( fStartBeat );
int iEndIndex = BeatToNoteRow( fEndBeat ); int iEndIndex = BeatToNoteRow( fEndBeat );
// turn all the HoldNotes into TapSteps // turn all the HoldNotes into TapNotes
for( int i=in.GetNumHoldNotes()-1; i>=0; i-- ) // iterate backwards so we can delete for( int i=in.GetNumHoldNotes()-1; i>=0; i-- ) // iterate backwards so we can delete
{ {
const HoldNote hn = in.GetHoldNote( i ); const HoldNote hn = in.GetHoldNote( i );
@@ -410,7 +410,7 @@ void NoteDataUtil::RemoveSimultaneousNotes(NoteData &in, int iMaxSimultaneous, f
int iStartIndex = BeatToNoteRow( fStartBeat ); int iStartIndex = BeatToNoteRow( fStartBeat );
int iEndIndex = BeatToNoteRow( fEndBeat ); int iEndIndex = BeatToNoteRow( fEndBeat );
// turn all the HoldNotes into TapSteps // turn all the HoldNotes into TapNotes
for( int r=iStartIndex; r<=iEndIndex; r++ ) // iterate backwards so we can delete for( int r=iStartIndex; r<=iEndIndex; r++ ) // iterate backwards so we can delete
{ {
if( in.IsRowEmpty(r) ) if( in.IsRowEmpty(r) )
@@ -629,7 +629,7 @@ static void SuperShuffleTaps( NoteData &in, int iStartIndex, int iEndIndex )
{ {
/* We already did the normal shuffling code above, which did a good job /* We already did the normal shuffling code above, which did a good job
* of shuffling HoldNotes without creating impossible patterns. * of shuffling HoldNotes without creating impossible patterns.
* Now, go in and shuffle the TapSteps per-row. * Now, go in and shuffle the TapNotes per-row.
* *
* This is only called by NoteDataUtil::Turn. "in" is in 4s, and iStartIndex * This is only called by NoteDataUtil::Turn. "in" is in 4s, and iStartIndex
* and iEndIndex are in range. */ * and iEndIndex are in range. */
@@ -1192,7 +1192,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n
in.ConvertHoldNotesTo2sAnd3s(); in.ConvertHoldNotesTo2sAnd3s();
// iterate over all TapSteps in the interval and snap them // iterate over all TapNotes in the interval and snap them
for( int i=iNoteIndexBegin; i<=iNoteIndexEnd; i++ ) for( int i=iNoteIndexBegin; i<=iNoteIndexEnd; i++ )
{ {
int iOldIndex = i; int iOldIndex = i;
@@ -1218,7 +1218,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n
const TapNote oldnote = in.GetTapNote(c, iNewIndex); const TapNote oldnote = in.GetTapNote(c, iNewIndex);
if( note == TAP_TAP && if( note == TAP_TAP &&
(oldnote == TAP_HOLD_HEAD || oldnote == TAP_HOLD_TAIL) ) (oldnote == TAP_HOLD_HEAD || oldnote == TAP_HOLD_TAIL) )
continue; // HoldNotes override TapSteps continue; // HoldNotes override TapNotes
/* If two hold note boundaries are getting snapped together, /* If two hold note boundaries are getting snapped together,
* merge them. */ * merge them. */
stepmania/src/NoteDisplay.h
+1 -1
View File
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
Class: NoteDisplay Class: NoteDisplay
Desc: Draws TapSteps and HoldNotes. Desc: Draws TapNotes and HoldNotes.
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Brian Bugh Brian Bugh
stepmania/src/NoteField.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ void NoteField::DrawPrimitives()
// //
// Draw all TapSteps in this column // Draw all TapNotes in this column
// //
CurDisplay = m_BeatToNoteDisplays.begin(); CurDisplay = m_BeatToNoteDisplays.begin();
NextDisplay = CurDisplay; ++NextDisplay; NextDisplay = CurDisplay; ++NextDisplay;
stepmania/src/ScreenEdit.cpp
+1 -1
View File
@@ -1328,7 +1328,7 @@ void ScreenEdit::TransitionFromRecordToEdit()
int iNoteIndexBegin = BeatToNoteRow( m_NoteFieldEdit.m_fBeginMarker ); int iNoteIndexBegin = BeatToNoteRow( m_NoteFieldEdit.m_fBeginMarker );
int iNoteIndexEnd = BeatToNoteRow( m_NoteFieldEdit.m_fEndMarker ); int iNoteIndexEnd = BeatToNoteRow( m_NoteFieldEdit.m_fEndMarker );
// delete old TapSteps in the range // delete old TapNotes in the range
m_NoteFieldEdit.ClearRange( iNoteIndexBegin, iNoteIndexEnd ); m_NoteFieldEdit.ClearRange( iNoteIndexBegin, iNoteIndexEnd );
m_NoteFieldEdit.CopyRange( &m_NoteFieldRecord, iNoteIndexBegin, iNoteIndexEnd, iNoteIndexBegin ); m_NoteFieldEdit.CopyRange( &m_NoteFieldRecord, iNoteIndexBegin, iNoteIndexEnd, iNoteIndexBegin );