@sarmal/core 0.24.0 → 0.25.0

package/dist/curves/star7.d.ts

@@ -1,4 +1,4 @@
-import { C as CurveDef } from '../types-CknrlCAf.js';
+import { C as CurveDef } from '../types-BZpzgNau.js';
 
 /**
  * 7-pointed star based on Fourier harmonics.

package/dist/index.cjs

@@ -198,25 +198,25 @@ function createEngine(curveDef, trailLength = 120) {
     },
     getSarmalSkeleton() {
       const steps = Math.ceil(curve.period * POINTS_PER_PERIOD_UNIT);
-      const points = new Array(steps);
+      const points2 = new Array(steps);
       if (morphCurveB !== null && _morphAlpha !== null) {
         for (let i = 0; i < steps; i++) {
           const sampleT = i / (steps - 1) * curve.period;
           const a = sampleSkeleton(curve, sampleT);
           const tB = _morphStrategy === "normalized" ? sampleT / curve.period * morphCurveB.period : sampleT;
           const b = sampleSkeleton(morphCurveB, tB);
-          points[i] = {
+          points2[i] = {
             x: a.x + (b.x - a.x) * _morphAlpha,
             y: a.y + (b.y - a.y) * _morphAlpha
           };
         }
-        return points;
+        return points2;
       }
       for (let i = 0; i < steps; i++) {
         const sampleT = i / (steps - 1) * curve.period;
-        points[i] = sampleSkeleton(curve, sampleT);
+        points2[i] = sampleSkeleton(curve, sampleT);
       }
-      return points;
+      return points2;
     },
     setSpeed(speed) {
       if (!Number.isFinite(speed)) {
@@ -321,7 +321,7 @@ function computeTrailQuad(trail, i, trailCount, toX, toY, minWidth = TRAIL_MIN_W
     progress
   };
 }
-function computeBoundaries(pts, logicalWidth, logicalHeight) {
+function computeBoundaries(pts, logicalWidth, logicalHeight, minPaddingPx = FIT_PADDING_MIN) {
   if (pts.length === 0) return null;
   const first = pts[0];
   let minX = first.x, maxX = first.x, minY = first.y, maxY = first.y;
@@ -348,8 +348,8 @@ function computeBoundaries(pts, logicalWidth, logicalHeight) {
   }
   const scaleXProportional = logicalWidth / (w * (1 + FIT_PADDING * 2));
   const scaleYProportional = logicalHeight / (h * (1 + FIT_PADDING * 2));
-  const scaleXMinPadding = (logicalWidth - FIT_PADDING_MIN * 2) / w;
-  const scaleYMinPadding = (logicalHeight - FIT_PADDING_MIN * 2) / h;
+  const scaleXMinPadding = (logicalWidth - minPaddingPx * 2) / w;
+  const scaleYMinPadding = (logicalHeight - minPaddingPx * 2) / h;
   const scale = Math.min(
     scaleXProportional,
     scaleYProportional,
@@ -369,7 +369,8 @@ function enginePassthroughs(engine) {
     setSpeed: engine.setSpeed,
     getSpeed: engine.getSpeed,
     resetSpeed: engine.resetSpeed,
-    setSpeedOver: engine.setSpeedOver
+    setSpeedOver: engine.setSpeedOver,
+    getSarmalSkeleton: engine.getSarmalSkeleton
   };
 }
 var palettes = {
@@ -1234,26 +1235,94 @@ function createSarmalSVG(container, curveDef, options) {
   return createSVGRenderer({ container, engine, ...rendererOpts });
 }
 
-// src/curves/artemis2.ts
-var TWO_PI2 = Math.PI * 2;
-function artemis2Fn(t, _time, _params) {
-  const a = 0.35, b = 0.15, ox = 0.175;
-  const s = Math.sin(t), c = Math.cos(t);
-  const denom = 1 + s * s;
+// src/catmull-rom.ts
+var PERIOD = 2 * Math.PI;
+function catmullRom1D(p0, p1, p2, p3, u) {
+  const u2 = u * u;
+  const u3 = u2 * u;
+  return 0.5 * (2 * p1 + (-p0 + p2) * u + (2 * p0 - 5 * p1 + 4 * p2 - p3) * u2 + (-p0 + 3 * p1 - 3 * p2 + p3) * u3);
+}
+function evaluateCatmullRom(points2, t) {
+  const N = points2.length;
+  if (N === 0) {
+    return { x: 0, y: 0 };
+  }
+  if (N === 1) {
+    return { x: points2[0][0], y: points2[0][1] };
+  }
+  t = (t % PERIOD + PERIOD) % PERIOD;
+  const segmentSize = PERIOD / N;
+  let i = Math.floor(t / segmentSize);
+  if (i >= N) {
+    i = N - 1;
+  }
+  let u = (t - i * segmentSize) / segmentSize;
+  u = Math.max(0, Math.min(1, u));
+  const p0 = points2[(i - 1 + N) % N];
+  const p1 = points2[i];
+  const p2 = points2[(i + 1) % N];
+  const p3 = points2[(i + 2) % N];
   return {
-    x: c * (1 + a * c) / denom - ox,
-    y: s * c * (1 + b * c) / denom
+    x: catmullRom1D(p0[0], p1[0], p2[0], p3[0], u),
+    y: catmullRom1D(p0[1], p1[1], p2[1], p3[1], u)
   };
 }
+function drawCurve(points2, opts) {
+  if (points2.length < 3) {
+    throw new Error(`drawCurve requires at least 3 points, received ${points2.length}.`);
+  }
+  const first = points2[0];
+  if (points2.every((p) => p[0] === first[0] && p[1] === first[1])) {
+    console.warn(
+      "[sarmal].drawCurve: all control points are identical. The curve will be a single point."
+    );
+  }
+  const maxAbs = points2.reduce((m, p) => Math.max(m, Math.abs(p[0]), Math.abs(p[1])), 0);
+  if (maxAbs > 2) {
+    console.warn(
+      `[sarmal].drawCurve: control points extend to \xB1${maxAbs.toFixed(1)}, which may render off-screen. Coordinates should be in [-1, 1].`
+    );
+  }
+  const pts = points2.map(([x, y]) => [x, y]);
+  return {
+    name: opts?.name ?? "drawn",
+    fn: (t) => evaluateCatmullRom(pts, t),
+    period: PERIOD,
+    kind: "drawn"
+  };
+}
+
+// src/curves/artemis2.ts
+var points = [
+  [-0.44, -0.45],
+  [-0.53, -0.77],
+  [-0.82, -0.66],
+  [-0.82, -0.18],
+  [-0.25, -0.04],
+  [0.16, -0.49],
+  [-0.03, -0.87],
+  [-0.68, -0.94],
+  [-0.95, -0.61],
+  [-0.87, -0],
+  [-0.34, 0.21],
+  [0.27, -0.04],
+  [0.87, 0.06],
+  [0.87, 0.57],
+  [0.32, 0.66],
+  [-0.21, -0.43],
+  [-0.43, -0.81],
+  [-0.69, -0.84],
+  [-0.87, -0.66],
+  [-0.9, -0.47],
+  [-0.76, -0.35]
+];
 var artemis2 = {
-  name: "Artemis II",
-  fn: artemis2Fn,
-  period: TWO_PI2,
+  ...drawCurve(points, { name: "Artemis II" }),
   speed: 0.7
 };
 
 // src/curves/astroid.ts
-var TWO_PI3 = Math.PI * 2;
+var TWO_PI2 = Math.PI * 2;
 function astroidFn(t, _time, _params) {
   const c = Math.cos(t);
   const s = Math.sin(t);
@@ -1265,12 +1334,12 @@ function astroidFn(t, _time, _params) {
 var astroid = {
   name: "Astroid",
   fn: astroidFn,
-  period: TWO_PI3,
+  period: TWO_PI2,
   speed: 1.1
 };
 
 // src/curves/deltoid.ts
-var TWO_PI4 = Math.PI * 2;
+var TWO_PI3 = Math.PI * 2;
 function deltoidFn(t, _time, _params) {
   return {
     x: 2 * Math.cos(t) + Math.cos(2 * t),
@@ -1280,12 +1349,12 @@ function deltoidFn(t, _time, _params) {
 var deltoid = {
   name: "Deltoid",
   fn: deltoidFn,
-  period: TWO_PI4,
+  period: TWO_PI3,
   speed: 0.9
 };
 
 // src/curves/epicycloid3.ts
-var TWO_PI5 = Math.PI * 2;
+var TWO_PI4 = Math.PI * 2;
 function epicycloid3Fn(t, _time, _params) {
   return {
     x: 4 * Math.cos(t) - Math.cos(4 * t),
@@ -1295,12 +1364,12 @@ function epicycloid3Fn(t, _time, _params) {
 var epicycloid3 = {
   name: "Epicycloid (n=3)",
   fn: epicycloid3Fn,
-  period: TWO_PI5,
+  period: TWO_PI4,
   speed: 0.75
 };
 
 // src/curves/epitrochoid7.ts
-var TWO_PI6 = Math.PI * 2;
+var TWO_PI5 = Math.PI * 2;
 function epitrochoid7Fn(t, _time, _params) {
   const d = 1 + 0.55 * Math.sin(t * 0.5);
   return {
@@ -1318,13 +1387,13 @@ function epitrochoid7SkeletonFn(t) {
 var epitrochoid7 = {
   name: "Epitrochoid",
   fn: epitrochoid7Fn,
-  period: TWO_PI6,
+  period: TWO_PI5,
   speed: 1.4,
   skeletonFn: epitrochoid7SkeletonFn
 };
 
 // src/curves/lissajous32.ts
-var TWO_PI7 = Math.PI * 2;
+var TWO_PI6 = Math.PI * 2;
 function lissajous32Fn(t, time, _params) {
   const phi = time * 0.45;
   return {
@@ -1335,13 +1404,13 @@ function lissajous32Fn(t, time, _params) {
 var lissajous32 = {
   name: "Lissajous 3:2",
   fn: lissajous32Fn,
-  period: TWO_PI7,
+  period: TWO_PI6,
   speed: 2,
   skeleton: "live"
 };
 
 // src/curves/lissajous43.ts
-var TWO_PI8 = Math.PI * 2;
+var TWO_PI7 = Math.PI * 2;
 function lissajous43Fn(t, time, _params) {
   const phi = time * 0.38;
   return {
@@ -1352,13 +1421,13 @@ function lissajous43Fn(t, time, _params) {
 var lissajous43 = {
   name: "Lissajous 4:3",
   fn: lissajous43Fn,
-  period: TWO_PI8,
+  period: TWO_PI7,
   speed: 1.8,
   skeleton: "live"
 };
 
 // src/curves/lame.ts
-var TWO_PI9 = Math.PI * 2;
+var TWO_PI8 = Math.PI * 2;
 function lameFn(t, time, _params) {
   const p = 1.75 + 1.25 * Math.sin(time * 0.48);
   const c = Math.cos(t), s = Math.sin(t);
@@ -1370,13 +1439,13 @@ function lameFn(t, time, _params) {
 var lame = {
   name: "Lam\xE9 Curve",
   fn: lameFn,
-  period: TWO_PI9,
+  period: TWO_PI8,
   speed: 1,
   skeleton: "live"
 };
 
 // src/curves/rose3.ts
-var TWO_PI10 = Math.PI * 2;
+var TWO_PI9 = Math.PI * 2;
 function rose3Fn(t, _time, _params) {
   const r = Math.cos(3 * t);
   return {
@@ -1387,12 +1456,12 @@ function rose3Fn(t, _time, _params) {
 var rose3 = {
   name: "Rose (n=3)",
   fn: rose3Fn,
-  period: TWO_PI10,
+  period: TWO_PI9,
   speed: 1.15
 };
 
 // src/curves/rose5.ts
-var TWO_PI11 = Math.PI * 2;
+var TWO_PI10 = Math.PI * 2;
 function rose5Fn(t, _time, _params) {
   const r = Math.cos(5 * t);
   return {
@@ -1403,7 +1472,7 @@ function rose5Fn(t, _time, _params) {
 var rose5 = {
   name: "Rose (n=5)",
   fn: rose5Fn,
-  period: TWO_PI11,
+  period: TWO_PI10,
   speed: 1
 };
 
@@ -1424,7 +1493,7 @@ var rose52 = {
 };
 
 // src/curves/star.ts
-var TWO_PI12 = Math.PI * 2;
+var TWO_PI11 = Math.PI * 2;
 function starFn(t, _time, _params) {
   const r = Math.abs(Math.cos(5 / 2 * t)) + 0.35 * Math.abs(Math.cos(15 / 2 * t)) + 0.15 * Math.abs(Math.cos(25 / 2 * t));
   return {
@@ -1435,12 +1504,12 @@ function starFn(t, _time, _params) {
 var star = {
   name: "Star",
   fn: starFn,
-  period: TWO_PI12,
+  period: TWO_PI11,
   speed: 1
 };
 
 // src/curves/star4.ts
-var TWO_PI13 = Math.PI * 2;
+var TWO_PI12 = Math.PI * 2;
 function star4Fn(t, _time, _params) {
   const r = Math.abs(Math.cos(2 * t)) + 0.35 * Math.abs(Math.cos(6 * t)) + 0.15 * Math.abs(Math.cos(10 * t));
   return {
@@ -1451,12 +1520,12 @@ function star4Fn(t, _time, _params) {
 var star4 = {
   name: "Star (4-arm)",
   fn: star4Fn,
-  period: TWO_PI13,
+  period: TWO_PI12,
   speed: 1
 };
 
 // src/curves/star7.ts
-var TWO_PI14 = Math.PI * 2;
+var TWO_PI13 = Math.PI * 2;
 function star7Fn(t, _time, _params) {
   const r = Math.abs(Math.cos(7 / 2 * t)) + 0.35 * Math.abs(Math.cos(21 / 2 * t)) + 0.15 * Math.abs(Math.cos(35 / 2 * t));
   return {
@@ -1467,7 +1536,7 @@ function star7Fn(t, _time, _params) {
 var star7 = {
   name: "Star (7-arm)",
   fn: star7Fn,
-  period: TWO_PI14,
+  period: TWO_PI13,
   speed: 1
 };
 
@@ -1489,49 +1558,6 @@ var curves = {
   lame
 };
 
-// src/catmull-rom.ts
-var PERIOD = 2 * Math.PI;
-function catmullRom1D(p0, p1, p2, p3, u) {
-  const u2 = u * u;
-  const u3 = u2 * u;
-  return 0.5 * (2 * p1 + (-p0 + p2) * u + (2 * p0 - 5 * p1 + 4 * p2 - p3) * u2 + (-p0 + 3 * p1 - 3 * p2 + p3) * u3);
-}
-function evaluateCatmullRom(points, t) {
-  const N = points.length;
-  if (N === 0) {
-    return { x: 0, y: 0 };
-  }
-  if (N === 1) {
-    return { x: points[0][0], y: points[0][1] };
-  }
-  t = (t % PERIOD + PERIOD) % PERIOD;
-  const segmentSize = PERIOD / N;
-  let i = Math.floor(t / segmentSize);
-  if (i >= N) {
-    i = N - 1;
-  }
-  let u = (t - i * segmentSize) / segmentSize;
-  u = Math.max(0, Math.min(1, u));
-  const p0 = points[(i - 1 + N) % N];
-  const p1 = points[i];
-  const p2 = points[(i + 1) % N];
-  const p3 = points[(i + 2) % N];
-  return {
-    x: catmullRom1D(p0[0], p1[0], p2[0], p3[0], u),
-    y: catmullRom1D(p0[1], p1[1], p2[1], p3[1], u)
-  };
-}
-function drawCurve(points) {
-  if (points.length < 3) {
-    throw new Error(`drawCurve requires at least 3 points, received ${points.length}.`);
-  }
-  return {
-    name: "custom",
-    fn: (t) => evaluateCatmullRom(points, t),
-    period: PERIOD
-  };
-}
-
 // src/index.ts
 function createSarmal(canvas, curveDef, options) {
   const { trailLength, ...rendererOpts } = options ?? {};
@@ -1541,6 +1567,7 @@ function createSarmal(canvas, curveDef, options) {
 
 exports.artemis2 = artemis2;
 exports.astroid = astroid;
+exports.computeBoundaries = computeBoundaries;
 exports.createEngine = createEngine;
 exports.createRenderer = createRenderer;
 exports.createSVGRenderer = createSVGRenderer;