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

Merge pull request #455 from Vocaluxe/SongNameText-LyricsTop

Browse Source 
Show song name text on lyric position top if possible
This commit is contained in:
Stefan authored and GitHub committed 2020-01-18 13:05:08 +01:00
2 parents 6d8bfed788 582934e7d0
commit f86b6f6db7
1 file changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSing.cs
+21 -6
View File
@@ -123,6 +123,7 @@ namespace Vocaluxe.Screens
private float _RemainingTimeToFirstNote;
private float _TimeToFirstNoteDuet;
private float _RemainingTimeToFirstNoteDuet;
private float _TimeShowSongTextTotal;
private Stopwatch _TimerSongText;
private Stopwatch _TimerDuetText1;
@@ -610,23 +611,23 @@ namespace Vocaluxe.Screens
private void _UpdateSongText()
{
if (_TimerSongText.IsRunning && !_Lyrics[_LyricMainDuet].Visible && !_Lyrics[_LyricMainTop].Visible)
if (_TimerSongText.IsRunning)
{
float t = _TimerSongText.ElapsedMilliseconds / 1000f;
if (t < 10f)
if (t < _TimeShowSongTextTotal)
{
_Statics[_StaticSongText].Visible = true;
_Texts[_TextSongName].Visible = true;
if (t < 7f)
if (t < (_TimeShowSongTextTotal - 3f))
{
_Statics[_StaticSongText].Color.A = 1f;
_Texts[_TextSongName].Color.A = 1f;
}
else
{
_Statics[_StaticSongText].Color.A = (10f - t) / 3f;
_Texts[_TextSongName].Color.A = (10f - t) / 3f;
_Statics[_StaticSongText].Color.A = (_TimeShowSongTextTotal - t) / 3f;
_Texts[_TextSongName].Color.A = (_TimeShowSongTextTotal - t) / 3f;
}
}
else
@@ -1148,7 +1149,21 @@ namespace Vocaluxe.Screens
_TimerDuetText1.Reset();
_TimerDuetText2.Reset();
if (!song.IsDuet)
float realGap = song.Gap - song.Start;
_TimeShowSongTextTotal = 10f;
if (_Lyrics[_LyricMainDuet].Visible || _Lyrics[_LyricMainTop].Visible)
{
if (realGap < 11f)
{
_TimeShowSongTextTotal = 0;
}
else if (realGap < 17f)
{
_TimeShowSongTextTotal = realGap - 7f;
}
}
if (_TimeShowSongTextTotal > 0)
_TimerSongText.Start();
}