@pixerate/editor 0.240.0 → 0.241.0

package/dist/{chunk-UUBO6RB5.js → chunk-UDBDYZET.js}

@@ -5,7 +5,7 @@ import {
   moveAnchorHandle,
   subpathSegment,
   subpathSegmentCount
-} from "./chunk-7YGBSFC6.js";
+} from "./chunk-ILM6GYAX.js";
 import {
   segmentPoint
 } from "./chunk-WEIK3UYB.js";

package/dist/{chunk-PJYG6FCF.js → chunk-XBZK47LV.js}

@@ -36,12 +36,50 @@ import {
 } from "./chunk-F67XMVDI.js";
 
 // src/paint-editor/effect-paint.ts
+var EFFECT_STRIP_HEIGHT = 256;
+var EFFECT_MAP_REPEATS = ["repeat", "mirror", "clamp"];
+function effectPaintSize(p, canvas) {
+  return p.map ? { width: p.map.length, height: EFFECT_STRIP_HEIGHT } : { width: canvas.width, height: canvas.height };
+}
+function readEffectStrokeMap(raw) {
+  if (raw === void 0 || raw === null || raw.by === "canvas") return void 0;
+  const r = raw;
+  if (r.by !== "stroke") throw new Error(`map.by ${JSON.stringify(r.by)} is not a mapping; use "canvas" (fixed to the canvas) or "stroke" (along each stroke).`);
+  const length = r.length === void 0 ? 300 : Number(r.length);
+  if (!(Number.isFinite(length) && length >= 16 && length <= 4096)) throw new Error(`map.length ${JSON.stringify(r.length)} is out of range; use 16..4096 px of stroke per repeat.`);
+  const repeat = r.repeat === void 0 ? "repeat" : r.repeat;
+  if (!EFFECT_MAP_REPEATS.includes(repeat)) throw new Error(`map.repeat ${JSON.stringify(r.repeat)} is not a repeat mode; use ${EFFECT_MAP_REPEATS.join(", ")}.`);
+  return { by: "stroke", length: Math.round(length), repeat };
+}
+function stripIndex(img, map, dab, x, y) {
+  const ca = Math.cos(dab.direction);
+  const sa = Math.sin(dab.direction);
+  const dx = x - dab.x;
+  const dy = y - dab.y;
+  let u = (dab.travel + dx * ca - dy * sa) / map.length;
+  if (map.repeat === "clamp") u = Math.min(1, Math.max(0, u));
+  else if (map.repeat === "mirror") {
+    const m = (u % 2 + 2) % 2;
+    u = m > 1 ? 2 - m : m;
+  } else u = (u % 1 + 1) % 1;
+  const v = Math.min(1, Math.max(0, ((dx * sa + dy * ca) / Math.max(0.5, dab.radius) + 1) / 2));
+  const px = Math.min(img.width - 1, Math.floor(u * img.width));
+  const py = Math.min(img.height - 1, Math.floor(v * img.height));
+  return (py * img.width + px) * 4;
+}
 function effectPaintKey(p) {
-  return JSON.stringify({ type: "effect", effect: p.effect, provider: p.provider, values: p.values, time: p.time });
+  return JSON.stringify({ type: "effect", effect: p.effect, provider: p.provider, values: p.values, time: p.time, ...p.map ? { map: p.map } : {} });
 }
 function isPaintEffectPaint(raw) {
   return Boolean(raw) && typeof raw === "object" && raw.type === "effect";
 }
+function readMapLeniently(raw) {
+  try {
+    return readEffectStrokeMap(raw);
+  } catch {
+    return void 0;
+  }
+}
 function readPaintEffectPaint(raw) {
   if (!isPaintEffectPaint(raw)) return null;
   const r = raw;
@@ -51,11 +89,27 @@ function readPaintEffectPaint(raw) {
     effect: r.effect,
     provider: typeof r.provider === "string" ? r.provider : "",
     values: JSON.parse(JSON.stringify(r.values)),
-    time: typeof r.time === "number" && Number.isFinite(r.time) && r.time > 0 ? r.time : 0
+    time: typeof r.time === "number" && Number.isFinite(r.time) && r.time > 0 ? r.time : 0,
+    ...readMapLeniently(r.map) ? { map: readMapLeniently(r.map) } : {},
+    ...r.live === true ? { live: true } : {}
   };
 }
