Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9ed7238
Reworked data model for percussion elements
Danielku15 Jul 28, 2020
b4d98bc
Reworked percussion handling to match GP7 look&feel
Danielku15 Jul 29, 2020
029063f
Some test fixes
Danielku15 Jul 29, 2020
939f572
Reworked beat effect positioning
Danielku15 Jul 31, 2020
5dfc370
Read percussion line information from GP files
Danielku15 Jul 31, 2020
5416572
Replace úsages of getScoreY where a getScoreHeight is needed.
Danielku15 Aug 2, 2020
015ffa4
Adjusted various alignments for new positioning system
Danielku15 Aug 23, 2020
3f7d3bb
Adjusted rest positioning and stem sizes
Danielku15 Aug 23, 2020
d1bb0a8
Visual optimizations + helper on tests to compare images
Danielku15 Aug 23, 2020
43609f6
Merge branch 'develop' into feature/issue94-singlepercussion
Danielku15 Sep 27, 2020
dc84a3c
Revert some visual changes
Danielku15 Sep 27, 2020
d02068e
Updating test data
Danielku15 Sep 27, 2020
a83912c
Updated test data and added high DPI upscaling for Html5
Danielku15 Sep 27, 2020
0761dbf
Wip rework positioning
Danielku15 Oct 3, 2020
514ac35
Updated beaming helper to new positioning
Danielku15 Oct 17, 2020
eec634b
Read Instrument Articulations from GP files if available.
Danielku15 Oct 17, 2020
54b9f39
Export new model classes.
Danielku15 Oct 17, 2020
c732463
Docs
Danielku15 Oct 17, 2020
9763920
Remove upscaling
Danielku15 Oct 17, 2020
d54079d
Add technique symbol reading
Danielku15 Oct 17, 2020
9e3aa31
Updated score beaming logic
Danielku15 Oct 17, 2020
b788f20
Updated test data
Danielku15 Oct 17, 2020
a8525e0
Update midi generation
Danielku15 Oct 17, 2020
d6e0056
Restored correct GP6 percussion mapping
Danielku15 Oct 17, 2020
bcc071f
Compilation and test issues fix
Danielku15 Oct 17, 2020
8fc43bc
Restore backwards compatibility with old element/variation system
Danielku15 Oct 17, 2020
86e8748
Tests and cleanup
Danielku15 Oct 17, 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
1 change: 1 addition & 0 deletions src.csharp/AlphaTab/Core/Globals.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace AlphaTab.Core
{
public static class Globals
{
public const double NaN = double.NaN;
public static Console Console { get; } = new Console();

public static double ParseInt(string s)
Expand Down
3 changes: 2 additions & 1 deletion src.csharp/AlphaTab/Platform/CSharp/GdiCanvas.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using AlphaTab.Rendering.Glyphs;
using AlphaTab.Model;
using AlphaTab.Rendering.Glyphs;
using System;
using System.Collections.Generic;
using System.Drawing;
Expand Down
10 changes: 7 additions & 3 deletions src/Environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import { TripletFeelEffectInfo } from '@src/rendering/effects/TripletFeelEffectI
import { WhammyBarEffectInfo } from '@src/rendering/effects/WhammyBarEffectInfo';
import { WideBeatVibratoEffectInfo } from '@src/rendering/effects/WideBeatVibratoEffectInfo';
import { WideNoteVibratoEffectInfo } from '@src/rendering/effects/WideNoteVibratoEffectInfo';
import { MusicFontSymbol } from '@src/rendering/glyphs/MusicFontSymbol';
import { MusicFontSymbol } from '@src/model/MusicFontSymbol';
import { EffectBarRendererInfo } from '@src/rendering/EffectBarRendererInfo';
import { IScoreRenderer } from '@src/rendering/IScoreRenderer';
import { HorizontalScreenLayout } from '@src/rendering/layout/HorizontalScreenLayout';
Expand Down Expand Up @@ -85,6 +85,10 @@ export class RenderEngineFactory {
* @partial
*/
export class Environment {
/**
* The font size of the music font in pixel.
*/
public static readonly MusicFontSize = 34;
/**
* @target web
*/
Expand Down Expand Up @@ -125,7 +129,7 @@ export class Environment {
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 34px;
font-size: ${Environment.MusicFontSize}px;
overflow: visible !important;
}`;

Expand Down Expand Up @@ -175,7 +179,7 @@ export class Environment {
*/
public static bravuraFontChecker: FontLoadingChecker = new FontLoadingChecker(
'alphaTab',
`&#${MusicFontSymbol.ClefG};`
`&#${MusicFontSymbol.GClef};`
);

/**
Expand Down
4 changes: 4 additions & 0 deletions src/alphatab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,13 @@ import { Fingers } from '@src/model/Fingers';
import { FontStyle, Font } from '@src/model/Font';
import { GraceType } from '@src/model/GraceType';
import { HarmonicType } from '@src/model/HarmonicType';
import { InstrumentArticulation } from '@src/model/InstrumentArticulation';
import { JsonConverter } from '@src/model/JsonConverter';
import { KeySignature } from '@src/model/KeySignature';
import { KeySignatureType } from '@src/model/KeySignatureType';
import { Lyrics } from '@src/model/Lyrics';
import { MasterBar } from '@src/model/MasterBar';
import { MusicFontSymbol } from '@src/model/MusicFontSymbol';
import { Note } from '@src/model/Note';
import { NoteAccidentalMode } from '@src/model/NoteAccidentalMode';
import { Ottavia } from '@src/model/Ottavia';
Expand Down Expand Up @@ -231,11 +233,13 @@ export const model = {
Font,
GraceType,
HarmonicType,
InstrumentArticulation,
JsonConverter,
KeySignature,
KeySignatureType,
Lyrics,
MasterBar,
MusicFontSymbol,
Note,
NoteAccidentalMode,
Ottavia,
Expand Down
6 changes: 6 additions & 0 deletions src/importer/Gp3To5Importer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,12 @@ export class Gp3To5Importer extends ScoreImporter {
if ((flags & 0x08) !== 0) {
this.readNoteEffects(track, voice, beat, newNote);
}

if(bar.staff.isPercussion) {
newNote.percussionArticulation = newNote.fret;
newNote.string = -1;
newNote.fret = -1;
}
return newNote;
}

Expand Down
Loading