Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for combined slidein slideout on notes #330

Merged
merged 6 commits into from
Feb 14, 2020
Merged

Added support for combined slidein slideout on notes #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
281ba8d
Updated data model
Danielku15 Feb 14, 2020
9692d6b
Updated importers
Danielku15 Feb 14, 2020
689aebd
Updated midi generator
Danielku15 Feb 14, 2020
0a5c35c
Updated rendering
Danielku15 Feb 14, 2020
8a69d44
Updated docs
Danielku15 Feb 14, 2020
4dbcc28
Reviewed visual changes and updated test suite
Danielku15 Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/input/alphatex/note-effects.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ TexSample: true
3.3{sl} 4.3 3.3{ss} 4.3 |
// slides (into-from-below, intro-from-above, out-up, out-down)
3.3{sib} 3.3{sia} 3.3{sou} 3.3{sod} |
// slides (combined)
3.3{sib sou} 3.3{sib sod} 3.3{sia sod} 3.3{sia sou} |
// pick-slides (down and up)
x.3{psd} 3.3 |
x.3{psu} 3.3 |
Expand Down
26 changes: 13 additions & 13 deletions Source/AlphaTab.Test/Importer/AlphaTexImporterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,25 +724,25 @@ public void TestSlides()
Assert.AreEqual(1, score.Tracks.Count);
Assert.AreEqual(4, score.MasterBars.Count);

Assert.AreEqual(SlideType.Legato, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.Legato, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Notes[0].Id,
score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].SlideTarget.Id);

Assert.AreEqual(SlideType.Shift, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.Shift, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[1].Notes[0].Id,
score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].SlideTarget.Id);

Assert.AreEqual(SlideType.IntoFromBelow,
score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideType.IntoFromAbove,
score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[1].Notes[0].SlideType);
Assert.AreEqual(SlideType.OutUp, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[2].Notes[0].SlideType);
Assert.AreEqual(SlideType.OutDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[3].Notes[0].SlideType);

Assert.AreEqual(SlideType.PickSlideDown,
score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideType.PickSlideUp,
score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[1].Notes[0].SlideType);
Assert.AreEqual(SlideInType.IntoFromBelow,
score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[0].Notes[0].SlideInType);
Assert.AreEqual(SlideInType.IntoFromAbove,
score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[1].Notes[0].SlideInType);
Assert.AreEqual(SlideOutType.OutUp, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[2].Notes[0].SlideOutType);
Assert.AreEqual(SlideOutType.OutDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[3].Notes[0].SlideOutType);

Assert.AreEqual(SlideOutType.PickSlideDown,
score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(SlideOutType.PickSlideUp,
score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[1].Notes[0].SlideOutType);
}

[TestMethod]
Expand Down
10 changes: 5 additions & 5 deletions Source/AlphaTab.Test/Importer/Gp3ImporterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ public void TestAccentuation()
}

[TestMethod]
public void TestGuitarPro3Harmonics()
public void TestGuitarPro3Harmonics()
{
// TODO: Find out about GP3 harmonics!
//var reader = PrepareImporterWithFile("GuitarPro3/TestHarmonics.gp3");
//var score = reader.ReadScore();

//Assert.AreEqual(HarmonicType.Natural, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].HarmonicType);
//Assert.AreEqual(HarmonicType.Artificial, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Notes[0].HarmonicType);
}
Expand Down Expand Up @@ -120,14 +120,14 @@ public void TestSlides()
{
var score = reader.ReadScore();

Assert.AreEqual(SlideType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].GetNoteOnString(2).SlideType);
Assert.AreEqual(SlideOutType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].GetNoteOnString(5).SlideOutType);
Assert.AreEqual(SlideOutType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].GetNoteOnString(2).SlideOutType);
Render(score);
});
}

[TestMethod, AsyncTestMethod]
public void TestGuitarPro3Vibrato()
public void TestGuitarPro3Vibrato()
{
// TODO: Check why this vibrato is not recognized
PrepareImporterWithFile("GuitarPro3/TestVibrato.gp3", reader =>
Expand Down
26 changes: 13 additions & 13 deletions Source/AlphaTab.Test/Importer/Gp7ImporterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,51 +1110,51 @@ public void TestPickSlide()
{
var score = reader.ReadScore();

Assert.AreEqual(SlideType.PickSlideUp, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideUp, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].Fret);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].Notes[0].SlideOutType);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].Notes[0].Fret);
Assert.AreEqual(0, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[3].Notes[0].Fret);