-function sampleEffectField(img, rect, vals, field) {
+function sampleEffectField(img, rect, vals, field, dab) {
   const { width, height, data } = img;
+  if (img.map && dab) {
+    for (let yy = 0, k = 0; yy < rect.height; yy++) {
+      for (let xx = 0; xx < rect.width; xx++, k++) {
+        const i = stripIndex(img, img.map, dab, rect.x + xx + 0.5, rect.y + yy + 0.5);
+        const f = k * 3;
+        const a = data[i + 3];
+        if (a < 255) vals[k] *= a / 255;
+        field[f] = data[i] / 255;
+        field[f + 1] = data[i + 1] / 255;
+        field[f + 2] = data[i + 2] / 255;
+      }
+    }
+    return;
+  }
   for (let yy = 0, k = 0; yy < rect.height; yy++) {
     const y = rect.y + yy;
     const inY = y >= 0 && y < height;
@@ -76,7 +130,14 @@ function sampleEffectField(img, rect, vals, field) {
     }
   }
 }
-function sampleEffectAt(img, x, y, out) {
+function sampleEffectAt(img, x, y, out, dab) {
+  if (img.map && dab) {
+    const i2 = stripIndex(img, img.map, dab, x, y);
+    out[0] = img.data[i2] / 255;
+    out[1] = img.data[i2 + 1] / 255;
+    out[2] = img.data[i2 + 2] / 255;
+    return img.data[i2 + 3] / 255;
+  }
   const px = Math.floor(x);
   const py = Math.floor(y);
   if (px < 0 || py < 0 || px >= img.width || py >= img.height) return 0;
@@ -86,6 +147,20 @@ function sampleEffectAt(img, x, y, out) {
   out[2] = img.data[i + 2] / 255;
   return img.data[i + 3] / 255;
 }
+function effectDabField(img, rect, cov, centre, mixed, field, steps = 0, dab = null) {
+  sampleEffectField(img, rect, cov, field, dab);
+  const d0 = mixed[0] - centre[0];
+  const d1 = mixed[1] - centre[1];
+  const d2 = mixed[2] - centre[2];
+  const n = rect.width * rect.height;
+  for (let k = 0; k < n; k++) {
+    if (steps) cov[k] = Math.round(cov[k] * steps) / steps;
+    const f = k * 3;
+    field[f] = Math.min(1, Math.max(0, field[f] + d0));
+    field[f + 1] = Math.min(1, Math.max(0, field[f + 1] + d1));
+    field[f + 2] = Math.min(1, Math.max(0, field[f + 2] + d2));
+  }
+}
 
 // src/paint-editor/paper.ts
 var PAPER_FAMILIES = ["watercolor", "drawing", "pastel", "canvas", "panel", "smooth"];
@@ -490,7 +565,7 @@ var DryStroke = class {
       if (this.options.effect) {
         if (this.field.length < n * 3) this.field = new Float32Array(n * 3);
         field = this.field.subarray(0, n * 3);
-        sampleEffectField(this.options.effect, rect, vals, field);
+        sampleEffectField(this.options.effect, rect, vals, field, d);
       }
       this.coverage.accumulate(rect, vals, d.opacity, null, field);
       rects.push(rect);
@@ -692,6 +767,10 @@ var StickerSpray = class {
     const a = rand01(seed, i, 53) * Math.PI * 2;
     const dist = rand01(seed, i, 55) * off;
     const base = this.colorAt(d, Math.cos(a) * dist, Math.sin(a) * dist);
+    if (!(base.alpha > 0)) {
+      this.next++;
+      return;
+    }
     const sticker = {
       id: `st${this.next++}`,
       stamp: st.stamps[Math.floor(rand01(seed, i, 57) * st.stamps.length)] ?? "dot",
@@ -710,6 +789,12 @@ var StickerSpray = class {
   sampler;
   /** A sticker's colour: the paint colour, or gradient paint at its dab (`dx`, `dy` from the dab's centre). */
   colorAt(d, dx, dy) {
+    const effect = this.init.effect;
+    if (effect) {
+      const rgb = [0, 0, 0];
+      const alpha = sampleEffectAt(effect, d.x + dx, d.y + dy, rgb, d);
+      return { color: "#" + rgb.map((c) => Math.round(c * 255).toString(16).padStart(2, "0")).join(""), alpha };
+    }
     const g = this.init.paint;
     if (!g) return { color: this.init.color, alpha: 1 };
     this.sampler ??= new PaintGradientSampler(g, this.init.seed);
@@ -841,10 +926,8 @@ var MarkStroke = class {
     return rects;
   }
   step(copy, d, rects) {
-    if (this.sampler) {
-      this.pen = d;
-      if (!this.tipTable) this.sampler.dab(d, this.penColor);
-    }
+    this.pen = d;
+    if (this.sampler && !this.tipTable) this.sampler.dab(d, this.penColor);
     this.advance(copy, d, rects);
   }
   /** The colour of a mark at (x, y): its pen dab's, or across the tip by its offset from the pen. */
@@ -887,7 +970,7 @@ var MarkStroke = class {
     if (this.options.effect) {
       if (this.field.length < n * 3) this.field = new Float32Array(n * 3);
       const field = this.field.subarray(0, n * 3);
-      sampleEffectField(this.options.effect, rect, vals, field);
+      sampleEffectField(this.options.effect, rect, vals, field, this.pen);
       this.coverage.accumulate(rect, vals, dab.opacity, null, field);
     } else {
       const color = this.markColor(x, y);
@@ -1888,11 +1971,16 @@ function parseBrushLibrary(raw, problems = []) {
 }
 
 export {
+  EFFECT_STRIP_HEIGHT,
+  EFFECT_MAP_REPEATS,
+  effectPaintSize,
+  readEffectStrokeMap,
   effectPaintKey,
   isPaintEffectPaint,
   readPaintEffectPaint,
   sampleEffectField,
   sampleEffectAt,
+  effectDabField,
   PAPER_FAMILIES,
   PAPER_LIBRARY,
   DEFAULT_PAPER,

package/dist/{chunk-XK4SST43.js → chunk-ZDPLZDTT.js}

@@ -18,7 +18,7 @@ import {
   unionBounds,
   vectorGradientPoints,
   widthProfileAt
-} from "./chunk-7YGBSFC6.js";
+} from "./chunk-ILM6GYAX.js";
 import {
   segmentLength,
   segmentParamAtLength,