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

feat: add voiceOffset

Browse Source
This commit is contained in:
Felix Roos 2023-07-09 16:53:29 +02:00
parent 110e179e9e
commit d1fe50e271
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/tonal/tonleiter.mjs
View File

@ -1,4 +1,4 @@
import { isNote, isNoteWithOctave } from '@strudel.cycles/core'; import { isNote, isNoteWithOctave, _mod } from '@strudel.cycles/core';
// https://codesandbox.io/s/stateless-voicings-g2tmz0?file=/src/lib.js:0-2515 // https://codesandbox.io/s/stateless-voicings-g2tmz0?file=/src/lib.js:0-2515
@ -61,7 +61,7 @@ export const midi2note = (midi, sharp = false) => {
return pc + oct; return pc + oct;
}; };
export function voiceBelow(maxNote, chord, voicingDictionary) { export function voiceBelow(maxNote, chord, voicingDictionary, offset = 0) {
const [root, symbol] = tokenizeChord(chord); const [root, symbol] = tokenizeChord(chord);
const maxPc = note2pc(maxNote); const maxPc = note2pc(maxNote);
const maxChroma = pc2chroma(maxPc); const maxChroma = pc2chroma(maxPc);
@ -71,19 +71,22 @@ export function voiceBelow(maxNote, chord, voicingDictionary) {
); );
let minDistance, bestIndex; let minDistance, bestIndex;
voicings.forEach((voicing, i) => { // calculate distances up from voicing top notes
// get chroma of topnote let chromaDiffs = voicings.map((v, i) => {
const topChroma = rotateChroma(voicing[voicing.length - 1], rootChroma); const diff = _mod(maxChroma - v.slice(-1)[0] - rootChroma, 12);
// calculate distance up
const diff = (maxChroma - topChroma + 12) % 12;
if (minDistance === undefined || diff < minDistance) { if (minDistance === undefined || diff < minDistance) {
minDistance = diff; minDistance = diff;
bestIndex = i; bestIndex = i;
} }
return diff;
}); });
const octDiff =
offset >= 0 ? Math.ceil(offset / voicings.length) * 12 : Math.floor(Math.abs(offset) / voicings.length) * -12;
bestIndex = _mod(bestIndex + offset, voicings.length);
const voicing = voicings[bestIndex]; const voicing = voicings[bestIndex];
const maxMidi = note2midi(maxNote); const maxMidi = note2midi(maxNote);
const topMidi = maxMidi - minDistance; const topMidi = maxMidi - chromaDiffs[bestIndex] + octDiff;
const voicingMidi = voicing.map((v) => topMidi - voicing[voicing.length - 1] + v); const voicingMidi = voicing.map((v) => topMidi - voicing[voicing.length - 1] + v);
return voicingMidi.map((n) => midi2note(n)); return voicingMidi.map((n) => midi2note(n));