diff options
-rw-r--r-- | Game/Code/Classes/UDraw.pas | 27 | ||||
-rw-r--r-- | Game/Code/Classes/UGraphic.pas | 7 | ||||
-rw-r--r-- | Skins/Deluxe/Blue.ini | 1 | ||||
-rw-r--r-- | Skins/Deluxe/Score Level Round.jpg | bin | 19455 -> 614 bytes | |||
-rw-r--r-- | Skins/Deluxe/Text Bar.jpg | bin | 8123 -> 5462 bytes | |||
-rw-r--r-- | Skins/Deluxe/W&C.ini | 6 | ||||
-rw-r--r-- | Skins/Deluxe/[effect]goldenNoteStar.jpg | bin | 22332 -> 24894 bytes | |||
-rw-r--r-- | Skins/Deluxe/[main]scoreLine.jpg | bin | 19965 -> 559 bytes | |||
-rw-r--r-- | Skins/Deluxe/[sing]lyricsHelpBar.bmp | bin | 0 -> 3126 bytes |
9 files changed, 28 insertions, 13 deletions
diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index 7eaddac4..410fbb2e 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -663,24 +663,37 @@ begin Rec.Top := Skin_LyricsT + 3;
Rec.Bottom := Rec.Top + 33;//SingScreen.LyricMain.Size * 3;
- // zapalanie
+{ // zapalanie
BarAlpha := (BarWspol*10) * 0.5;
if BarAlpha > 0.5 then BarAlpha := 0.5;
// gaszenie
- if BarWspol > 0.95 then BarAlpha := 0.5 * (1 - (BarWspol - 0.95) * 20);
+ if BarWspol > 0.95 then BarAlpha := 0.5 * (1 - (BarWspol - 0.95) * 20);}
+
//Change fuer Crazy Joker
- glEnable(GL_BLEND);
- glBegin(GL_QUADS);
+
+ glEnable(GL_TEXTURE_2D);
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBindTexture(GL_TEXTURE_2D, Tex_Lyric_Help_Bar.TexNum);
+ glBegin(GL_QUADS);
+ glColor4f(1, 1, 1, 0);
+ glTexCoord2f(1/16, 1/16); glVertex2f(Rec.Left, Rec.Top);
+ glTexCoord2f(1/16, 15/16); glVertex2f(Rec.Left, Rec.Bottom);
+ glColor4f(1, 1, 1, 0.5);
+ glTexCoord2f(15/16, 15/16); glVertex2f(Rec.Right, Rec.Bottom);
+ glTexCoord2f(15/16, 1/16); glVertex2f(Rec.Right, Rec.Top);
+ glEnd;
+ glDisable(GL_BLEND);
+{ glBegin(GL_QUADS);
glColor4f(26/255, 165/255, 220/255, 0);
glVertex2f(Rec.Left, Rec.Top);
glVertex2f(Rec.Left, Rec.Bottom);
glColor4f(26/255, 165/255, 220/255, BarAlpha);
glVertex2f(Rec.Right, Rec.Bottom);
glVertex2f(Rec.Right, Rec.Top);
- glEnd;
- glDisable(GL_BLEND);
- end;
+ glEnd;}
+ end;
// oscilloscope
if Ini.Oscilloscope = 1 then begin
diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas index c3ce0f00..b909e49f 100644 --- a/Game/Code/Classes/UGraphic.pas +++ b/Game/Code/Classes/UGraphic.pas @@ -76,6 +76,7 @@ var Tex_Ball: TTexture;
+ Tex_Lyric_Help_Bar: TTexture;
FullScreen: boolean;
@@ -191,9 +192,9 @@ begin end;
Tex_Note_Perfect_Star := Texture.LoadTexture(pchar(Skin.GetTextureFileName('NotePerfectStar')), 'JPG', 'Font Black', 0);
- Tex_Note_Star := Texture.LoadTexture(pchar(Skin.GetTextureFileName('NoteStar')) , 'JPG', 'Alpha Black Colored', $FFFFFF);
- Tex_Ball := Texture.LoadTexture(pchar(Skin.GetTextureFileName('Ball')), 'BMP', 'Transparent', $FF00FF);
-
+ Tex_Note_Star := Texture.LoadTexture(pchar(Skin.GetTextureFileName('NoteStar')) , 'JPG', 'Alpha Black Colored', $FFFFFF);
+ Tex_Ball := Texture.LoadTexture(pchar(Skin.GetTextureFileName('Ball')), 'BMP', 'Transparent', $FF00FF);
+ Tex_Lyric_Help_Bar := Texture.LoadTexture(pchar(Skin.GetTextureFileName('LyricHelpBar')), 'BMP', 'Transparent', $FF00FF);
//SingBar Mod
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini index d79647ca..bd43846a 100644 --- a/Skins/Deluxe/Blue.ini +++ b/Skins/Deluxe/Blue.ini @@ -55,6 +55,7 @@ ScoreLevelRound=Score Level Round.jpg ScoreBG=Sing Score BG.jpg
LyricBar=Text Bar.jpg
+LyricHelpBar=[sing]lyricsHelpBar.bmp
SingBarBack=Sing Bar Back.jpg
SingBarBar=Sing Bar Bar.jpg
diff --git a/Skins/Deluxe/Score Level Round.jpg b/Skins/Deluxe/Score Level Round.jpg Binary files differindex 4edcdd69..38cfddea 100644 --- a/Skins/Deluxe/Score Level Round.jpg +++ b/Skins/Deluxe/Score Level Round.jpg diff --git a/Skins/Deluxe/Text Bar.jpg b/Skins/Deluxe/Text Bar.jpg Binary files differindex bf55226d..83f20f4f 100644 --- a/Skins/Deluxe/Text Bar.jpg +++ b/Skins/Deluxe/Text Bar.jpg diff --git a/Skins/Deluxe/W&C.ini b/Skins/Deluxe/W&C.ini index 5d39833c..18b3669f 100644 --- a/Skins/Deluxe/W&C.ini +++ b/Skins/Deluxe/W&C.ini @@ -24,8 +24,7 @@ Button=Button.jpg LoadingBG = [bg-load]summer.jpg
MainBG = [bg-main]summer.jpg
SongBG = [bg-main]summer.jpg
-ScoreScreenBG = blue.jpg
-#[bg-main]summer.jpg
+ScoreScreenBG = [bg-main]summer.jpg
Top5BG = [bg-main]summer.jpg
OptionsBG = [bg-main]summer.jpg
PartyBG = [bg-main]summer.jpg
@@ -63,9 +62,10 @@ ScoreBox=Score Box.jpg ScoreLevel=Score Level.jpg
ScoreLevelRound=Score Level Round.jpg
-ScoreBG=Sing Score BG.jpg
+ScoreBG=[bg-main]summer.jpg
LyricBar=Text Bar.jpg
+LyricHelpBar=[sing]lyricsHelpBar.bmp
SingBarBack=Sing Bar Back.jpg
SingBarBar=Sing Bar Bar.jpg
diff --git a/Skins/Deluxe/[effect]goldenNoteStar.jpg b/Skins/Deluxe/[effect]goldenNoteStar.jpg Binary files differindex 1ef6243d..1b31d267 100644 --- a/Skins/Deluxe/[effect]goldenNoteStar.jpg +++ b/Skins/Deluxe/[effect]goldenNoteStar.jpg diff --git a/Skins/Deluxe/[main]scoreLine.jpg b/Skins/Deluxe/[main]scoreLine.jpg Binary files differindex 546a87c7..61cf33f5 100644 --- a/Skins/Deluxe/[main]scoreLine.jpg +++ b/Skins/Deluxe/[main]scoreLine.jpg diff --git a/Skins/Deluxe/[sing]lyricsHelpBar.bmp b/Skins/Deluxe/[sing]lyricsHelpBar.bmp Binary files differnew file mode 100644 index 00000000..8ed922a5 --- /dev/null +++ b/Skins/Deluxe/[sing]lyricsHelpBar.bmp |