From 5befb6045650d61b940a2d6aa12146ba5ed4871e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 20 Mar 2005 20:15:41 +0000 Subject: [PATCH] method name cleanup, add comments --- stepmania/src/NoteData.cpp | 12 ++++++------ stepmania/src/NoteData.h | 18 +++++++++++++----- stepmania/src/NoteDataUtil.cpp | 4 ++-- stepmania/src/NoteDataWithScoring.cpp | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 1830357eb3..c848d27a53 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -481,7 +481,7 @@ int NoteData::GetNumRowsWithTapOrHoldHead( int iStartIndex, int iEndIndex ) cons return iNumNotes; } -int NoteData::RowNeedsHands( const int row ) const +bool NoteData::RowNeedsAtLeastSimultaneousPresses( int iMinSimultaneousPresses, const int row ) const { int iNumNotesThisIndex = 0; for( int t=0; t= 3; + return iNumNotesThisIndex >= iMinSimultaneousPresses; } -int NoteData::GetNumHands( int iStartIndex, int iEndIndex ) const +int NoteData::GetNumRowsWithSimultaneousPresses( int iMinSimultaneousPresses, int iStartIndex, int iEndIndex ) const { /* Count the number of times you have to use your hands. This includes * three taps at the same time, a tap while two hold notes are being held, @@ -524,7 +524,7 @@ int NoteData::GetNumHands( int iStartIndex, int iEndIndex ) const int iNum = 0; FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( *this, r, iStartIndex, iEndIndex ) { - if( !RowNeedsHands(r) ) + if( !RowNeedsAtLeastSimultaneousPresses(iMinSimultaneousPresses,r) ) continue; iNum++; @@ -533,7 +533,7 @@ int NoteData::GetNumHands( int iStartIndex, int iEndIndex ) const return iNum; } -int NoteData::GetNumN( int iMinTaps, int iStartIndex, int iEndIndex ) const +int NoteData::GetNumRowsWithSimultaneousTaps( int iMinTaps, int iStartIndex, int iEndIndex ) const { int iNum = 0; FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( *this, r, iStartIndex, iEndIndex ) diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h index b8305ed65e..2ac29aa1c4 100644 --- a/stepmania/src/NoteData.h +++ b/stepmania/src/NoteData.h @@ -129,15 +129,23 @@ public: float GetLastBeat() const { return NoteRowToBeat( GetLastRow() ); } int GetNumTapNotes( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; int GetNumMines( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; - int GetNumHands( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; int GetNumRowsWithTap( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; int GetNumRowsWithTapOrHoldHead( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; - int GetNumN( int iMinTaps, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; - // should hands also count as a jump? - int GetNumDoubles( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const { return GetNumN( 2, iStartIndex, iEndIndex ); } /* optimization: for the default of start to end, use the second (faster) */ int GetNumHoldNotes( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; - int RowNeedsHands( int row ) const; + + // Count rows that contain iMinTaps or more taps. + int GetNumRowsWithSimultaneousTaps( int iMinTaps, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; + int GetNumJumps( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const { return GetNumRowsWithSimultaneousTaps(2,iStartIndex,iEndIndex); } + + // This row needs at least iMinSimultaneousPresses either tapped or held. + bool RowNeedsAtLeastSimultaneousPresses( int iMinSimultaneousPresses, int row ) const; + bool RowNeedsHands( int row ) const { return RowNeedsAtLeastSimultaneousPresses(2,row); } + + // Count rows that need iMinSimultaneousPresses either tapped or held. + int GetNumRowsWithSimultaneousPresses( int iMinSimultaneousPresses, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const; + int GetNumHands( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const { return GetNumRowsWithSimultaneousPresses(3,iStartIndex,iEndIndex); } + int GetNumQuads( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const { return GetNumRowsWithSimultaneousPresses(4,iStartIndex,iEndIndex); } // Transformations void LoadTransformed( const NoteData& original, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] ); // -1 for iOriginalTracksToTakeFrom means no track diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 2a895d6cca..7106651772 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -519,7 +519,7 @@ void NoteDataUtil::GetRadarValues( const NoteData &in, float fSongSeconds, Radar case RADAR_FREEZE: out[rc] = GetFreezeRadarValue( in, fSongSeconds ); break; case RADAR_CHAOS: out[rc] = GetChaosRadarValue( in, fSongSeconds ); break; case RADAR_NUM_TAPS_AND_HOLDS: out[rc] = (float) in.GetNumRowsWithTapOrHoldHead(); break; - case RADAR_NUM_JUMPS: out[rc] = (float) in.GetNumDoubles(); break; + case RADAR_NUM_JUMPS: out[rc] = (float) in.GetNumJumps(); break; case RADAR_NUM_HOLDS: out[rc] = (float) in.GetNumHoldNotes(); break; case RADAR_NUM_MINES: out[rc] = (float) in.GetNumMines(); break; case RADAR_NUM_HANDS: out[rc] = (float) in.GetNumHands(); break; @@ -569,7 +569,7 @@ float NoteDataUtil::GetAirRadarValue( const NoteData &in, float fSongSeconds ) if( !fSongSeconds ) return 0.0f; // number of doubles - int iNumDoubles = in.GetNumDoubles(); + int iNumDoubles = in.GetNumJumps(); float fReturn = iNumDoubles / fSongSeconds; return min( fReturn, 1.0f ); } diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp index 361dc28d2b..40b2ce7d5b 100644 --- a/stepmania/src/NoteDataWithScoring.cpp +++ b/stepmania/src/NoteDataWithScoring.cpp @@ -234,7 +234,7 @@ float GetActualVoltageRadarValue( const NoteData &in, float fSongSeconds, Player float GetActualAirRadarValue( const NoteData &in, float fSongSeconds, PlayerNumber pn ) { - const int iTotalDoubles = in.GetNumDoubles(); + const int iTotalDoubles = in.GetNumJumps(); if( iTotalDoubles == 0 ) return 1.0f; // no jumps in song