From d511dee312e1bd1dd7e146b9cf1f4e2e4a3e1c79 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 18 Oct 2010 15:40:32 +0000
Subject: added song name in medley mode (singscreen)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2679 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
medley_new/game/themes/Candy.ini | 20 +++++++++++++++++++-
medley_new/game/themes/Candy/Clouds static.ini | 3 +++
medley_new/game/themes/Candy/Clouds.ini | 3 +++
medley_new/game/themes/Candy/[sing]SongName.png | Bin 0 -> 2192 bytes
medley_new/game/themes/Classic.ini | 18 ++++++++++++++++++
medley_new/game/themes/Classic/Star.ini | 3 +++
medley_new/game/themes/Classic/[sing]SongName.png | Bin 0 -> 973 bytes
medley_new/game/themes/Deluxe.ini | 18 ++++++++++++++++++
medley_new/game/themes/Deluxe/Blue.ini | 3 +++
medley_new/game/themes/Deluxe/Fall.ini | 3 +++
medley_new/game/themes/Deluxe/Ocean.ini | 3 +++
medley_new/game/themes/Deluxe/Ribbon.ini | 3 +++
medley_new/game/themes/Deluxe/Summer.ini | 3 +++
medley_new/game/themes/Deluxe/Winter.ini | 3 +++
medley_new/game/themes/Deluxe/[sing]SongName.png | Bin 0 -> 973 bytes
medley_new/game/themes/Temptation.ini | 18 ++++++++++++++++++
.../game/themes/Temptation/Temptation (16-9).ini | 3 +++
.../game/themes/Temptation/Temptation (4-3).ini | 3 +++
.../game/themes/Temptation/[sing]SongName.png | Bin 0 -> 973 bytes
medley_new/game/themes/Verdure.ini | 18 ++++++++++++++++++
medley_new/game/themes/Verdure/Drippin.ini | 3 +++
medley_new/game/themes/Verdure/Drippin_Low.ini | 3 +++
medley_new/game/themes/Verdure/Drippin_Static.ini | 3 +++
medley_new/game/themes/Verdure/Springtime.ini | 3 +++
medley_new/game/themes/Verdure/Springtime_Low.ini | 3 +++
.../game/themes/Verdure/Springtime_Static.ini | 3 +++
medley_new/game/themes/Verdure/[sing]SongName.png | Bin 0 -> 973 bytes
medley_new/src/base/UThemes.pas | 6 ++++++
medley_new/src/screens/UScreenSing.pas | 19 +++++++++++++++++--
29 files changed, 165 insertions(+), 3 deletions(-)
create mode 100644 medley_new/game/themes/Candy/[sing]SongName.png
create mode 100644 medley_new/game/themes/Classic/[sing]SongName.png
create mode 100644 medley_new/game/themes/Deluxe/[sing]SongName.png
create mode 100644 medley_new/game/themes/Temptation/[sing]SongName.png
create mode 100644 medley_new/game/themes/Verdure/[sing]SongName.png
diff --git a/medley_new/game/themes/Candy.ini b/medley_new/game/themes/Candy.ini
index ce758d88..d8944b83 100755
--- a/medley_new/game/themes/Candy.ini
+++ b/medley_new/game/themes/Candy.ini
@@ -7156,4 +7156,22 @@ IndicatorYOffset = 3
X = 20
W = 760
Y = 532
-H = 41
\ No newline at end of file
+H = 41
+
+[SingSongNameStatic]
+Tex = SongName
+X = 10
+Y = 10
+W = 780
+H = 29
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 400
+Y = 13
+Font = 0
+Size = 25
+Color = Black
+Align = 1
\ No newline at end of file
diff --git a/medley_new/game/themes/Candy/Clouds static.ini b/medley_new/game/themes/Candy/Clouds static.ini
index 7cf1d80e..6729af27 100755
--- a/medley_new/game/themes/Candy/Clouds static.ini
+++ b/medley_new/game/themes/Candy/Clouds static.ini
@@ -48,6 +48,9 @@ P = [sing]p.png
Ball = [sing]lyricsHelpBar.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
ScoreBox = [score]box.png
Scorepipe = [score]pipe.png
ScoreLevel = [score]level.png
diff --git a/medley_new/game/themes/Candy/Clouds.ini b/medley_new/game/themes/Candy/Clouds.ini
index 374a818b..13e81014 100755
--- a/medley_new/game/themes/Candy/Clouds.ini
+++ b/medley_new/game/themes/Candy/Clouds.ini
@@ -44,6 +44,9 @@ SingBarFront = [sing]singBarFront.png
ScoreBG = [sing]scoreBg.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
P = [sing]p.png
Ball = [sing]lyricsHelpBar.png
diff --git a/medley_new/game/themes/Candy/[sing]SongName.png b/medley_new/game/themes/Candy/[sing]SongName.png
new file mode 100644
index 00000000..27a059dc
Binary files /dev/null and b/medley_new/game/themes/Candy/[sing]SongName.png differ
diff --git a/medley_new/game/themes/Classic.ini b/medley_new/game/themes/Classic.ini
index 815eced3..3db8838f 100644
--- a/medley_new/game/themes/Classic.ini
+++ b/medley_new/game/themes/Classic.ini
@@ -1143,6 +1143,24 @@ Y = 95
W = 100
H = 8
+[SingSongNameStatic]
+Tex = SongName
+X = 350
+Y = 5
+W = 440
+H = 42
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 570
+Y = 15
+Font = 1
+Size = 20
+Color = Black
+Align = 1
+
[Score]
Texts = 1
diff --git a/medley_new/game/themes/Classic/Star.ini b/medley_new/game/themes/Classic/Star.ini
index f2c42f3d..acf78565 100644
--- a/medley_new/game/themes/Classic/Star.ini
+++ b/medley_new/game/themes/Classic/Star.ini
@@ -109,6 +109,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Classic/[sing]SongName.png b/medley_new/game/themes/Classic/[sing]SongName.png
new file mode 100644
index 00000000..530fed3f
Binary files /dev/null and b/medley_new/game/themes/Classic/[sing]SongName.png differ
diff --git a/medley_new/game/themes/Deluxe.ini b/medley_new/game/themes/Deluxe.ini
index d7745cac..a8d789b2 100644
--- a/medley_new/game/themes/Deluxe.ini
+++ b/medley_new/game/themes/Deluxe.ini
@@ -1301,6 +1301,24 @@ Y = 95
W = 100
H = 8
+[SingSongNameStatic]
+Tex = SongName
+X = 10
+Y = 10
+W = 780
+H = 29
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 400
+Y = 13
+Font = 0
+Size = 25
+Color = Black
+Align = 1
+
[Score]
Texts = 1
diff --git a/medley_new/game/themes/Deluxe/Blue.ini b/medley_new/game/themes/Deluxe/Blue.ini
index 62314f91..c183bc98 100644
--- a/medley_new/game/themes/Deluxe/Blue.ini
+++ b/medley_new/game/themes/Deluxe/Blue.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/Fall.ini b/medley_new/game/themes/Deluxe/Fall.ini
index feef593b..2c471fac 100644
--- a/medley_new/game/themes/Deluxe/Fall.ini
+++ b/medley_new/game/themes/Deluxe/Fall.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/Ocean.ini b/medley_new/game/themes/Deluxe/Ocean.ini
index aa935a77..4459bcc2 100644
--- a/medley_new/game/themes/Deluxe/Ocean.ini
+++ b/medley_new/game/themes/Deluxe/Ocean.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/Ribbon.ini b/medley_new/game/themes/Deluxe/Ribbon.ini
index ed0d7a40..a8f584a5 100644
--- a/medley_new/game/themes/Deluxe/Ribbon.ini
+++ b/medley_new/game/themes/Deluxe/Ribbon.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/Summer.ini b/medley_new/game/themes/Deluxe/Summer.ini
index e63b3968..b0eaaf27 100644
--- a/medley_new/game/themes/Deluxe/Summer.ini
+++ b/medley_new/game/themes/Deluxe/Summer.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/Winter.ini b/medley_new/game/themes/Deluxe/Winter.ini
index fd993078..15051c77 100644
--- a/medley_new/game/themes/Deluxe/Winter.ini
+++ b/medley_new/game/themes/Deluxe/Winter.ini
@@ -99,6 +99,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Deluxe/[sing]SongName.png b/medley_new/game/themes/Deluxe/[sing]SongName.png
new file mode 100644
index 00000000..530fed3f
Binary files /dev/null and b/medley_new/game/themes/Deluxe/[sing]SongName.png differ
diff --git a/medley_new/game/themes/Temptation.ini b/medley_new/game/themes/Temptation.ini
index e64b96af..35c37ba3 100755
--- a/medley_new/game/themes/Temptation.ini
+++ b/medley_new/game/themes/Temptation.ini
@@ -1291,6 +1291,24 @@ Y = 95
W = 100
H = 8
+[SingSongNameStatic]
+Tex = SongName
+X = 10
+Y = 10
+W = 780
+H = 29
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 400
+Y = 13
+Font = 0
+Size = 25
+Color = Black
+Align = 1
+
[Score]
Texts = 1
diff --git a/medley_new/game/themes/Temptation/Temptation (16-9).ini b/medley_new/game/themes/Temptation/Temptation (16-9).ini
index 7959a196..e2ab1f29 100755
--- a/medley_new/game/themes/Temptation/Temptation (16-9).ini
+++ b/medley_new/game/themes/Temptation/Temptation (16-9).ini
@@ -107,6 +107,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Temptation/Temptation (4-3).ini b/medley_new/game/themes/Temptation/Temptation (4-3).ini
index 0c288e69..da516118 100755
--- a/medley_new/game/themes/Temptation/Temptation (4-3).ini
+++ b/medley_new/game/themes/Temptation/Temptation (4-3).ini
@@ -107,6 +107,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Temptation/[sing]SongName.png b/medley_new/game/themes/Temptation/[sing]SongName.png
new file mode 100644
index 00000000..530fed3f
Binary files /dev/null and b/medley_new/game/themes/Temptation/[sing]SongName.png differ
diff --git a/medley_new/game/themes/Verdure.ini b/medley_new/game/themes/Verdure.ini
index b33463aa..37d566d5 100644
--- a/medley_new/game/themes/Verdure.ini
+++ b/medley_new/game/themes/Verdure.ini
@@ -1344,6 +1344,24 @@ Y = 95
W = 100
H = 8
+[SingSongNameStatic]
+Tex = SongName
+X = 10
+Y = 10
+W = 780
+H = 29
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 400
+Y = 13
+Font = 0
+Size = 25
+Color = Black
+Align = 1
+
[Score]
Texts = 1
diff --git a/medley_new/game/themes/Verdure/Drippin.ini b/medley_new/game/themes/Verdure/Drippin.ini
index 9ca5ac55..b2157531 100644
--- a/medley_new/game/themes/Verdure/Drippin.ini
+++ b/medley_new/game/themes/Verdure/Drippin.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/Drippin_Low.ini b/medley_new/game/themes/Verdure/Drippin_Low.ini
index 51c04cbb..650ba3f9 100644
--- a/medley_new/game/themes/Verdure/Drippin_Low.ini
+++ b/medley_new/game/themes/Verdure/Drippin_Low.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/Drippin_Static.ini b/medley_new/game/themes/Verdure/Drippin_Static.ini
index bc41307f..2cd6fd47 100644
--- a/medley_new/game/themes/Verdure/Drippin_Static.ini
+++ b/medley_new/game/themes/Verdure/Drippin_Static.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/Springtime.ini b/medley_new/game/themes/Verdure/Springtime.ini
index 28bc6026..bcd87cd5 100644
--- a/medley_new/game/themes/Verdure/Springtime.ini
+++ b/medley_new/game/themes/Verdure/Springtime.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/Springtime_Low.ini b/medley_new/game/themes/Verdure/Springtime_Low.ini
index ef1527f5..ac59cd9e 100644
--- a/medley_new/game/themes/Verdure/Springtime_Low.ini
+++ b/medley_new/game/themes/Verdure/Springtime_Low.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/Springtime_Static.ini b/medley_new/game/themes/Verdure/Springtime_Static.ini
index 1d7773b5..6441463a 100644
--- a/medley_new/game/themes/Verdure/Springtime_Static.ini
+++ b/medley_new/game/themes/Verdure/Springtime_Static.ini
@@ -105,6 +105,9 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#song name for medley mode
+SongName = [sing]SongName.png
+
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
diff --git a/medley_new/game/themes/Verdure/[sing]SongName.png b/medley_new/game/themes/Verdure/[sing]SongName.png
new file mode 100644
index 00000000..530fed3f
Binary files /dev/null and b/medley_new/game/themes/Verdure/[sing]SongName.png differ
diff --git a/medley_new/src/base/UThemes.pas b/medley_new/src/base/UThemes.pas
index 9dad86d5..dcfc5b4d 100644
--- a/medley_new/src/base/UThemes.pas
+++ b/medley_new/src/base/UThemes.pas
@@ -360,6 +360,9 @@ type
TextP3R: TThemeText;
TextP3RScore: TThemeText;
+ StaticSongName: TThemeStatic;
+ TextSongName: TThemeText;
+
//Linebonus Translations
LineBonusText: array [0..8] of UTF8String;
@@ -1218,6 +1221,9 @@ begin
ThemeLoadStatic(Sing.StaticP3RScoreBG, 'SingP3RStatic2');
ThemeLoadText(Sing.TextP3RScore, 'SingP3RTextScore');
+ ThemeLoadStatic(Sing.StaticSongName, 'SingSongNameStatic');
+ ThemeLoadText(Sing.TextSongName, 'SingSongNameText');
+
//Line Bonus Texts
Sing.LineBonusText[0] := Language.Translate('POPUP_AWFUL');
Sing.LineBonusText[1] := Sing.LineBonusText[0];
diff --git a/medley_new/src/screens/UScreenSing.pas b/medley_new/src/screens/UScreenSing.pas
index f4984386..a0e1c794 100644
--- a/medley_new/src/screens/UScreenSing.pas
+++ b/medley_new/src/screens/UScreenSing.pas
@@ -123,6 +123,9 @@ type
StaticPausePopup: integer;
+ SongNameStatic: integer;
+ SongNameText: integer;
+
Tex_Background: TTexture;
FadeOut: boolean;
Lyrics: TLyricEngine;
@@ -370,6 +373,9 @@ begin
fLyricsSync := TLyricsSyncSource.Create();
fMusicSync := TMusicSyncSource.Create();
+ SongNameStatic := AddStatic(Theme.Sing.StaticSongName);;
+ SongNameText := AddText(Theme.Sing.TextSongName);
+
eSongLoaded := THookableEvent.Create('ScreenSing.SongLoaded');
ClearSettings;
@@ -411,6 +417,9 @@ begin
end else
fTimebarMode := tbmCurrent;
+ Statics[SongNameStatic].Visible := false;
+ Text[SongNameText].Visible := false;
+
case PlayersPlay of
1:
begin
@@ -761,11 +770,10 @@ begin
begin
CurrentSong.SetMedleyMode();
- (* TODO:
+
Text[SongNameText].Text := IntToStr(PlaylistMedley.CurrentMedleySong) +
'/' + IntToStr(PlaylistMedley.NumMedleySongs) + ': ' +
CurrentSong.Artist + ' - ' + CurrentSong.Title;
- *)
//medley start and end timestamps
StartNote := FindNote(CurrentSong.Medley.StartBeat - round(CurrentSong.BPM[0].BPM*CurrentSong.Medley.FadeIn_time/60));
@@ -1439,6 +1447,9 @@ var
begin
if (AudioPlayback.Position < GetTimeFromBeat(CurrentSong.Medley.StartBeat)) then
begin
+ Statics[SongNameStatic].Visible := true;
+ Text[SongNameText].Visible := true;
+
timeDiff := GetTimeFromBeat(CurrentSong.Medley.StartBeat)-AudioPlayback.Position+1;
t := frac(timeDiff);
@@ -1453,6 +1464,10 @@ begin
SetFontPos (RenderW/2-w/2, RenderH/2-h/2);
glPrint(PChar(CountDownText));
+ end else
+ begin
+ Statics[SongNameStatic].Visible := false;
+ Text[SongNameText].Visible := false;
end;
end;
--
cgit v1.2.3