Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #454 from Vocaluxe/DrawLyricHelper-patch-1

Browse Source 
Fix: Wrong lyric colors in duet mode (fix #361)
This commit is contained in:
Stefan authored and GitHub committed 2020-01-18 10:59:52 +01:00
2 parents 3da982acc4 da911d4223
commit 6d8bfed788
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Genius/Screens/ScreenSing.xml
+4 -4
View File
@@ -46,7 +46,7 @@
<Color Name="BackgroundColorAlpha" /> <Color Name="BackgroundColorAlpha" />
<Rect> <Rect>
<X>0</X> <X>0</X>
<Y>0</Y> <Y>610</Y>
<W>1280</W> <W>1280</W>
<H>90</H> <H>90</H>
<Z>-0.75</Z> <Z>-0.75</Z>
@@ -136,7 +136,7 @@
<Color Name="LyricHelperDuet" /> <Color Name="LyricHelperDuet" />
<Rect> <Rect>
<X>40</X> <X>40</X>
<Y>10</Y> <Y>623</Y>
<W>45</W> <W>45</W>
<H>36</H> <H>36</H>
<Z>-1</Z> <Z>-1</Z>
@@ -1501,7 +1501,7 @@
<Lyric Name="LyricMainDuet"> <Lyric Name="LyricMainDuet">
<Rect> <Rect>
<X>637</X> <X>637</X>
<Y>7</Y> <Y>620</Y>
<W>1200</W> <W>1200</W>
<H>42</H> <H>42</H>
<Z>-1</Z> <Z>-1</Z>
@@ -1512,7 +1512,7 @@
<Lyric Name="LyricSubDuet"> <Lyric Name="LyricSubDuet">
<Rect> <Rect>
<X>637</X> <X>637</X>
<Y>48</Y> <Y>662</Y>
<W>1200</W> <W>1200</W>
<H>35</H> <H>35</H>
<Z>-1</Z> <Z>-1</Z>
Vocaluxe/Screens/CScreenSing.cs
+7 -7
View File
@@ -532,7 +532,7 @@ namespace Vocaluxe.Screens
_SingNotes[_SingBars].PlayerNotes[j].SetLine(nr); _SingNotes[_SingBars].PlayerNotes[j].SetLine(nr);
} }
if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet) if (i == 0)
{ {
_Lyrics[_LyricMain].SetLine(lines[nr]); _Lyrics[_LyricMain].SetLine(lines[nr]);
_Lyrics[_LyricMainTop].SetLine(lines[nr]); _Lyrics[_LyricMainTop].SetLine(lines[nr]);
@@ -550,7 +550,7 @@ namespace Vocaluxe.Screens
_Lyrics[_LyricSubTop].Clear(); _Lyrics[_LyricSubTop].Clear();
} }
} }
if (i == 0 && song.IsDuet) if (i == 1 && song.IsDuet)
{ {
_Lyrics[_LyricMainDuet].SetLine(lines[nr]); _Lyrics[_LyricMainDuet].SetLine(lines[nr]);
_TimeToFirstNoteDuet = CGame.GetTimeFromBeats(lines[nr].FirstNoteBeat - lines[nr].StartBeat, song.BPM); _TimeToFirstNoteDuet = CGame.GetTimeFromBeats(lines[nr].FirstNoteBeat - lines[nr].StartBeat, song.BPM);
@@ -564,7 +564,7 @@ namespace Vocaluxe.Screens
} }
else else
{ {
if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet) if (i == 0)
{ {
_Lyrics[_LyricMain].Clear(); _Lyrics[_LyricMain].Clear();
_Lyrics[_LyricSub].Clear(); _Lyrics[_LyricSub].Clear();
@@ -573,7 +573,7 @@ namespace Vocaluxe.Screens
_TimeToFirstNote = 0f; _TimeToFirstNote = 0f;
} }
if (i == 0 && song.IsDuet) if (i == 1 && song.IsDuet)
{ {
_Lyrics[_LyricMainDuet].Clear(); _Lyrics[_LyricMainDuet].Clear();
_Lyrics[_LyricSubDuet].Clear(); _Lyrics[_LyricSubDuet].Clear();
@@ -879,7 +879,7 @@ namespace Vocaluxe.Screens
_Statics[_StaticLyricHelperTop].Color.R, _Statics[_StaticLyricHelperTop].Color.R,
_Statics[_StaticLyricHelperTop].Color.G, _Statics[_StaticLyricHelperTop].Color.G,
_Statics[_StaticLyricHelperTop].Color.B, _Statics[_StaticLyricHelperTop].Color.B,
_Statics[_StaticLyricHelperTop].Color.A * _Statics[_StaticLyricHelper].Alpha * alpha); _Statics[_StaticLyricHelperTop].Color.A * _Statics[_StaticLyricHelperTop].Alpha * alpha);
float distance = _Lyrics[_LyricMainTop].GetCurrentLyricPosX() - rect.X - rect.W; float distance = _Lyrics[_LyricMainTop].GetCurrentLyricPosX() - rect.X - rect.W;
CDraw.DrawTexture(_Statics[_StaticLyricHelperTop].Texture, CDraw.DrawTexture(_Statics[_StaticLyricHelperTop].Texture,
@@ -1199,8 +1199,8 @@ namespace Vocaluxe.Screens
if (CGame.GetSong() != null && CGame.GetSong().IsDuet) if (CGame.GetSong() != null && CGame.GetSong().IsDuet)
{ {
bottomLyricsVisible = true; bottomLyricsVisible = false;
topLyricsVisible = false; topLyricsVisible = true;
duetLyricsVisible = true; duetLyricsVisible = true;
} }