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

Replace #MEASUREINFO with two separate tags, #NPSPERMEASURE and #NOTESPERMEASURE. Stop storing MeasureInfo objects on Steps, and just directly store NpsPerMeasure, NotesPerMeasure, and peakNPS.

Browse Source
This commit is contained in:
Michael Votaw
2025-02-15 13:57:50 -06:00
committed by teejusb
parent 2414595063
commit fd790eb83e
6 changed files with 150 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSSC.cpp
+40 -6
View File
@@ -408,19 +408,52 @@ void SetTechCounts(StepsTagInfo& info)
info.ssc_format= true;
}
void SetMeasureInfo(StepsTagInfo& info)
void SetNpsPerMeasure(StepsTagInfo& info)
{
if (info.from_cache || info.for_load_edit)
{
std::vector<RString> values;
split((*info.params)[1], "|", values, true);
split((*info.params)[1], ",", values, true);
std::size_t measures_per_player = values.size() / NUM_PlayerNumber;
std::vector<std::vector<float>> npsPerMeasure;
npsPerMeasure.resize(NUM_PLAYERS);
MeasureInfo v[NUM_PLAYERS];
FOREACH_PlayerNumber(pn)
{
v[pn].FromString(values[pn]);
npsPerMeasure[pn].resize(measures_per_player, 0);
for(std::size_t i= 0; i < measures_per_player; ++i)
{
npsPerMeasure[pn][i]= StringToFloat(values[pn * measures_per_player + i]);
}
}
info.steps->SetCachedMeasureInfo(v);
info.steps->SetCachedNpsPerMeasure(npsPerMeasure);
}
else
{
// just recalc at time.
}
info.ssc_format= true;
}
void SetNotesPerMeasure(StepsTagInfo& info)
{
if (info.from_cache || info.for_load_edit)
{
std::vector<RString> values;
split((*info.params)[1], ",", values, true);
std::size_t measures_per_player = values.size() / NUM_PlayerNumber;
std::vector<std::vector<int>> notesPerMeasure;
notesPerMeasure.resize(NUM_PLAYERS);
FOREACH_PlayerNumber(pn)
{
notesPerMeasure[pn].resize(measures_per_player, 0);
for(std::size_t i= 0; i < measures_per_player; ++i)
{
notesPerMeasure[pn][i]= StringToInt(values[pn * measures_per_player + i]);
}
}
info.steps->SetCachedNotesPerMeasure(notesPerMeasure);
}
else
{
@@ -670,7 +703,8 @@ struct ssc_parser_helper_t
steps_tag_handlers["FAKES"]= &SetStepsFakes;
steps_tag_handlers["LABELS"]= &SetStepsLabels;
steps_tag_handlers["TECHCOUNTS"] = &SetTechCounts;
steps_tag_handlers["MEASUREINFO"] = &SetMeasureInfo;
steps_tag_handlers["NPSPERMEASURE"] = &SetNpsPerMeasure;
steps_tag_handlers["NOTESPERMEASURE"] = &SetNotesPerMeasure;
/* If this is called, the chart does not use the same attacks
* as the Song's timing. No other changes are required. */