Merge pull request #43 from flokuep/develop

merge flokuep/Vocaluxe/develop into develop
This commit is contained in:
Alexander Eckart committed 2012-12-02 06:04:03 -08:00
commit 80040bcc59
4 files changed
+21 -5

No files matched your search

@@ -497,13 +497,13 @@
<H>50</H> <H>50</H>
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height--> <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
<ArrowLeftX>505</ArrowLeftX> <ArrowLeftX>505</ArrowLeftX>
<ArrowLeftY>225</ArrowLeftY> <ArrowLeftY>285</ArrowLeftY>
<ArrowLeftZ>0,00</ArrowLeftZ> <ArrowLeftZ>0,00</ArrowLeftZ>
<ArrowLeftW>40</ArrowLeftW> <ArrowLeftW>40</ArrowLeftW>
<ArrowLeftH>40</ArrowLeftH> <ArrowLeftH>40</ArrowLeftH>
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height--> <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
<ArrowRightX>1170</ArrowRightX> <ArrowRightX>1170</ArrowRightX>
<ArrowRightY>225</ArrowRightY> <ArrowRightY>285</ArrowRightY>
<ArrowRightZ>0,00</ArrowRightZ> <ArrowRightZ>0,00</ArrowRightZ>
<ArrowRightW>40</ArrowRightW> <ArrowRightW>40</ArrowRightW>
<ArrowRightH>40</ArrowRightH> <ArrowRightH>40</ArrowRightH>
@@ -540,4 +540,4 @@
<NumVisible>3</NumVisible> <NumVisible>3</NumVisible>
</SelectSlideVideosToBackground> </SelectSlideVideosToBackground>
</ScreenOptionsVideo> </ScreenOptionsVideo>
</root> </root>
+5
View File
@@ -46,6 +46,11 @@ namespace Vocaluxe.Lib.Song
get { return _CoverLoaded; } get { return _CoverLoaded; }
} }
public bool NotesLoaded
{
get { return _NotesLoaded; }
}
public bool CoverBigLoaded = false; public bool CoverBigLoaded = false;
public bool BackgroundLoaded = false; public bool BackgroundLoaded = false;
+10 -1
View File
@@ -258,7 +258,16 @@ namespace Vocaluxe.Screens
player = _Points.GetPlayer(_Round - 1, CGame.NumPlayer); player = _Points.GetPlayer(_Round - 1, CGame.NumPlayer);
for (int p = 0; p < player.Length; p++) for (int p = 0; p < player.Length; p++)
{ {
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name; if (!song.IsDuet)
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
else
if(player[p].LineNr == 0 && song.DuetPart1 != "Part 1")
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart1 + ")";
else if(player[p].LineNr == 1 && song.DuetPart2 != "Part 2")
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart2 + ")";
else
Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS"); Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
if (CGame.NumPlayer <= 3) if (CGame.NumPlayer <= 3)
{ {
+3 -1
View File
@@ -937,9 +937,11 @@ namespace Vocaluxe.Screens
float dt = 4f; float dt = 4f;
float rt = dt * 0.8f; float rt = dt * 0.8f;
CSong Song = CGame.GetSong(); CSong Song = CGame.GetSong();
if (Song == null) if (Song == null)
return null; return null;
else if (!Song.NotesLoaded)
return null;
float[] Alpha = new float[Song.Notes.Lines.Length * 2]; float[] Alpha = new float[Song.Notes.Lines.Length * 2];
CLines[] lines = new CLines[Song.Notes.Lines.Length]; CLines[] lines = new CLines[Song.Notes.Lines.Length];