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

Fix slowcat for proper interleaving behaviour

Browse Source
This commit is contained in:
alex 2022-02-07 16:50:41 +00:00
parent d00cdcf126
commit 4cdcfd24fa
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
strudel.mjs
View File

@ -558,11 +558,15 @@ function stack(...pats) {
function slowcat(...pats) { function slowcat(...pats) {
// Concatenation: combines a list of patterns, switching between them // Concatenation: combines a list of patterns, switching between them
// successively, one per cycle. // successively, one per cycle.
// (currently behaves slightly differently from Tidal)
pats = pats.map(reify) pats = pats.map(reify)
var query = function(span) { const query = function(span) {
var pat = pats[Math.floor(span.begin) % pats.length] const pat_n = Math.floor(span.begin) % pats.length
return pat.query(span) const pat = pats[pat_n]
// A bit of maths to make sure that cycles from constituent patterns aren't skipped.
// For example if three patterns are slowcat-ed, the fourth cycle of the result should
// be the second (rather than fourth) cycle from the first pattern.
const offset = span.begin.floor().sub(span.begin.div(pats.length).floor())
return pat.withEventTime(t => t.add(offset)).query(span.withTime(t => t.sub(offset)))
} }
return new Pattern(query)._splitQueries() return new Pattern(query)._splitQueries()
} }

8
test/pattern.test.mjs
View File

@ -121,13 +121,15 @@ describe('Pattern', function() {
}) })
describe('slowcat()', function () { describe('slowcat()', function () {
it('Can concatenate things slowly', function () { it('Can concatenate things slowly', function () {
assert.deepStrictEqual(slowcat(pure("a"), pure("b")).firstCycle.map(x => x.value), ["a"]) assert.deepStrictEqual(slowcat("a", "b").firstCycle.map(x => x.value), ["a"])
assert.deepStrictEqual(slowcat(pure("a"), pure("b"))._early(1).firstCycle.map(x => x.value), ["b"]) assert.deepStrictEqual(slowcat("a", "b")._early(1).firstCycle.map(x => x.value), ["b"])
assert.deepStrictEqual(slowcat("a", slowcat("b", "c"))._early(1).firstCycle.map(x => x.value), ["b"])
assert.deepStrictEqual(slowcat("a", slowcat("b", "c"))._early(3).firstCycle.map(x => x.value), ["c"])
}) })
}) })
describe('rev()', function () { describe('rev()', function () {
it('Can reverse things', function () { it('Can reverse things', function () {
assert.deepStrictEqual(fastcat(pure("a"), pure("b"), pure("c")).rev().firstCycle.sort((a,b) => a.part.begin.sub(b.part.begin)).map(a => a.value), ["c", "b","a"]) assert.deepStrictEqual(fastcat("a","b","c").rev().firstCycle.sort((a,b) => a.part.begin.sub(b.part.begin)).map(a => a.value), ["c", "b","a"])
}) })
}) })
// describe('sequence()', () => { // describe('sequence()', () => {