From eb2e9b8c5ca691a00634675f724272526272e0c1 Mon Sep 17 00:00:00 2001 From: Jiiniasu Date: Sun, 15 Jul 2018 00:04:21 +0200 Subject: [PATCH 1/2] Fix: Proper Scaling Function scaled 2 * scale instead of scale. --- VocaluxeLib/Extensions.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VocaluxeLib/Extensions.cs b/VocaluxeLib/Extensions.cs index 5e36958d..ab91177c 100644 --- a/VocaluxeLib/Extensions.cs +++ b/VocaluxeLib/Extensions.cs @@ -171,10 +171,10 @@ namespace VocaluxeLib public static SRectF Scale(this SRectF rect, float scale) { return new SRectF( - rect.X - rect.W * (scale - 1f), - rect.Y - rect.H * (scale - 1f), - rect.W + 2 * rect.W * (scale - 1f), - rect.H + 2 * rect.H * (scale - 1f), + rect.X - rect.W * (scale - 1f) * 0.5f, + rect.Y - rect.H * (scale - 1f) * 0.5f, + rect.W * scale, + rect.H * scale, rect.Z); } From 74ebbe1f1fdf2e00a4ae54ae8d9a7886565bc538 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 4 Feb 2020 08:24:10 +0100 Subject: [PATCH 2/2] Read R (RAP) and G (Golden RAP) notes as Freestyle notes Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed! As mentioned in #479 this fix the song loading of songs, which contains R or G notes. But Vocaluxe still don't support these kind of notes, so the final implementation is needed. If someone wants to work on it, feel free. --- VocaluxeLib/Songs/CSongLoader.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs index ca642b4c..762e9d3c 100644 --- a/VocaluxeLib/Songs/CSongLoader.cs +++ b/VocaluxeLib/Songs/CSongLoader.cs @@ -571,6 +571,8 @@ namespace VocaluxeLib.Songs case ':': case '*': 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); if (noteData.Length < 4) { @@ -618,7 +620,7 @@ namespace VocaluxeLib.Songs if (tag.Equals('*')) 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; else noteType = ENoteType.Normal;