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

fix restart overlap

Browse Source
This commit is contained in:
Felix Roos 2022-04-24 01:27:44 +02:00
parent ab9871640a
commit f96ca562a2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/pattern.mjs
View File

@ -727,14 +727,18 @@ export class Pattern {
return new Pattern((state) =>
pat
.query(state)
.map((event) => {
const resetSpan = new TimeSpan(event.part.begin.sub(event.whole.begin), event.duration);
return this.query(new State(resetSpan)).map((hap) =>
hap
.withSpan(
(s) => s.withTime((t) => t.add(event.whole.begin)), // TODO: somehow make sure span end does not overlap next event of pat
)
.setContext(hap.combineContext(event)),
.map((outer_hap) => {
const resetSpan = new TimeSpan(
outer_hap.part.begin.sub(outer_hap.whole.begin),
outer_hap.part.end.sub(outer_hap.whole.begin),
);
return this.query(new State(resetSpan)).map((inner_hap) =>
new Hap(
inner_hap.whole?.withTime((t) => t.add(outer_hap.whole.begin)).intersection?.(outer_hap.whole) ||
undefined,
inner_hap.part.withTime((t) => t.add(outer_hap.whole.begin)).intersection(outer_hap.part),
inner_hap.value,
).setContext(outer_hap.combineContext(inner_hap)),
);
})
.flat(),