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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Trail.cpp
+30 -43
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "Trail.h"
#include "Foreach.h"
#include "GameState.h"
#include "Steps.h"
#include "Song.h"
@@ -8,6 +7,7 @@
#include "NoteData.h"
#include "NoteDataUtil.h"
#include "CommonMetrics.h"
#include <numeric>
void TrailEntry::GetAttackArray( AttackArray &out ) const
{
@@ -105,28 +105,28 @@ const RadarValues &Trail::GetRadarValues() const
RadarValues rv;
rv.Zero();
FOREACH_CONST( TrailEntry, m_vEntries, e )
for (TrailEntry const &e : m_vEntries)
{
const Steps *pSteps = e->pSteps;
ASSERT( pSteps != NULL );
const Steps *pSteps = e.pSteps;
ASSERT( pSteps != nullptr );
// Hack: don't calculate for autogen entries
if( !pSteps->IsAutogen() && e->ContainsTransformOrTurn() )
if( !pSteps->IsAutogen() && e.ContainsTransformOrTurn() )
{
NoteData nd;
pSteps->GetNoteData( nd );
RadarValues rv_orig;
GAMESTATE->SetProcessedTimingData(const_cast<TimingData *>(pSteps->GetTimingData()));
NoteDataUtil::CalculateRadarValues( nd, e->pSong->m_fMusicLengthSeconds, rv_orig );
NoteDataUtil::CalculateRadarValues( nd, e.pSong->m_fMusicLengthSeconds, rv_orig );
PlayerOptions po;
po.FromString( e->Modifiers );
po.FromString( e.Modifiers );
if( po.ContainsTransformOrTurn() )
{
NoteDataUtil::TransformNoteData(nd, *(pSteps->GetTimingData()), po, pSteps->m_StepsType);
}
NoteDataUtil::TransformNoteData(nd, *(pSteps->GetTimingData()), e->Attacks, pSteps->m_StepsType, e->pSong);
NoteDataUtil::TransformNoteData(nd, *(pSteps->GetTimingData()), e.Attacks, pSteps->m_StepsType, e.pSong);
RadarValues transformed_rv;
NoteDataUtil::CalculateRadarValues( nd, e->pSong->m_fMusicLengthSeconds, transformed_rv );
GAMESTATE->SetProcessedTimingData(NULL);
NoteDataUtil::CalculateRadarValues( nd, e.pSong->m_fMusicLengthSeconds, transformed_rv );
GAMESTATE->SetProcessedTimingData(nullptr);
rv += transformed_rv;
}
else
@@ -159,37 +159,30 @@ int Trail::GetMeter() const
int Trail::GetTotalMeter() const
{
int iTotalMeter = 0;
FOREACH_CONST( TrailEntry, m_vEntries, e )
{
iTotalMeter += e->pSteps->GetMeter();
}
return iTotalMeter;
return std::accumulate(m_vEntries.begin(), m_vEntries.end(), 0, [](int total, TrailEntry const &e) {
return total + e.pSteps->GetMeter();
});
}
float Trail::GetLengthSeconds() const
{
float fSecs = 0;
FOREACH_CONST( TrailEntry, m_vEntries, e )
{
fSecs += e->pSong->m_fMusicLengthSeconds;
}
return fSecs;
return std::accumulate(m_vEntries.begin(), m_vEntries.end(), 0.f, [](float total, TrailEntry const &e) {
return total + e.pSong->m_fMusicLengthSeconds;
});
}
void Trail::GetDisplayBpms( DisplayBpms &AddTo ) const
{
FOREACH_CONST( TrailEntry, m_vEntries, e )
for (TrailEntry const &e : m_vEntries)
{
if( e->bSecret )
if( e.bSecret )
{
AddTo.Add( -1 );
continue;
}
Song *pSong = e->pSong;
ASSERT( pSong != NULL );
Song *pSong = e.pSong;
ASSERT( pSong != nullptr );
switch( pSong->m_DisplayBPMType )
{
case DISPLAY_BPM_ACTUAL:
@@ -206,22 +199,16 @@ void Trail::GetDisplayBpms( DisplayBpms &AddTo ) const
bool Trail::IsSecret() const
{
FOREACH_CONST( TrailEntry, m_vEntries, e )
{
if( e->bSecret )
return true;
}
return false;
return std::any_of(m_vEntries.begin(), m_vEntries.end(), [](TrailEntry const &e) {
return e.bSecret;
});
}
bool Trail::ContainsSong( const Song *pSong ) const
{
FOREACH_CONST( TrailEntry, m_vEntries, e )
{
if( e->pSong == pSong )
return true;
}
return false;
return std::any_of(m_vEntries.begin(), m_vEntries.end(), [&](TrailEntry const &e) {
return e.pSong == pSong;
});
}
// lua start
@@ -244,17 +231,17 @@ public:
static int GetArtists( T* p, lua_State *L )
{
vector<RString> asArtists, asAltArtists;
FOREACH_CONST( TrailEntry, p->m_vEntries, e )
for (TrailEntry const &e : p->m_vEntries)
{
if( e->bSecret )
if( e.bSecret )
{
asArtists.push_back( "???" );
asAltArtists.push_back( "???" );
}
else
{
asArtists.push_back( e->pSong->GetDisplayArtist() );
asAltArtists.push_back( e->pSong->GetTranslitArtist() );
asArtists.push_back( e.pSong->GetDisplayArtist() );
asAltArtists.push_back( e.pSong->GetTranslitArtist() );
}
}