Clear phrase after ending for generic vox (#276)

* Parse phrase length from midi and clear phrase when complete for generic vox * Ignore percussion phrases when parsing midi for generic vox
YARC-Official · May 8, 2023 · 280009e · 280009e
1 parent c29e3f4
commit 280009e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Assets/Script/Data/GenericLyricInfo.cs b/Assets/Script/Data/GenericLyricInfo.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 
 namespace YARG.Data {
-	public class GenericLyricInfo {
-		public float time;
+	public class GenericLyricInfo : AbstractInfo {
 		public List<(float time, string word)> lyric;
 
-		public GenericLyricInfo(float time, List<(float, string)> lyric) {
+		public GenericLyricInfo(float time, float length, List<(float, string)> lyric) {
 			this.time = time;
+			this.length = length;
 			this.lyric = lyric;
 		}
 	}

diff --git a/Assets/Script/PlayMode/Play.cs b/Assets/Script/PlayMode/Play.cs
@@ -322,10 +322,14 @@ private void Update() {
 			// Update lyrics
 			if (lyricIndex < chart.genericLyrics.Count) {
 				var lyric = chart.genericLyrics[lyricIndex];
-				if (lyricPhraseIndex >= lyric.lyric.Count) {
+
+				if (lyricPhraseIndex >= lyric.lyric.Count && lyric.EndTime < SongTime) {
+					// Clear phrase
+					GameUI.Instance.SetGenericLyric(string.Empty);
+
 					lyricPhraseIndex = 0;
 					lyricIndex++;
-				} else if (lyric.lyric[lyricPhraseIndex].time < SongTime) {
+				} else if (lyricPhraseIndex < lyric.lyric.Count && lyric.lyric[lyricPhraseIndex].time < SongTime) {
 					// Consolidate lyrics
 					string o = "<color=#ffb700>";
 					for (int i = 0; i < lyric.lyric.Count; i++) {

diff --git a/Assets/Script/Serialization/Parser/MidiParser.Vocals.cs b/Assets/Script/Serialization/Parser/MidiParser.Vocals.cs
@@ -28,7 +28,8 @@ private List<GenericLyricInfo> ParseGenericLyrics(TrackChunk trackChunk, TempoMa
 				// Create lyric
 				startTimings.Add(note.Time);
 				var time = (float) TimeConverter.ConvertTo<MetricTimeSpan>(note.Time, tempo).TotalSeconds;
-				GenericLyricInfo lyric = new(time, new());
+				var length = (float) TimeConverter.ConvertTo<MetricTimeSpan>(note.EndTime, tempo).TotalSeconds - time;
+				GenericLyricInfo lyric = new(time, length, new());
 
 				// Get lyrics from this phrase
 				long totalDelta = 0;
@@ -73,7 +74,10 @@ private List<GenericLyricInfo> ParseGenericLyrics(TrackChunk trackChunk, TempoMa
 				}
 
 				// Add phrase to result
-				lyrics.Add(lyric);
+				// Ignore phrases w/o lyrics (i.e. percussion)
+				if (lyric.lyric.Count > 0) {
+					lyrics.Add(lyric);
+				}
 			}
 
 			return lyrics;