Merge pull request #815 from tidalcycles/color-hsl

Color hsl
tidalcycles · Nov 18, 2023 · 3e02f0a · 3e02f0a
2 parents dd8be65 + f759999
commit 3e02f0a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
@@ -2189,6 +2189,14 @@ export const duration = register('duration', function (value, pat) {
   return pat.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(value)));
 });
 
+export const hsla = register('hsla', (h, s, l, a, pat) => {
+  return pat.color(`hsla(${h}turn,${s * 100}%,${l * 100}%,${a})`);
+});
+
+export const hsl = register('hsl', (h, s, l, pat) => {
+  return pat.color(`hsl(${h}turn,${s * 100}%,${l * 100}%)`);
+});
+
 /**
  * Sets the color of the hap in visualizations like pianoroll or highlighting.
  * @name color

diff --git a/packages/core/pianoroll.mjs b/packages/core/pianoroll.mjs
@@ -165,10 +165,7 @@ export function pianoroll({
   barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
   ctx.fillStyle = background;
   ctx.globalAlpha = 1; // reset!
-  if (!smear) {
-    ctx.clearRect(0, 0, w, h);
-    ctx.fillRect(0, 0, w, h);
-  }
+  clearScreen(smear);
   haps.forEach((event) => {
     const isActive = event.whole.begin <= time && event.endClipped > time;
     let strokeCurrent = stroke ?? (strokeActive && isActive);
@@ -282,3 +279,13 @@ export function drawPianoroll(options) {
   const { drawTime, ...rest } = options;
   pianoroll({ ...getDrawOptions(drawTime), ...rest });
 }
+
+function clearScreen(smear = 0, smearRGB = `0,0,0`) {
+  const ctx = getDrawContext();
+  if (!smear) {
+    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+  } else {
+    ctx.fillStyle = `rgba(${smearRGB},${1 - smear})`;
+    ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+  }
+}