diff options
| -rw-r--r-- | Game/Code/Classes/UDraw.pas | 12 | ||||
| -rw-r--r-- | Skins/Deluxe/Autumn.ini | 6 | ||||
| -rw-r--r-- | Skins/Deluxe/Blue.ini | 6 | ||||
| -rw-r--r-- | Skins/Deluxe/Summer.ini | 6 | ||||
| -rw-r--r-- | Skins/Deluxe/Winter.ini | 6 | ||||
| -rw-r--r-- | Skins/Deluxe/[sing]timeBar.jpg | bin | 504 -> 317 bytes | |||
| -rw-r--r-- | Skins/Deluxe/[sing]timeBar1.jpg | bin | 483 -> 0 bytes |
![Skins/Deluxe/[sing]timeBar.jpg](/usdx/diff/Skins/Deluxe/[sing]timeBar.jpg?h=svn/1.1-rc&id=e82d6d67a61bc5437074e9fe20a35d2c3945e6ab&id2=4ddd757d3ee4fa079d8601e03dec0522940070cf){kind=link}
![Skins/Deluxe/[sing]timeBar1.jpg](/usdx/diff/Skins/Deluxe/[sing]timeBar1.jpg?h=svn/1.1-rc&id=e82d6d67a61bc5437074e9fe20a35d2c3945e6ab&id2=4ddd757d3ee4fa079d8601e03dec0522940070cf){kind=link}
7 files changed, 17 insertions, 19 deletions
diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index bf85888d..8945e591 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -1648,21 +1648,19 @@ begin width:= Theme.Sing.StaticTimeProgress.w;
height:= Theme.Sing.StaticTimeProgress.h;
- // glColor4f(Theme.Sing.StaticTimeProgress.ColR,
- // Theme.Sing.StaticTimeProgress.ColG,
- // Theme.Sing.StaticTimeProgress.ColB, 1); //Set Color
+ glColor4f(Theme.Sing.StaticTimeProgress.ColR,
+ Theme.Sing.StaticTimeProgress.ColG,
+ Theme.Sing.StaticTimeProgress.ColB, 1); //Set Color
glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, Tex_TimeProgress.TexNum);
-// glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
- // glBindTexture(GL_TEXTURE_2D, Tex_Lyric_Help_Bar.TexNum);
glBegin(GL_QUADS);
glTexCoord2f(0, 0); glVertex2f(x,y);
- glTexCoord2f(1, 0); glVertex2f(x+width*(Czas.Teraz/Czas.Razem), y);
- glTexCoord2f(1, 1); glVertex2f(x+width*(Czas.Teraz/Czas.Razem), y+height);
+ glTexCoord2f((width*(Czas.Teraz/Czas.Razem))/8, 0); glVertex2f(x+width*(Czas.Teraz/Czas.Razem), y);
+ glTexCoord2f((width*(Czas.Teraz/Czas.Razem))/8, 1); glVertex2f(x+width*(Czas.Teraz/Czas.Razem), y+height);
glTexCoord2f(0, 1); glVertex2f(x, y+height);
glEnd;
diff --git a/Skins/Deluxe/Autumn.ini b/Skins/Deluxe/Autumn.ini index 7f40c0f3..c3f55420 100644 --- a/Skins/Deluxe/Autumn.ini +++ b/Skins/Deluxe/Autumn.ini @@ -54,11 +54,11 @@ LyricBar = [sing]textBar.jpg #this one slides in, to tell you that singing starts immediately
LyricHelpBar = [sing]lyricsHelpBar.bmp
-#the time progress bar (not skinned in this theme :P )
+#the bar behind the timestuff
TimeBar1 = [sing]timeBarBG.jpg
-#the bar behind the timestuff
-TimeBar2 = [sing]timeBar.jpg
+#the time progress bar (not skinned in this theme :P )
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.jpg
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini index b58d2999..f8169b52 100644 --- a/Skins/Deluxe/Blue.ini +++ b/Skins/Deluxe/Blue.ini @@ -53,11 +53,11 @@ LyricBar = [sing]textBar.jpg #this one slides in, to tell you that singing starts immediately
LyricHelpBar = [sing]lyricsHelpBar.bmp
-#the time progress bar (not skinned in this theme :P )
+#the bar behind the timestuff
TimeBar1 = [sing]timeBarBG.jpg
-#the bar behind the timestuff
-TimeBar2 = [sing]timeBar.jpg
+#the time progress bar (not skinned in this theme :P )
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.jpg
diff --git a/Skins/Deluxe/Summer.ini b/Skins/Deluxe/Summer.ini index a362d3d4..0cf173fd 100644 --- a/Skins/Deluxe/Summer.ini +++ b/Skins/Deluxe/Summer.ini @@ -53,11 +53,11 @@ LyricBar = [sing]textBar.jpg #this one slides in, to tell you that singing starts immediately
LyricHelpBar = [sing]lyricsHelpBar.bmp
-#the time progress bar (not skinned in this theme :P )
+#the bar behind the timestuff
TimeBar1 = [sing]timeBarBG.jpg
-#the bar behind the timestuff
-TimeBar2 = [sing]timeBar.jpg
+#the time progress bar (not skinned in this theme :P )
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.jpg
diff --git a/Skins/Deluxe/Winter.ini b/Skins/Deluxe/Winter.ini index 27ca9007..5112dbc1 100644 --- a/Skins/Deluxe/Winter.ini +++ b/Skins/Deluxe/Winter.ini @@ -53,11 +53,11 @@ LyricBar = [sing]textBar.jpg #this one slides in, to tell you that singing starts immediately
LyricHelpBar = [sing]lyricsHelpBar.bmp
-#the time progress bar (not skinned in this theme :P )
+#the bar behind the timestuff
TimeBar1 = [sing]timeBarBG.jpg
-#the bar behind the timestuff
-TimeBar2 = [sing]timeBar.jpg
+#the time progress bar (not skinned in this theme :P )
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.jpg
diff --git a/Skins/Deluxe/[sing]timeBar.jpg b/Skins/Deluxe/[sing]timeBar.jpg Binary files differindex e1cc3bf4..cc5cb552 100644 --- a/Skins/Deluxe/[sing]timeBar.jpg +++ b/Skins/Deluxe/[sing]timeBar.jpg diff --git a/Skins/Deluxe/[sing]timeBar1.jpg b/Skins/Deluxe/[sing]timeBar1.jpg Binary files differdeleted file mode 100644 index 924a2e9b..00000000 --- a/Skins/Deluxe/[sing]timeBar1.jpg +++ /dev/null |
![Skins/Deluxe/[sing]timeBar.jpg](/usdx/tree/Skins/Deluxe/[sing]timeBar.jpg?h=svn/1.1-rc&id=4ddd757d3ee4fa079d8601e03dec0522940070cf){kind=link}
![Skins/Deluxe/[sing]timeBar.jpg](/usdx/tree/Skins/Deluxe/[sing]timeBar.jpg?h=svn/1.1-rc&id=e82d6d67a61bc5437074e9fe20a35d2c3945e6ab){kind=link}
![Skins/Deluxe/[sing]timeBar1.jpg](/usdx/tree/Skins/Deluxe/[sing]timeBar1.jpg?h=svn/1.1-rc&id=4ddd757d3ee4fa079d8601e03dec0522940070cf){kind=link}