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

cleanups

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-22 16:12:31 +00:00
parent 07a26bafc4
commit 765d6019f7
2 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataWithScoring.cpp
+12 -35
View File
@@ -1,19 +1,7 @@
#include "global.h"
#include "NoteDataWithScoring.h"
#include "GameState.h"
#include "RageUtil.h"
#include "StageStats.h"
NoteDataWithScoring::NoteDataWithScoring()
{
Init();
}
void NoteDataWithScoring::Init()
{
NoteData::Init();
}
int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat ) const
{
int iNumSuccessfulTapNotes = 0;
@@ -275,12 +263,12 @@ void NoteDataWithScoring::GetActualRadarValues( PlayerNumber pn, float fSongSeco
float NoteDataWithScoring::GetActualStreamRadarValue( float fSongSeconds, PlayerNumber pn ) const
{
int TotalSteps = GetNumTapNotes();
if( !TotalSteps )
return 1;
int iTotalSteps = GetNumTapNotes();
if( iTotalSteps == 0 )
return 1.0f;
const int Perfects = GetNumTapNotesWithScore(TNS_PERFECT);
return clamp( float(Perfects)/TotalSteps, 0.0f, 1.0f );
return clamp( float(Perfects)/iTotalSteps, 0.0f, 1.0f );
}
float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds, PlayerNumber pn ) const
@@ -297,8 +285,8 @@ float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds, Playe
float NoteDataWithScoring::GetActualAirRadarValue( float fSongSeconds, PlayerNumber pn ) const
{
const int iTotalDoubles = GetNumDoubles();
if (iTotalDoubles == 0)
return 1; // no jumps in song
if( iTotalDoubles == 0 )
return 1.0f; // no jumps in song
// number of doubles
const int iNumDoubles = GetNumNWithScore( TNS_PERFECT, 2 );
@@ -307,34 +295,23 @@ float NoteDataWithScoring::GetActualAirRadarValue( float fSongSeconds, PlayerNum
float NoteDataWithScoring::GetActualChaosRadarValue( float fSongSeconds, PlayerNumber pn ) const
{
const int PossibleDP = g_CurStageStats.m_player[pn].iPossibleDancePoints;
if ( PossibleDP == 0 )
const int iPossibleDP = g_CurStageStats.m_player[pn].iPossibleDancePoints;
if ( iPossibleDP == 0 )
return 1;
const int ActualDP = g_CurStageStats.m_player[pn].iActualDancePoints;
return clamp( float(ActualDP)/PossibleDP, 0.0f, 1.0f );
return clamp( float(ActualDP)/iPossibleDP, 0.0f, 1.0f );
}
float NoteDataWithScoring::GetActualFreezeRadarValue( float fSongSeconds, PlayerNumber pn ) const
{
// number of hold steps
const int TotalHolds = GetNumHoldNotes();
if ( TotalHolds == 0 )
const int iTotalHolds = GetNumHoldNotes();
if( iTotalHolds == 0 )
return 1.0f;
const int ActualHolds = GetNumHoldNotesWithScore(HNS_OK);
return clamp( float(ActualHolds) / TotalHolds, 0.0f, 1.0f );
}
template<class T>
void extend(vector<T> &v, T val, unsigned pos)
{
int needed = pos - v.size() + 1;
if(needed > 0)
{
needed += 100; /* optimization: give it a little more than it needs */
v.insert(v.end(), needed, val);
}
return clamp( float(ActualHolds) / iTotalHolds, 0.0f, 1.0f );
}
/*
stepmania/src/NoteDataWithScoring.h
+11 -14
View File
@@ -13,24 +13,21 @@ struct RadarValues;
class NoteDataWithScoring : public NoteData
{
public:
NoteDataWithScoring();
void Init();
// statistics
int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetNumNWithScore( TapNoteScore tns, int MinTaps, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetSuccessfulMines( const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetSuccessfulHands( const float fStartBeat = 0, const float fEndBeat = -1 ) const;
bool IsRowCompletelyJudged(unsigned row) const;
TapNoteScore MinTapNoteScore(unsigned row) const;
TapNoteScore LastTapNoteScore(unsigned row) const;
bool IsRowCompletelyJudged( unsigned iRow ) const;
TapNoteScore MinTapNoteScore( unsigned iRow ) const;
TapNoteScore LastTapNoteScore( unsigned iRow ) const;
void GetActualRadarValues( PlayerNumber pn, float fSongSeconds, RadarValues& out ) const;
private:
int LastTapNoteScoreTrack(unsigned row) const;
int LastTapNoteScoreTrack( unsigned iRow ) const;
// statistics
int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetNumNWithScore( TapNoteScore tns, int iMinTaps, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetSuccessfulMines( const float fStartBeat = 0, const float fEndBeat = -1 ) const;
int GetSuccessfulHands( const float fStartBeat = 0, const float fEndBeat = -1 ) const;
float GetActualStreamRadarValue( float fSongSeconds, PlayerNumber pn ) const;
float GetActualVoltageRadarValue( float fSongSeconds, PlayerNumber pn ) const;