Skip to content

Commit 4a4c14d

Browse files
mike-lischkemike-lischke
committed
The member SoundType is now DisplayType as it's related to visualization
Also fixed some tests. Signed-off-by: Mike Lischke <mike@lischke-online.de>
1 parent 5bb4e97 commit 4a4c14d

5 files changed

Lines changed: 115 additions & 59 deletions

File tree

‎src/bateria-instruments.ts‎

Lines changed: 95 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import tamborimIcon from "./assets/images/instrument-icons/tamborim.svg";
3131
import timbauIcon from "./assets/images/instrument-icons/timbau.svg";
3232

3333
import {
34-
Damping, ExcitationMode, HandTechnique, StickTechnique, type IInstrumentMeta
34+
Damping, ExcitationMode, HandTechnique, NoteDisplayType, StickTechnique, type IInstrumentMeta
3535
} from "./core/ScoreBookDataModel.js";
3636

3737
export const pastelColors: string[] = [
@@ -73,7 +73,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
7373
},
7474
characteristics: {
7575
excitationMode: ExcitationMode.Struck,
76-
stickTechnique: StickTechnique.DrumHead
76+
stickTechnique: StickTechnique.Normal,
77+
damping: Damping.Open,
78+
displayType: NoteDisplayType.Normal
7779
}
7880
},
7981
{
@@ -85,7 +87,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
8587
},
8688
characteristics: {
8789
excitationMode: ExcitationMode.Struck,
88-
stickTechnique: StickTechnique.DrumHead
90+
stickTechnique: StickTechnique.Normal,
91+
damping: Damping.Open,
92+
displayType: NoteDisplayType.Normal
8993
}
9094
}
9195
],
@@ -106,7 +110,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
106110
},
107111
characteristics: {
108112
excitationMode: ExcitationMode.Struck,
109-
stickTechnique: StickTechnique.DrumHead
113+
stickTechnique: StickTechnique.Normal,
114+
damping: Damping.Open,
115+
displayType: NoteDisplayType.Normal
110116
}
111117
},
112118
{
@@ -118,7 +124,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
118124
},
119125
characteristics: {
120126
excitationMode: ExcitationMode.Struck,
121-
stickTechnique: StickTechnique.DrumHead
127+
stickTechnique: StickTechnique.Normal,
128+
damping: Damping.Open,
129+
displayType: NoteDisplayType.Normal
122130
}
123131
},
124132
{
@@ -130,7 +138,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
130138
},
131139
characteristics: {
132140
excitationMode: ExcitationMode.Struck,
133-
stickTechnique: StickTechnique.DrumHead
141+
stickTechnique: StickTechnique.Normal,
142+
damping: Damping.Open,
143+
displayType: NoteDisplayType.Normal
134144
}
135145
},
136146
{
@@ -142,7 +152,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
142152
},
143153
characteristics: {
144154
excitationMode: ExcitationMode.Struck,
145-
stickTechnique: StickTechnique.DrumHead
155+
stickTechnique: StickTechnique.Normal,
156+
damping: Damping.Open,
157+
displayType: NoteDisplayType.Normal
146158
}
147159
}
148160
],
@@ -162,7 +174,8 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
162174
string: "accent"
163175
},
164176
characteristics: {
165-
excitationMode: ExcitationMode.Shaken
177+
excitationMode: ExcitationMode.Shaken,
178+
displayType: NoteDisplayType.Cross
166179
}
167180
},
168181
{
@@ -173,7 +186,8 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
173186
string: "ghost"
174187
},
175188
characteristics: {
176-
excitationMode: ExcitationMode.Shaken
189+
excitationMode: ExcitationMode.Shaken,
190+
displayType: NoteDisplayType.Cross
177191
}
178192
}
179193
],
@@ -194,7 +208,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
194208
},
195209
characteristics: {
196210
excitationMode: ExcitationMode.Struck,
197-
stickTechnique: StickTechnique.DrumHead
211+
stickTechnique: StickTechnique.Normal,
212+
damping: Damping.Open,
213+
displayType: NoteDisplayType.Normal
198214
}
199215
},
200216
{
@@ -206,7 +222,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
206222
},
207223
characteristics: {
208224
excitationMode: ExcitationMode.Struck,
209-
stickTechnique: StickTechnique.DrumHead
225+
stickTechnique: StickTechnique.Normal,
226+
damping: Damping.Open,
227+
displayType: NoteDisplayType.Normal
210228
}
211229
}
212230
],
@@ -227,7 +245,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
227245
},
228246
characteristics: {
229247
excitationMode: ExcitationMode.Struck,
230-
stickTechnique: StickTechnique.DrumHead
248+
stickTechnique: StickTechnique.Normal,
249+
damping: Damping.Open,
250+
displayType: NoteDisplayType.Normal
231251
}
232252
},
233253
{
@@ -239,7 +259,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
239259
},
240260
characteristics: {
241261
excitationMode: ExcitationMode.Struck,
242-
stickTechnique: StickTechnique.DrumHead
262+
stickTechnique: StickTechnique.Normal,
263+
damping: Damping.Open,
264+
displayType: NoteDisplayType.Normal
243265
}
244266
},
245267
{
@@ -251,7 +273,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
251273
},
252274
characteristics: {
253275
excitationMode: ExcitationMode.Struck,
254-
stickTechnique: StickTechnique.RimShot
276+
stickTechnique: StickTechnique.RimShot,
277+
damping: Damping.Open,
278+
displayType: NoteDisplayType.Cross
255279
}
256280
},
257281
{
@@ -263,7 +287,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
263287
},
264288
characteristics: {
265289
excitationMode: ExcitationMode.Struck,
266-
stickTechnique: StickTechnique.Rim
290+
stickTechnique: StickTechnique.Rim,
291+
damping: Damping.Open,
292+
displayType: NoteDisplayType.Cross
267293
}
268294
},
269295
{
@@ -275,7 +301,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
275301
},
276302
characteristics: {
277303
excitationMode: ExcitationMode.Struck,
278-
stickTechnique: StickTechnique.PressRoll
304+
stickTechnique: StickTechnique.PressRoll,
305+
damping: Damping.Open,
306+
displayType: NoteDisplayType.Normal
279307
}
280308
},
281309
{
@@ -287,7 +315,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
287315
},
288316
characteristics: {
289317
excitationMode: ExcitationMode.Struck,
290-
handTechnique: HandTechnique.Open
318+
handTechnique: HandTechnique.Open,
319+
damping: Damping.Open,
320+
displayType: NoteDisplayType.Normal
291321
}
292322
},
293323
{
@@ -299,7 +329,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
299329
},
300330
characteristics: {
301331
excitationMode: ExcitationMode.Struck,
302-
handTechnique: HandTechnique.Slap
332+
handTechnique: HandTechnique.Slap,
333+
damping: Damping.Open,
334+
displayType: NoteDisplayType.Normal
303335
}
304336
}
305337
],
@@ -320,7 +352,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
320352
},
321353
characteristics: {
322354
excitationMode: ExcitationMode.Struck,
323-
stickTechnique: StickTechnique.DrumHead
355+
stickTechnique: StickTechnique.Normal,
356+
damping: Damping.Open,
357+
displayType: NoteDisplayType.Normal
324358
}
325359
},
326360
{
@@ -332,7 +366,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
332366
},
333367
characteristics: {
334368
excitationMode: ExcitationMode.Struck,
335-
stickTechnique: StickTechnique.DrumHead
369+
stickTechnique: StickTechnique.Normal,
370+
damping: Damping.Open,
371+
displayType: NoteDisplayType.Normal
336372
}
337373
}
338374
],
@@ -353,7 +389,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
353389
},
354390
characteristics: {
355391
excitationMode: ExcitationMode.Struck,
356-
stickTechnique: StickTechnique.DrumHead
392+
stickTechnique: StickTechnique.Normal,
393+
damping: Damping.Open,
394+
displayType: NoteDisplayType.Normal
357395
}
358396
},
359397
{
@@ -365,7 +403,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
365403
},
366404
characteristics: {
367405
excitationMode: ExcitationMode.Struck,
368-
stickTechnique: StickTechnique.DrumHead
406+
stickTechnique: StickTechnique.Normal,
407+
damping: Damping.Open,
408+
displayType: NoteDisplayType.Normal
369409
}
370410
},
371411
{
@@ -377,7 +417,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
377417
},
378418
characteristics: {
379419
excitationMode: ExcitationMode.Struck,
380-
stickTechnique: StickTechnique.PressRoll
420+
stickTechnique: StickTechnique.PressRoll,
421+
damping: Damping.Open,
422+
displayType: NoteDisplayType.Normal
381423
}
382424
},
383425
{
@@ -389,7 +431,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
389431
},
390432
characteristics: {
391433
excitationMode: ExcitationMode.Struck,
392-
stickTechnique: StickTechnique.RimShot
434+
stickTechnique: StickTechnique.RimShot,
435+
damping: Damping.Open,
436+
displayType: NoteDisplayType.Cross
393437
}
394438
},
395439
],
@@ -410,7 +454,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
410454
},
411455
characteristics: {
412456
excitationMode: ExcitationMode.Struck,
413-
handTechnique: HandTechnique.Open
457+
handTechnique: HandTechnique.Open,
458+
damping: Damping.Open,
459+
displayType: NoteDisplayType.Normal
414460
}
415461
},
416462
{
@@ -422,7 +468,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
422468
},
423469
characteristics: {
424470
excitationMode: ExcitationMode.Struck,
425-
handTechnique: HandTechnique.Slap
471+
handTechnique: HandTechnique.Slap,
472+
damping: Damping.Open,
473+
displayType: NoteDisplayType.Normal
426474
}
427475
},
428476
{
@@ -434,7 +482,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
434482
},
435483
characteristics: {
436484
excitationMode: ExcitationMode.Struck,
437-
handTechnique: HandTechnique.Heel
485+
handTechnique: HandTechnique.Heel,
486+
damping: Damping.Open,
487+
displayType: NoteDisplayType.Normal
438488
}
439489
}
440490
],
@@ -455,8 +505,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
455505
},
456506
characteristics: {
457507
excitationMode: ExcitationMode.Struck,
458-
stickTechnique: StickTechnique.DrumHead,
459-
damping: Damping.Open
508+
stickTechnique: StickTechnique.Normal,
509+
damping: Damping.Open,
510+
displayType: NoteDisplayType.Normal
460511
}
461512
},
462513
{
@@ -468,8 +519,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
468519
},
469520
characteristics: {
470521
excitationMode: ExcitationMode.Struck,
471-
stickTechnique: StickTechnique.DrumHead,
472-
damping: Damping.Muted
522+
stickTechnique: StickTechnique.Normal,
523+
damping: Damping.Muted,
524+
displayType: NoteDisplayType.Normal
473525
}
474526
}
475527
],
@@ -490,8 +542,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
490542
},
491543
characteristics: {
492544
excitationMode: ExcitationMode.Struck,
493-
stickTechnique: StickTechnique.DrumHead,
494-
damping: Damping.Open
545+
stickTechnique: StickTechnique.Normal,
546+
damping: Damping.Open,
547+
displayType: NoteDisplayType.Normal
495548
}
496549
},
497550
{
@@ -503,8 +556,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
503556
},
504557
characteristics: {
505558
excitationMode: ExcitationMode.Struck,
506-
stickTechnique: StickTechnique.DrumHead,
507-
damping: Damping.Muted
559+
stickTechnique: StickTechnique.Normal,
560+
damping: Damping.Muted,
561+
displayType: NoteDisplayType.Normal
508562
}
509563
}
510564
],
@@ -525,8 +579,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
525579
},
526580
characteristics: {
527581
excitationMode: ExcitationMode.Struck,
528-
stickTechnique: StickTechnique.DrumHead,
529-
damping: Damping.Open
582+
stickTechnique: StickTechnique.Normal,
583+
damping: Damping.Open,
584+
displayType: NoteDisplayType.Normal
530585
}
531586
},
532587
{
@@ -538,8 +593,9 @@ export const bateriaInstruments: IInstrumentMeta[] = [{
538593
},
539594
characteristics: {
540595
excitationMode: ExcitationMode.Struck,
541-
stickTechnique: StickTechnique.DrumHead,
542-
damping: Damping.Muted
596+
stickTechnique: StickTechnique.Normal,
597+
damping: Damping.Muted,
598+
displayType: NoteDisplayType.Normal
543599
}
544600
}
545601
],

0 commit comments

Comments
 (0)