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

[timing] yeah, need some help on this one.

Browse Source
This commit is contained in:
Jason Felds
2011-07-15 01:10:46 -04:00
parent 4e58239255
commit ff2fbea45d
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderJson.cpp
+12 -14
View File
@@ -10,30 +10,28 @@
#include "Steps.h" #include "Steps.h"
#include "GameManager.h" #include "GameManager.h"
void Deserialize(BPMSegment &seg, const Json::Value &root);
void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString> &out ) void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString> &out )
{ {
GetDirListing( sPath + RString("*.json"), out ); GetDirListing( sPath + RString("*.json"), out );
} }
void Deserialize(BPMSegment &seg, const Json::Value &root) static void Deserialize(TimingSegment *seg, const Json::Value &root)
{ {
seg.SetBeat((float)(root["Beat"].asDouble())); seg->SetBeat((float)(root["Beat"].asDouble()));
seg.SetBPM((float)(root["BPM"].asDouble())); if (seg->GetType() == SEGMENT_BPM)
} {
static_cast<BPMSegment *>(seg)->SetBPM((float)(root["BPM"].asDouble()));
static void Deserialize(StopSegment &seg, const Json::Value &root) }
{ else
seg.SetBeat((float)(root["Beat"].asDouble())); {
seg.SetPause((float)(root["Seconds"].asDouble())); static_cast<StopSegment *>(seg)->SetPause((float)(root["Seconds"].asDouble()));
}
} }
static void Deserialize(TimingData &td, const Json::Value &root) static void Deserialize(TimingData &td, const Json::Value &root)
{ {
vector<TimingSegment *> &bpms = td.allTimingSegments[SEGMENT_BPM]; JsonUtil::DeserializeVectorPointers( td.allTimingSegments[SEGMENT_BPM], Deserialize, root["BpmSegments"] );
// JsonUtil::DeserializeVectorObjects( &bpms, Deserialize, root["BpmSegments"] ); JsonUtil::DeserializeVectorPointers( td.allTimingSegments[SEGMENT_STOP_DELAY], Deserialize, root["StopSegments"] );
// JsonUtil::DeserializeVectorObjects( *(td).allTimingSegments[SEGMENT_STOP_DELAY], Deserialize, root["StopSegments"] );
} }
static void Deserialize(LyricSegment &o, const Json::Value &root) static void Deserialize(LyricSegment &o, const Json::Value &root)