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

Merge branch 'develop' into XPositionFix_SongList

Browse Source
This commit is contained in:
Stefan authored and GitHub committed 2020-02-04 15:39:56 +01:00
2 parents 9f3af316fa 2cfc1786dc
commit 42cdea4647
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Extensions.cs
+4 -4
View File
@@ -171,10 +171,10 @@ namespace VocaluxeLib
public static SRectF Scale(this SRectF rect, float scale) public static SRectF Scale(this SRectF rect, float scale)
{ {
return new SRectF( return new SRectF(
rect.X - rect.W * (scale - 1f), rect.X - rect.W * (scale - 1f) * 0.5f,
rect.Y - rect.H * (scale - 1f), rect.Y - rect.H * (scale - 1f) * 0.5f,
rect.W + 2 * rect.W * (scale - 1f), rect.W * scale,
rect.H + 2 * rect.H * (scale - 1f), rect.H * scale,
rect.Z); rect.Z);
} }
VocaluxeLib/Songs/CSongLoader.cs
+3 -1
View File
@@ -571,6 +571,8 @@ namespace VocaluxeLib.Songs
case ':': case ':':
case '*': case '*':
case 'F': case 'F':
case 'R': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
case 'G': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
string[] noteData = line.Split(splitChars, 4); string[] noteData = line.Split(splitChars, 4);
if (noteData.Length < 4) if (noteData.Length < 4)
{ {
@@ -618,7 +620,7 @@ namespace VocaluxeLib.Songs
if (tag.Equals('*')) if (tag.Equals('*'))
noteType = ENoteType.Golden; noteType = ENoteType.Golden;
else if (tag.Equals('F')) else if (tag.Equals('F') || tag.Equals('R') || tag.Equals('G')) // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
noteType = ENoteType.Freestyle; noteType = ENoteType.Freestyle;
else else
noteType = ENoteType.Normal; noteType = ENoteType.Normal;