experiment with new notedata string format and tackle the hilarity th…

…at is song load
etternagame · Jun 5, 2017 · e76366b · e76366b
1 parent 735348d
commit e76366b
Show file tree

Hide file tree

Showing 12 changed files with 678 additions and 43 deletions.
diff --git a/src/CMakeData-data.cmake b/src/CMakeData-data.cmake
@@ -49,6 +49,7 @@ list(APPEND SM_DATA_NOTELOAD_SRC
   "NotesLoaderSM.cpp"
   "NotesLoaderSMA.cpp"
   "NotesLoaderSSC.cpp"
+  "NotesLoaderETT.cpp"
 )
 
 list(APPEND SM_DATA_NOTELOAD_HPP
@@ -60,6 +61,7 @@ list(APPEND SM_DATA_NOTELOAD_HPP
   "NotesLoaderSM.h"
   "NotesLoaderSMA.h"
   "NotesLoaderSSC.h"
+  "NotesLoaderETT.h"
 )
 
 source_group("Data Structures\\\\Notes Loaders" FILES ${SM_DATA_NOTELOAD_SRC} ${SM_DATA_NOTELOAD_HPP})
@@ -69,13 +71,15 @@ list(APPEND SM_DATA_NOTEWRITE_SRC
   "NotesWriterJson.cpp"
   "NotesWriterSM.cpp"
   "NotesWriterSSC.cpp"
+  "NotesWriterETT.cpp"
 )
 
 list(APPEND SM_DATA_NOTEWRITE_HPP
   "NotesWriterDWI.h"
   "NotesWriterJson.h"
   "NotesWriterSM.h"
   "NotesWriterSSC.h"
+  "NotesWriterETT.h"
 )
 
 source_group("Data Structures\\\\Notes Writers" FILES ${SM_DATA_NOTEWRITE_SRC} ${SM_DATA_NOTEWRITE_HPP})

diff --git a/src/NoteDataUtil.cpp b/src/NoteDataUtil.cpp
@@ -519,7 +519,6 @@ void NoteDataUtil::GetETTNoteDataString(const NoteData &in, RString &sRet) {
 	// Get note data
 	vector<NoteData> parts;
 	float fLastBeat = -1.f;
-	LOG->Warn("sdasdfas23dff");
 	SplitCompositeNoteData(in, parts);
 
 	FOREACH(NoteData, parts, nd) {

diff --git a/src/NotesLoaderETT.cpp b/src/NotesLoaderETT.cpp
diff --git a/src/NotesLoaderETT.h b/src/NotesLoaderETT.h
@@ -0,0 +1,5 @@
+#ifndef NotesLoaderETT_H
+#define NotesLoaderETT_H
+
+
+#endif
diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
@@ -404,7 +404,7 @@ void SMLoader::ParseBPMs( vector< pair<float, float> > &out, const RString &line
 			continue;
 		}
 
-		out.push_back( make_pair(fBeat, fNewBPM) );
+		out.emplace_back( make_pair(fBeat, fNewBPM) );
 	}
 }
 
@@ -434,7 +434,7 @@ void SMLoader::ParseStops( vector< pair<float, float> > &out, const RString line
 			continue;
 		}
 
-		out.push_back( make_pair(fFreezeBeat, fFreezeSeconds) );
+		out.emplace_back( make_pair(fFreezeBeat, fFreezeSeconds) );
 	}
 }
 
@@ -797,12 +797,12 @@ void SMLoader::ProcessSpeeds( TimingData &out, const RString &line, const int ro
 
 		if( vs2[0] == 0 && vs2.size() == 2 ) // First one always seems to have 2.
 		{
-			vs2.push_back("0");
+			vs2.emplace_back("0");
 		}
 
 		if( vs2.size() == 3 ) // use beats by default.
 		{
-			vs2.push_back("0");
+			vs2.emplace_back("0");
 		}
 
 		if( vs2.size() < 4 )
@@ -1286,7 +1286,7 @@ void SMLoader::TidyUpData( Song &song, bool bFromCache )
 			if( !IsAFile( song.GetBackgroundPath() ) )
 				break;
 
-			bg.push_back( BackgroundChange(lastBeat,song.m_sBackgroundFile) );
+			bg.emplace_back( BackgroundChange(lastBeat,song.m_sBackgroundFile) );
 		} while(0);
 	}
 	if (bFromCache)