Assert.AreEqual(SlideType.PickSlideUp, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideUp, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(0, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].Notes[0].Fret);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[1].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[2].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[2].Notes[0].SlideOutType);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[2].Notes[0].Fret);
Assert.AreEqual(5, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[3].Notes[0].Fret);


Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(20, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[0].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[1].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[1].Notes[0].SlideOutType);
Assert.AreEqual(12, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[1].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[2].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[2].Notes[0].SlideOutType);
Assert.AreEqual(5, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[2].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[3].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[3].Notes[0].SlideOutType);
Assert.AreEqual(0, score.Tracks[0].Staves[0].Bars[2].Voices[0].Beats[3].Notes[0].Fret);


Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(20, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[0].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[1].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[1].Notes[0].SlideOutType);
Assert.AreEqual(12, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[1].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideUp, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[2].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideUp, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[2].Notes[0].SlideOutType);
Assert.AreEqual(5, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[2].Notes[0].Fret);

Assert.AreEqual(SlideType.PickSlideUp, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[3].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideUp, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[3].Notes[0].SlideOutType);
Assert.AreEqual(10, score.Tracks[0].Staves[0].Bars[3].Voices[0].Beats[3].Notes[0].Fret);


Assert.AreEqual(SlideType.PickSlideDown, score.Tracks[0].Staves[0].Bars[4].Voices[0].Beats[0].Notes[0].SlideType);
Assert.AreEqual(SlideOutType.PickSlideDown, score.Tracks[0].Staves[0].Bars[4].Voices[0].Beats[0].Notes[0].SlideOutType);
Assert.AreEqual(20, score.Tracks[0].Staves[0].Bars[4].Voices[0].Beats[0].Notes[0].Fret);

Render(score);
Expand Down
12 changes: 6 additions & 6 deletions Source/AlphaTab.Test/Importer/GpImporterTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ protected void CheckTremolo(Score score)

protected void CheckSlides(Score score)
{
Assert.AreEqual(SlideType.Legato, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].GetNoteOnString(2).SlideType);
Assert.AreEqual(SlideType.IntoFromBelow, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideType.IntoFromAbove, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[1].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideType.OutDown, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[2].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideType.OutUp, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[3].GetNoteOnString(5).SlideType);
Assert.AreEqual(SlideOutType.Legato, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].GetNoteOnString(5).SlideOutType);
Assert.AreEqual(SlideOutType.Shift, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[2].GetNoteOnString(2).SlideOutType);
Assert.AreEqual(SlideInType.IntoFromBelow, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[0].GetNoteOnString(5).SlideInType);
Assert.AreEqual(SlideInType.IntoFromAbove, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[1].GetNoteOnString(5).SlideInType);
Assert.AreEqual(SlideOutType.OutDown, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[2].GetNoteOnString(5).SlideOutType);
Assert.AreEqual(SlideOutType.OutUp, score.Tracks[0].Staves[0].Bars[1].Voices[0].Beats[3].GetNoteOnString(5).SlideOutType);
}

