aboutsummaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-11-03 14:53:17 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-11-03 14:53:17 +0000
commitd33f56a40d9e8325a2782f90bb253dece5127c5f (patch)
tree900bf17f151709a17f2371371e7135bcf96357da /src/base
parent2b125425a66f54922e8aaf34c2a616c43f024f11 (diff)
downloadusdx-d33f56a40d9e8325a2782f90bb253dece5127c5f.tar.gz
usdx-d33f56a40d9e8325a2782f90bb253dece5127c5f.tar.xz
usdx-d33f56a40d9e8325a2782f90bb253dece5127c5f.zip
All comments are English now (Polish ones have been translated)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1498 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/base')
-rw-r--r--src/base/UDraw.pas25
-rw-r--r--src/base/UGraphic.pas11
-rw-r--r--src/base/USkins.pas2
-rw-r--r--src/base/USong.pas4
4 files changed, 21 insertions, 21 deletions
diff --git a/src/base/UDraw.pas b/src/base/UDraw.pas
index d3f19019..97b526c5 100644
--- a/src/base/UDraw.pas
+++ b/src/base/UDraw.pas
@@ -81,9 +81,6 @@ var
TickOld: cardinal;
TickOld2:cardinal;
-const
- Przedz = 32;
-
implementation
uses
@@ -307,8 +304,8 @@ begin
end //Else all Notes same Color
else
glColor4f(1, 1, 1, 1); // We set alpha to 1, cause we can control the transparency through the png itself
- // Czesci == teil, element == piece, element | koniec == end / ending
- // lewa czesc - left part
+
+ // left part
Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
Rec.Right := Rec.Left + NotesW;
Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
@@ -327,7 +324,7 @@ begin
// middle part
Rec.Left := Rec.Right;
- Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX; // Dlugosc == length
+ Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
glBindTexture(GL_TEXTURE_2D, Tex_plain_Mid[PlayerNumber].TexNum);
glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
@@ -428,7 +425,7 @@ begin
Rec.Left := Rec.Right;
Rec.Right := X + (Start+Length-Lines[0].Line[Lines[0].Current].Note[0].Start) * TempR - NotesW - 0.5 + 10*ScreenX;
- // (nowe) - dunno
+ // new
if (Start+Length-1 = LyricsState.CurrentBeatD) then
Rec.Right := Rec.Right - (1-Frac(LyricsState.MidBeatD)) * TempR;
// the left note is more right than the right note itself, sounds weird - so we fix that xD
@@ -527,10 +524,10 @@ begin
W := NotesW * 2 + 2;
H := NotesH * 1.5 + 3.5;
- X2 := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX + 4; // wciecie
+ X2 := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX + 4;
X1 := X2-W;
- X3 := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie
+ X3 := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - 0.5 + 10*ScreenX - 4;
X4 := X3+W;
// left
@@ -547,7 +544,7 @@ begin
glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
glEnd;
- // srodkowa czesc
+ // middle part
Rec.Left := X2;
Rec.Right := X3;
@@ -559,7 +556,7 @@ begin
glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
glEnd;
- // prawa czesc
+ // right part
Rec.Left := X3;
Rec.Right := X4;
@@ -1276,7 +1273,7 @@ begin
- // lewa czesc - left part
+ // left part
Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
Rec.Right := Rec.Left + NotesW;
Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
@@ -1289,7 +1286,7 @@ begin
glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
glEnd;
- // srodkowa czesc - middle part
+ // middle part
Rec.Left := Rec.Right;
Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
@@ -1301,7 +1298,7 @@ begin
glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
glEnd;
- // prawa czesc - right part
+ // right part
Rec.Left := Rec.Right;
Rec.Right := Rec.Right + NotesW;
diff --git a/src/base/UGraphic.pas b/src/base/UGraphic.pas
index b525c170..c328d016 100644
--- a/src/base/UGraphic.pas
+++ b/src/base/UGraphic.pas
@@ -301,10 +301,13 @@ var
Col: integer;
begin
Log.LogStatus('Loading Textures', 'LoadTextures');
-
- Tex_Left[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayLeft'), TEXTURE_TYPE_TRANSPARENT, 0); //brauch man die noch?
- Tex_Mid[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayMid'), TEXTURE_TYPE_PLAIN, 0); //brauch man die noch?
- Tex_Right[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayRight'), TEXTURE_TYPE_TRANSPARENT, 0); //brauch man die noch?
+
+ // FIXME: do we need this? (REMOVE otherwise)
+ Tex_Left[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayLeft'), TEXTURE_TYPE_TRANSPARENT, 0);
+ // FIXME: do we need this? (REMOVE otherwise)
+ Tex_Mid[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayMid'), TEXTURE_TYPE_PLAIN, 0);
+ // FIXME: do we need this? (REMOVE otherwise)
+ Tex_Right[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayRight'), TEXTURE_TYPE_TRANSPARENT, 0);
Log.LogStatus('Loading Textures - A', 'LoadTextures');
diff --git a/src/base/USkins.pas b/src/base/USkins.pas
index df736684..59c590e5 100644
--- a/src/base/USkins.pas
+++ b/src/base/USkins.pas
@@ -78,7 +78,7 @@ constructor TSkin.Create;
begin
inherited;
LoadList;
-// LoadSkin('Lisek');
+// LoadSkin('...');
// SkinColor := Color;
end;
diff --git a/src/base/USong.pas b/src/base/USong.pas
index cff56c1d..525f7bcc 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -985,7 +985,7 @@ begin
If (Lines[LineNumberP].Line[Lines[LineNumberP].High].HighNote <> -1) then
begin //Update old Sentence if it has notes and create a new sentence
- // stara czesc //Alter Satz //Update Old Part
+ // Update old part
Lines[LineNumberP].Line[Lines[LineNumberP].High].BaseNote := Base[LineNumberP];
Lines[LineNumberP].Line[Lines[LineNumberP].High].LyricWidth := glTextWidth(Lines[LineNumberP].Line[Lines[LineNumberP].High].Lyric);
@@ -1002,7 +1002,7 @@ begin
//Total Notes Patch End
- // nowa czesc //Neuer Satz //Update New Part
+ // Update new part
SetLength(Lines[LineNumberP].Line, Lines[LineNumberP].Number + 1);
Lines[LineNumberP].High := Lines[LineNumberP].High + 1;
Lines[LineNumberP].Number := Lines[LineNumberP].Number + 1;