elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-25 12:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

scale now supports running on object values with n

Browse Source
This commit is contained in:
Felix Roos 2022-12-11 22:45:36 +01:00
parent 843a3c16ba
commit 6679cd60ce
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/tonal/tonal.mjs
View File

@ -141,13 +141,14 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
export const scale = register('scale', function (scale /* : string */, pat) { export const scale = register('scale', function (scale /* : string */, pat) {
return pat.withHap((hap) => { return pat.withHap((hap) => {
let note = hap.value; const isObject = typeof hap.value === 'object';
let note = isObject ? hap.value.n : hap.value;
const asNumber = Number(note); const asNumber = Number(note);
if (!isNaN(asNumber)) { if (!isNaN(asNumber)) {
let [tonic, scaleName] = Scale.tokenize(scale); let [tonic, scaleName] = Scale.tokenize(scale);
const { pc, oct = 3 } = Note.get(tonic); const { pc, oct = 3 } = Note.get(tonic);
note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct); note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct);
} }
return hap.withValue(() => note).setContext({ ...hap.context, scale }); return hap.withValue(() => (isObject ? { ...hap.value, note } : note)).setContext({ ...hap.context, scale });
}); });
}); });

37
repl/src/tunes.mjs
View File

@ -310,22 +310,43 @@ export const goodTimes = `// licensed with CC BY-NC-SA 4.0 https://creativecommo
const scale = cat('C3 dorian','Bb2 major').slow(4); const scale = cat('C3 dorian','Bb2 major').slow(4);
stack( stack(
"2*4".add(12).scale(scale) "2*4".add(12).scale(scale)
.off(1/8,x=>x.scaleTranspose("2")).fast(2) .off(1/8, scaleTranspose("2")).fast(2)
.scaleTranspose("<0 1 2 1>").hush(), .scaleTranspose("<0 1 2 1>").hush(),
"<0 1 2 3>(3,8,2)" "<0 1 2 3>(3,8,2)"
.scale(scale) .scale(scale)
.off(1/4,x=>x.scaleTranspose("2,4")), .off(1/4, scaleTranspose("2,4")),
"<0 4>(5,8)".scale(scale).transpose(-12) "<0 4>(5,8)".scale(scale).transpose(-12)
) )
.velocity(".6 .7".fast(4)) .velocity(".6 .7".fast(4))
.legato("2") .legato("2")
.scaleTranspose("<0>".slow(4))
.transpose(5)
.note().piano()
.velocity(.8)
.slow(2)
.pianoroll({maxMidi:100,minMidi:20})`;
/* // new style notation:
export const goodTimes = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
// by Felix Roos
const scale = cat('C3 dorian','Bb2 major').slow(4);
stack(
n("2*4").add(12)
.off(1/8, add("2")).fast(2)
.add("<0 1 2 1>").hush(),
n("<0 1 2 3>(3,8,2)")
.off(1/4, add("2,4")),
n("<0 4>(5,8)").sub(7)
)
.scale(scale) .scale(scale)
.scaleTranspose("<0>".slow(4)) .gain(".6 .7".fast(4))
.transpose(5) .legato(2)
.note().piano() .add(note(5))
.velocity(.8) .piano()
.slow(2) .mul(gain(.8))
.pianoroll({maxMidi:100,minMidi:20})`; .slow(2)
.pianoroll({maxMidi:100,minMidi:20})`;
*/
export const echoPiano = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/ export const echoPiano = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
// by Felix Roos // by Felix Roos