Ez2 Checkin. (No song select yet)

This commit is contained in:
Andrew Livy
2002-06-23 11:43:53 +00:00
parent 02b9e3589d
commit f1e3334757
47 changed files with 1018 additions and 1124 deletions
+15 -42
View File
@@ -21,11 +21,6 @@
NoteData::NoteData()
{
Init();
}
void NoteData::Init()
{
memset( m_TapNotes, '0', MAX_NOTE_TRACKS*MAX_TAP_NOTE_ROWS );
m_iNumTracks = 0;
@@ -181,24 +176,6 @@ void NoteData::RemoveHoldNote( int index )
m_iNumHoldNotes--;
}
bool NoteData::IsThereANoteAtRow( int iRow )
{
for( int t=0; t<m_iNumTracks; t++ )
{
if( m_TapNotes[t][iRow] != '0' )
return true;
}
for( int i=0; i<m_iNumHoldNotes; i++ ) // for each HoldNote
{
if( m_HoldNotes[i].m_iStartIndex == iRow )
return true;
}
return false;
}
int NoteData::GetLastRow()
{
int iOldestIndexFoundSoFar = 0;
@@ -235,7 +212,7 @@ float NoteData::GetLastBeat()
int NoteData::GetNumTapNotes( const float fStartBeat, const float fEndBeat )
{
int iNumNotes = 0;
int iNumSteps = 0;
int iStartIndex = BeatToNoteRow( fStartBeat );
int iEndIndex = BeatToNoteRow( fEndBeat );
@@ -245,11 +222,11 @@ int NoteData::GetNumTapNotes( const float fStartBeat, const float fEndBeat )
for( int t=0; t<m_iNumTracks; t++ )
{
if( m_TapNotes[t][i] != '0' )
iNumNotes++;
iNumSteps++;
}
}
return iNumNotes;
return iNumSteps;
}
int NoteData::GetNumDoubles( const float fStartBeat, const float fEndBeat )
@@ -276,18 +253,19 @@ int NoteData::GetNumDoubles( const float fStartBeat, const float fEndBeat )
int NoteData::GetNumHoldNotes( const float fStartBeat, const float fEndBeat )
{
int iNumHolds = 0;
int iNumSteps = 0;
int iStartIndex = BeatToNoteRow( fStartBeat );
int iEndIndex = BeatToNoteRow( fEndBeat );
for( int i=0; i<m_iNumHoldNotes; i++ )
{
HoldNote &hn = m_HoldNotes[i];
if( iStartIndex <= hn.m_iStartIndex && hn.m_iEndIndex <= iEndIndex )
iNumHolds++;
float fHoldStartBeat = NoteRowToBeat( m_HoldNotes[i].m_iStartIndex );
if( fStartBeat >= fHoldStartBeat && fStartBeat < fEndBeat )
iNumSteps++;
}
return iNumHolds;
return iNumSteps;
}
int NoteData::GetPossibleDancePoints()
@@ -730,9 +708,8 @@ float NoteData::GetStreamRadarValue( float fSongSeconds )
{
// density of steps
int iNumNotes = GetNumTapNotes() + GetNumHoldNotes();
float fNotesPerSecond = iNumNotes/fSongSeconds;
float fReturn = fNotesPerSecond / 5;
return min( fReturn, 1.2f );
float fBeatsPerSecond = iNumNotes/fSongSeconds;
return fBeatsPerSecond / 5;
}
float NoteData::GetVoltageRadarValue( float fSongSeconds )
@@ -752,30 +729,26 @@ float NoteData::GetVoltageRadarValue( float fSongSeconds )
fMaxDensityPerSecSoFar = fDensityPerSecThisMeasure;
}
float fReturn = fMaxDensityPerSecSoFar*10;
return min( fReturn, 1.2f );
return fMaxDensityPerSecSoFar;
}
float NoteData::GetAirRadarValue( float fSongSeconds )
{
// number of doubles
int iNumDoubles = GetNumDoubles();
float fReturn = iNumDoubles / fSongSeconds * 2;
return min( fReturn, 1.2f );
return iNumDoubles / fSongSeconds * 2;
}
float NoteData::GetChaosRadarValue( float fSongSeconds )
{
// irregularity of steps
float fReturn = fabsf( GetStreamRadarValue(fSongSeconds) - GetVoltageRadarValue(fSongSeconds) ) * 2.5f;
return min( fReturn, 1.2f );
return fabsf( GetStreamRadarValue(fSongSeconds) - GetVoltageRadarValue(fSongSeconds) );
}
float NoteData::GetFreezeRadarValue( float fSongSeconds )
{
// number of hold steps
float fReturn = GetNumHoldNotes() / fSongSeconds * 3;
return min( fReturn, 1.2f );
return GetNumHoldNotes() / fSongSeconds * 10;
}