Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added option to draw score-animation vertical.

Browse Source
This commit is contained in:
Florian Küpper committed 2012-12-28 15:17:32 +01:00
1 parent 907ec1f1cb
commit eaae3173d5
3 files changed
+28 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenScore.xml
+4
View File
@@ -3757,5 +3757,9 @@
<Type>Int</Type> <Type>Int</Type>
<Value>4</Value> <Value>4</Value>
</ScreenSettingShortDifficulty> </ScreenSettingShortDifficulty>
<ScreenSettingAnimationDirection>
<Type>String</Type>
<Value>Vertical</Value>
</ScreenSettingAnimationDirection>
</ScreenScore> </ScreenScore>
</root> </root>
Output/Themes/Changelog/Changelog_ScreenScore.txt
+1 -1
View File
@@ -2,7 +2,7 @@ ScreenScore
++++++++++ ++++++++++
Version 3: Version 3:
Add <ScreenSettingShortScore>, <ScreenSettingShortRating>, <ScreenSettingShortDifficulty> to change text-string with player-num >= <Value> Add <ScreenSettingShortScore>, <ScreenSettingShortRating>, <ScreenSettingShortDifficulty> to change text-string with player-num >= <Value>
Add <ScreenSettingAnimationDirection>, set <Value> to "vertical" to draw animation in vertical direction.
++++++++++ ++++++++++
Version 2: Version 2:
Vocaluxe/Screens/CScreenScore.cs
+23 -5
View File
@@ -22,6 +22,7 @@ namespace Vocaluxe.Screens
private const string ScreenSettingShortScore = "ScreenSettingShortScore"; private const string ScreenSettingShortScore = "ScreenSettingShortScore";
private const string ScreenSettingShortRating = "ScreenSettingShortRating"; private const string ScreenSettingShortRating = "ScreenSettingShortRating";
private const string ScreenSettingShortDifficulty = "ScreenSettingShortDifficulty"; private const string ScreenSettingShortDifficulty = "ScreenSettingShortDifficulty";
private const string ScreenSettingAnimationDirection = "ScreenSettingAnimationDirection";
private string[,] TextNames; private string[,] TextNames;
private string[,] TextScores; private string[,] TextScores;
@@ -58,7 +59,7 @@ namespace Vocaluxe.Screens
_ThemeStatics = statics.ToArray(); _ThemeStatics = statics.ToArray();
_ThemeScreenSettings = new string[] { ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty }; _ThemeScreenSettings = new string[] { ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty, ScreenSettingAnimationDirection };
StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer]; StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer];
} }
@@ -157,8 +158,16 @@ namespace Vocaluxe.Screens
{ {
StaticPointsBarDrawnPoints[p] = player[p].Points; StaticPointsBarDrawnPoints[p] = player[p].Points;
} }
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = ((float)StaticPointsBarDrawnPoints[p]) * (Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H / 10000); string direction = (string) ScreenSettings[htScreenSettings(ScreenSettingAnimationDirection)].GetValue();
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.Y = Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H + Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.Y - Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H; if (direction.ToLower() == "vertical")
{
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.W = ((float)StaticPointsBarDrawnPoints[p]) * (Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.W / 10000);
}
else
{
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = ((float)StaticPointsBarDrawnPoints[p]) * (Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H / 10000);
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.Y = Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H + Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.Y - Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H;
}
} }
} }
} }
@@ -335,9 +344,18 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_RATING") + ": " + CLanguage.Translate(GetRating((int)Math.Round(player[p].Points))); Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate("TR_SCREENSCORE_RATING") + ": " + CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
else else
Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate(GetRating((int)Math.Round(player[p].Points))); Texts[htTexts(TextRatings[p, CGame.NumPlayer - 1])].Text = CLanguage.Translate(GetRating((int)Math.Round(player[p].Points)));
StaticPointsBarDrawnPoints[p] = 0.0; StaticPointsBarDrawnPoints[p] = 0.0;
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = 0; string direction = (string)ScreenSettings[htScreenSettings(ScreenSettingAnimationDirection)].GetValue();
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.Y = Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H + Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.Y - Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H; if (direction.ToLower() == "vertical")
{
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.W = 0;
}
else
{
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H = 0;
Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.Y = Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.H + Statics[htStatics(StaticPointsBarBG[p, CGame.NumPlayer - 1])].Rect.Y - Statics[htStatics(StaticPointsBar[p, CGame.NumPlayer - 1])].Rect.H;
}
if (player[p].ProfileID >= 0 && player[p].ProfileID < CProfiles.NumProfiles) if (player[p].ProfileID >= 0 && player[p].ProfileID < CProfiles.NumProfiles)
Statics[htStatics(StaticAvatar[p, CGame.NumPlayer - 1])].Texture = CProfiles.Profiles[player[p].ProfileID].Avatar.Texture; Statics[htStatics(StaticAvatar[p, CGame.NumPlayer - 1])].Texture = CProfiles.Profiles[player[p].ProfileID].Avatar.Texture;
} }