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

Fix slide rendering on end of staves #1053

Merged
merged 3 commits into from
Nov 26, 2022
Merged

Fix slide rendering on end of staves #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3be0b39
Fix slide rendering on end of staves
Danielku15 Nov 26, 2022
7f19e11
Fix C# build
Danielku15 Nov 26, 2022
c0b620c
Fix builds
Danielku15 Nov 26, 2022
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
6 changes: 3 additions & 3 deletions src.csharp/AlphaTab.Test/VisualTests/VisualTestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace AlphaTab.VisualTests
{
partial class VisualTestHelper
{
private static async Task RunVisualTestScoreWithResize(Score score, IList<double> widths,
IList<string?> referenceImages, Settings? settings, IList<double>? tracks, string? message,
double tolerancePercent)
public static async Task RunVisualTestScoreWithResize(Score score, IList<double> widths,
IList<string?> referenceImages, Settings? settings = null, IList<double>? tracks = null, string? message = null,
double tolerancePercent = 1.0)
{
tracks ??= new List<double> { 0 };
PrepareSettingsForTest(ref settings);
Expand Down
12 changes: 5 additions & 7 deletions src/rendering/glyphs/ScoreSlideLineGlyph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ export class ScoreSlideLineGlyph extends Glyph {
private drawSlideOut(cx: number, cy: number, canvas: ICanvas): void {
let startNoteRenderer: ScoreBarRenderer = this.renderer as ScoreBarRenderer;
let sizeX: number = 12 * this.scale;
let startOffsetX: number = 3 * this.scale;
let endOffsetX: number = 1 * this.scale;
let offsetY: number = 2 * this.scale;
let startX: number = 0;
Expand All @@ -85,16 +84,15 @@ export class ScoreSlideLineGlyph extends Glyph {
startX =
cx +
startNoteRenderer.x +
startNoteRenderer.getBeatX(this._startNote.beat, BeatXPosition.PostNotes) +
startOffsetX;
startNoteRenderer.getBeatX(this._startNote.beat, BeatXPosition.PostNotes);
startY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Center);
if (this._startNote.slideTarget) {
let endNoteRenderer: BarRendererBase | null = this.renderer.scoreRenderer.layout!.getRendererForBar(
this.renderer.staff.staveId,
this._startNote.slideTarget.beat.voice.bar
) as BarRendererBase;
);
if (!endNoteRenderer || endNoteRenderer.staff !== startNoteRenderer.staff) {
endX = cx + startNoteRenderer.x + this._parent.x;
endX = cx + startNoteRenderer.x + startNoteRenderer.width;
endY = startY;
} else {
endX =
Expand Down Expand Up @@ -130,7 +128,7 @@ export class ScoreSlideLineGlyph extends Glyph {
endY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Bottom);
break;
case SlideOutType.PickSlideUp:
startX = cx + startNoteRenderer.x + startNoteRenderer.getNoteX(this._startNote, NoteXPosition.Right) + startOffsetX;
startX = cx + startNoteRenderer.x + startNoteRenderer.getNoteX(this._startNote, NoteXPosition.Right);
startY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Center);
endY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Top);
endX = cx + startNoteRenderer.x + startNoteRenderer.width;
Expand All @@ -146,7 +144,7 @@ export class ScoreSlideLineGlyph extends Glyph {
waves = true;
break;
case SlideOutType.PickSlideDown:
startX = cx + startNoteRenderer.x + startNoteRenderer.getNoteX(this._startNote, NoteXPosition.Right) + startOffsetX;
startX = cx + startNoteRenderer.x + startNoteRenderer.getNoteX(this._startNote, NoteXPosition.Right);
startY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Center);
endY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Bottom);
endX = cx + startNoteRenderer.x + startNoteRenderer.width;
Expand Down
6 changes: 3 additions & 3 deletions src/rendering/glyphs/TabSlideLineGlyph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ export class TabSlideLineGlyph extends Glyph {
startNoteRenderer.getBeatX(this._startNote.beat, BeatXPosition.PostNotes);
startY = cy + startNoteRenderer.y + startNoteRenderer.getNoteY(this._startNote, NoteYPosition.Center);
if (this._startNote.slideTarget) {
let endNoteRenderer: BarRendererBase = this.renderer.scoreRenderer.layout!.getRendererForBar(
let endNoteRenderer: BarRendererBase | null = this.renderer.scoreRenderer.layout!.getRendererForBar(
this.renderer.staff.staveId,
this._startNote.slideTarget.beat.voice.bar
)!;
);
if (!endNoteRenderer || endNoteRenderer.staff !== startNoteRenderer.staff) {
endX = cx + startNoteRenderer.x + this._parent.x;
endX = cx + startNoteRenderer.x + startNoteRenderer.width;
endY = startY;
} else {
endX =
Expand Down
Binary file added test-data/visual-tests/effects-and-annotations/brush - Copy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test-data/visual-tests/effects-and-annotations/slides-line-break.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/notation-legend/dead-default.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-data/visual-tests/notation-legend/dead-songbook.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions test/visualTests/features/EffectsAndAnnotations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { AlphaTexImporter } from '@src/importer/AlphaTexImporter';
import { ByteBuffer } from '@src/io/ByteBuffer';
import { Settings } from '@src/Settings';
import { VisualTestHelper } from '@test/visualTests/VisualTestHelper';

describe('EffectsAndAnnotationsTests', () => {
Expand Down Expand Up @@ -64,6 +67,22 @@ describe('EffectsAndAnnotationsTests', () => {
await VisualTestHelper.runVisualTest('effects-and-annotations/slides.gp');
});

it('slides-line-break', async () => {
const tex = `14.1.2 :8 17.2 15.1 14.1{h} 17.2{ss} | 18.2`;
const settings = new Settings();
settings.display.barsPerRow = 1;

const importer = new AlphaTexImporter();
importer.init(ByteBuffer.fromString(tex), settings);
let score = importer.readScore();

await VisualTestHelper.runVisualTestScoreWithResize(score,
[400],
['effects-and-annotations/slides-line-break.png'],
settings
);
});

it('trill', async () => {
await VisualTestHelper.runVisualTest('effects-and-annotations/trill.gp');
});
Expand Down