@sarmal/core 0.36.3 → 0.36.5

package/dist/index.js

@@ -1449,11 +1449,11 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
   const cellW = W / cols;
   const cellH = H / rows;
   const dotR = Math.min(cellW, cellH) * 0.36;
-  let gradientOklab = null;
+  let gradientOklab = [];
   let colorRgb = { r: 255, g: 255, b: 255 };
-  let currentTrailStyle = initialTrailStyle;
-  let animTime = 0;
-  const ANIM_PERIOD = 6;
+  let trailStyle = initialTrailStyle;
+  let trailColor = initialColor;
+  let gradientAnimTime = 0;
   const grid = new Float32Array(cols * rows);
   let scale = 1;
   let offsetX = 0;
@@ -1542,13 +1542,8 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
     }
   }
   function applyColor(color) {
-    if (Array.isArray(color)) {
-      gradientOklab = color.map((c) => parseColorToOklab(c));
-      colorRgb = oklabToRgb(gradientOklab[0]);
-    } else {
-      gradientOklab = null;
-      colorRgb = colorToRgb(color);
-    }
+    colorRgb = colorToRgb(resolveTrailMainColor(color));
+    gradientOklab = resolveTrailPalette(color).map((c) => parseColorToOklab(c));
   }
   function applySkeletonColor(color) {
     skeletonColorOklab = color === "transparent" ? null : parseColorToOklab(color);
@@ -1650,7 +1645,7 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
     frameImageData.data.set(bgImageData.data);
     const { data } = frameImageData;
     writeSkeletonPixels(data);
-    const timeOffset = currentTrailStyle === "gradient-animated" ? animTime / ANIM_PERIOD : 0;
+    const timeOffset = trailStyle === "gradient-animated" ? gradientAnimTime * 5e-4 : 0;
     const n = cols * rows;
     for (let dotIdx = 0; dotIdx < n; dotIdx++) {
       const intensity = grid[dotIdx];
@@ -1658,7 +1653,7 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
         continue;
       }
       let r, g, b;
-      if (currentTrailStyle !== "default" && gradientOklab !== null) {
+      if (trailStyle !== "default") {
         ({ r, g, b } = oklabToRgb(getPaletteColor(gradientOklab, intensity, timeOffset)));
       } else {
         ({ r, g, b } = colorRgb);
@@ -1699,8 +1694,8 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
       calculateBoundaries(engine.getSarmalSkeleton());
       computeSkeletonGrid(engine.getSarmalSkeleton());
     }
-    if (currentTrailStyle === "gradient-animated") {
-      animTime += deltaTime;
+    if (trailStyle === "gradient-animated") {
+      gradientAnimTime += deltaTime * 1e3;
     }
     buildGrid(deltaTime);
     draw();
@@ -1714,6 +1709,7 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
   validateBaseRenderOptions({ trailColor: initialColor, skeletonColor: skeletonColorOpt });
   applyColor(initialColor);
   applySkeletonColor(skeletonColorOpt);
+  warnIfTrailColorMismatch(trailColor, trailStyle);
   calculateBoundaries(engine.getSarmalSkeleton());
   computePixelMask();
   computeSkeletonGrid(engine.getSarmalSkeleton());
@@ -1788,29 +1784,24 @@ function createSarmalDotMatrix(canvas, curveDef, options) {
       validateBaseRenderOptions(partial);
       let needsRebuildBg = false;
       if (partial.trailColor !== void 0) {
-        applyColor(partial.trailColor);
+        trailColor = partial.trailColor;
+        applyColor(trailColor);
         needsRebuildBg = true;
       }
       if (partial.skeletonColor !== void 0) {
         applySkeletonColor(partial.skeletonColor);
       }
       if (partial.trailStyle !== void 0) {
-        currentTrailStyle = partial.trailStyle;
-        if (currentTrailStyle === "default") {
-          animTime = 0;
+        trailStyle = partial.trailStyle;
+        if (trailStyle === "default") {
+          gradientAnimTime = 0;
         }
       }
       if (needsRebuildBg) {
         buildBgImageData();
       }
-      if (currentTrailStyle !== "default" && gradientOklab === null) {
-        console.warn(
-          `[sarmal] dot matrix: trailColor is a single color but trailStyle is "${currentTrailStyle}"; the trail will render as a solid color. Pass an array of hex colors to use a real gradient.`
-        );
-      } else if (currentTrailStyle === "default" && gradientOklab !== null) {
-        console.warn(
-          '[sarmal] dot matrix: trailColor is an array but trailStyle is "default"; only the first color will be used. Pass a gradient trailStyle to use the whole palette.'
-        );
+      if (partial.trailColor !== void 0 || partial.trailStyle !== void 0) {
+        warnIfTrailColorMismatch(trailColor, trailStyle);
       }
     }
   };