protected void CheckStrings(Score score)
Expand Down
3 changes: 2 additions & 1 deletion Source/AlphaTab.Test/Importer/MusicXmlImporterTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ protected void AreEqual(Note expected, Note actual)
Assert.AreEqual(expected.IsPalmMute, actual.IsPalmMute, "Mismatch on IsPalmMute");
Assert.AreEqual(expected.IsDead, actual.IsDead, "Mismatch on IsDead");
Assert.AreEqual(expected.IsStaccato, actual.IsStaccato, "Mismatch on IsStaccato");
Assert.AreEqual(expected.SlideType, actual.SlideType, "Mismatch on SlideType");
Assert.AreEqual(expected.SlideInType, actual.SlideInType, "Mismatch on SlideInType");
Assert.AreEqual(expected.SlideOutType, actual.SlideOutType, "Mismatch on SlideOutType");
Assert.AreEqual(expected.Vibrato, actual.Vibrato, "Mismatch on Vibrato");
Assert.AreEqual(expected.IsTieDestination, actual.IsTieDestination, "Mismatch on IsTieDestination");
Assert.AreEqual(expected.IsTieOrigin, actual.IsTieOrigin, "Mismatch on IsTieOrigin");
Expand Down
2 changes: 1 addition & 1 deletion Source/AlphaTab/Audio/Generator/MidiFileGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ private void GenerateNote(Note note, int beatStart, int beatDuration, int[] brus
{
GenerateWhammy(note.Beat, noteStart, noteDuration, channel);
}
else if (note.SlideType != SlideType.None)
else if (note.SlideInType != SlideInType.None || note.SlideOutType != SlideOutType.None)
{
// TODO GenerateSlide(note, noteStart, noteDuration, noteKey, dynamicValue, channel);
}
Expand Down
12 changes: 6 additions & 6 deletions Source/AlphaTab/Exporter/AlphaTexExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace AlphaTab.Exporter
{
/// <summary>
/// This class allows converting scores into alphaTex.
/// This class allows converting scores into alphaTex.
/// </summary>
// ReSharper disable once UnusedMember.Global
public class AlphaTexExporter
Expand All @@ -20,7 +20,7 @@ public AlphaTexExporter()
}

/// <summary>
/// Exports the given track.
/// Exports the given track.
/// </summary>
/// <param name="track">The track to export</param>
public void Export(Track track)
Expand All @@ -35,7 +35,7 @@ private void Score(Track track)
}

/// <summary>
/// Returns the generated tex code.
/// Returns the generated tex code.
/// </summary>
/// <returns></returns>
public string ToTex()
Expand Down Expand Up @@ -97,7 +97,7 @@ private void StringMetaData(string key, string value)

private void Bars(Track track)
{
// alphatab only supports single staves,
// alphatab only supports single staves,
for (var i = 0; i < 1; i++)
{
for (var j = 0; j < track.Staves[i].Bars.Count; j++)
Expand Down Expand Up @@ -250,13 +250,13 @@ private void NoteEffects(Note note)
_builder.Append("v ");
}

if (note.SlideType == SlideType.Legato)
if (note.SlideOutType == SlideOutType.Legato)
{
hasEffectOpen = EffectOpen(hasEffectOpen);
_builder.Append("sl ");
}

if (note.SlideType == SlideType.Shift)
if (note.SlideOutType == SlideOutType.Shift)
{
hasEffectOpen = EffectOpen(hasEffectOpen);
_builder.Append("ss ");
Expand Down
16 changes: 8 additions & 8 deletions Source/AlphaTab/Importer/AlphaTexImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,42 +1860,42 @@ private void NoteEffects(Note note)
else if (syData == "sl")
{
NewSy();
note.SlideType = SlideType.Legato;
note.SlideOutType = SlideOutType.Legato;
}
else if (syData == "ss")
{
NewSy();
note.SlideType = SlideType.Shift;
note.SlideOutType = SlideOutType.Shift;
}
else if (syData == "sib")
{
NewSy();
note.SlideType = SlideType.IntoFromBelow;
note.SlideInType = SlideInType.IntoFromBelow;
}
else if (syData == "sia")
{
NewSy();
note.SlideType = SlideType.IntoFromAbove;
note.SlideInType = SlideInType.IntoFromAbove;
}
else if (syData == "sou")
{
NewSy();
note.SlideType = SlideType.OutUp;
note.SlideOutType = SlideOutType.OutUp;
}
else if (syData == "sod")
{
NewSy();
note.SlideType = SlideType.OutDown;
note.SlideOutType = SlideOutType.OutDown;
}
else if (syData == "psd")
{
NewSy();
note.SlideType = SlideType.PickSlideDown;
note.SlideOutType = SlideOutType.PickSlideDown;
}
else if (syData == "psu")
{
NewSy();
note.SlideType = SlideType.PickSlideUp;
note.SlideOutType = SlideOutType.PickSlideUp;
}
else if (syData == "h")
{
Expand Down
Loading