@pixerate/editor 0.118.0 → 0.120.0

package/dist/{chunk-IVSNUXW7.js → chunk-T7IZDNSL.js}

@@ -418,6 +418,7 @@ function applyStrokeToTile(coverage, tileData, channels, tx, ty, s, options = {}
 function applyStrokeToDeepTile(coverage, samples, tx, ty, s, options = {}) {
   const linear = samples instanceof Float32Array;
   const scale = linear ? 1 : 65535;
+  const n = options.channels ?? 4;
   const out = (options.into ?? samples).slice();
   const ox = tx * TILE + s.offset.x;
   const oy = ty * TILE + s.offset.y;
@@ -432,8 +433,9 @@ function applyStrokeToDeepTile(coverage, samples, tx, ty, s, options = {}) {
     x1 = Math.min(TILE, Math.ceil(r.x + r.width) - ox);
     y1 = Math.min(TILE, Math.ceil(r.y + r.height) - oy);
     if (x1 <= x0 || y1 <= y0) return out;
-    if (options.into) for (let y = y0; y < y1; y++) out.set(samples.subarray((y * TILE + x0) * 4, (y * TILE + x1) * 4), (y * TILE + x0) * 4);
+    if (options.into) for (let y = y0; y < y1; y++) out.set(samples.subarray((y * TILE + x0) * n, (y * TILE + x1) * n), (y * TILE + x0) * n);
   }
+  const grey = (s.mode === "erase" ? s.background[0] : s.color[0]) / 255 * scale;
   const colour = (c) => {
     const v = [c[0] / 255, c[1] / 255, c[2] / 255, c[3] / 255];
     if (linear) for (let k = 0; k < 3; k++) v[k] = srgbDecode(v[k]);
@@ -461,6 +463,12 @@ function applyStrokeToDeepTile(coverage, samples, tx, ty, s, options = {}) {
       }
       if (k > 1) k = 1;
       if (k <= 0) continue;
+      if (n === 1) {
+        const p = y * TILE + x;
+        const v = out[p] + (grey - out[p]) * k;
+        out[p] = linear ? v : Math.round(v);
+        continue;
+      }
       const i = (y * TILE + x) * 4;
       if (s.mode === "erase" && !s.lockTransparency) {
         put(i + 3, out[i + 3] / scale * (1 - k));
@@ -597,6 +605,10 @@ var PaintExchange = class {
     this.amount *= 1 - this.rates.drain;
   }
 };
+function put255(px, i, v) {
+  if (px instanceof Float32Array) px[i] = v > 0 ? v * 255 : 0;
+  else px[i] = Math.round(v * 255);
+}
 var TileMedium = class {
   constructor(target, options = {}) {
     this.target = target;
@@ -716,10 +728,10 @@ var TileMedium = class {
           src[1] = pg;
           src[2] = pb;
           const r = blendPixel(blend, cb, src, k);
-          px[i] = Math.round(r[0] * 255);
-          px[i + 1] = Math.round(r[1] * 255);
-          px[i + 2] = Math.round(r[2] * 255);
-          if (!t.lockTransparency) px[i + 3] = Math.round(r[3] * 255);
+          put255(px, i, r[0]);
+          put255(px, i + 1, r[1]);
+          put255(px, i + 2, r[2]);
+          if (!t.lockTransparency) put255(px, i + 3, r[3]);
           continue;
         }
         const a = px[i + 3] / 255;
@@ -730,10 +742,10 @@ var TileMedium = class {
           o[1] = pg;
           o[2] = pb;
         } else if (pigment && field) {
-          mixPigment8(px[i], px[i + 1], px[i + 2], Math.round(pr * 255), Math.round(pg * 255), Math.round(pb * 255), share, o);
+          mixPigment8(Math.round(px[i]), Math.round(px[i + 1]), Math.round(px[i + 2]), Math.round(pr * 255), Math.round(pg * 255), Math.round(pb * 255), share, o);
         } else if (pigment) {
-          const key = px[i] << 16 | px[i + 1] << 8 | px[i + 2];
-          if (key !== lastKey) {
+          const key = px instanceof Float32Array ? -2 : px[i] << 16 | px[i + 1] << 8 | px[i + 2];
+          if (key !== lastKey || key === -2) {
             setPigmentColor(this.canvasPig, px[i] / 255, px[i + 1] / 255, px[i + 2] / 255);
             lastKey = key;
           }
@@ -752,10 +764,10 @@ var TileMedium = class {
           o[1] = px[i + 1] / 255 + (pg - px[i + 1] / 255) * share;
           o[2] = px[i + 2] / 255 + (pb - px[i + 2] / 255) * share;
         }
-        px[i] = Math.round(o[0] * 255);
-        px[i + 1] = Math.round(o[1] * 255);
-        px[i + 2] = Math.round(o[2] * 255);
-        px[i + 3] = Math.round(na * 255);
+        put255(px, i, o[0]);
+        put255(px, i + 1, o[1]);
+        put255(px, i + 2, o[2]);
+        put255(px, i + 3, na);
       }
     }
   }
@@ -904,7 +916,7 @@ function blenderDab(medium, rect, cov, opacity, radius, settings, scratch2) {
         const a = px[i + 3] / 255;
         if (a > 0) {
           if (pigment) {
-            const p = pigment8(px[i], px[i + 1], px[i + 2]);
+            const p = pigment8(Math.round(px[i]), Math.round(px[i + 1]), Math.round(px[i + 2]));
             const sa = p.scatter * p.strength * a;
             for (let k = 0; k < N; k++) row[k] += sa * p.ks[k];
             row[N] += sa;
@@ -952,7 +964,7 @@ function blenderDab(medium, rect, cov, opacity, radius, settings, scratch2) {
       if (asum <= 1e-9) {
         if (lock || a <= 0) continue;
         const i2 = medium.locate(dx, dy, true);
-        medium.pixels[i2 + 3] = Math.round(na * 255);
+        put255(medium.pixels, i2 + 3, na);
         continue;
       }
       const share = lock ? t : na > 0 ? t * avgA / na : 1;
@@ -963,17 +975,17 @@ function blenderDab(medium, rect, cov, opacity, radius, settings, scratch2) {
         for (let c = 0; c < N; c++) mixPig.ks[c] = sum(c, x1, y1, x2, y2) / sa;
         mixPig.scatter = sa / asum;
         if (a <= 0 || share >= 1) lerpPigmentInto(mixPig, mixPig, 0, out, 0);
-        else lerpPigmentInto(pigment8(px[i], px[i + 1], px[i + 2]), mixPig, share, out, 0);
+        else lerpPigmentInto(pigment8(Math.round(px[i]), Math.round(px[i + 1]), Math.round(px[i + 2])), mixPig, share, out, 0);
       } else {
         for (let c = 0; c < 3; c++) {
           const m = sum(c, x1, y1, x2, y2) / asum;
           out[c] = a <= 0 || share >= 1 ? m : px[i + c] / 255 + (m - px[i + c] / 255) * share;
         }
       }
-      px[i] = Math.round(out[0] * 255);
-      px[i + 1] = Math.round(out[1] * 255);
-      px[i + 2] = Math.round(out[2] * 255);
-      if (!lock) px[i + 3] = Math.round(na * 255);
+      put255(px, i, out[0]);
+      put255(px, i + 1, out[1]);
+      put255(px, i + 2, out[2]);
+      if (!lock) put255(px, i + 3, na);
     }
   }
 }
@@ -1078,10 +1090,10 @@ var SmudgeTip = class {
           }
           const i = medium.locate(dx, dy, true);
           const out = medium.pixels;
-          out[i] = Math.round(r * 255);
-          out[i + 1] = Math.round(g * 255);
-          out[i + 2] = Math.round(b * 255);
-          out[i + 3] = Math.round(na * 255);
+          put255(out, i, r);
+          put255(out, i + 1, g);
+          put255(out, i + 2, b);
+          put255(out, i + 3, na);
         }
         const pick = (1 - length) * Math.min(1, cv * d.opacity);
         if (pick > 0) {
@@ -3241,6 +3253,7 @@ export {
   MIXER_DRAIN,
   exchangeRates,
   PaintExchange,
+  put255,
   TileMedium,
   DEFAULT_MIXER,
   normalizeMixer,
@@ -3336,4 +3349,4 @@ export {
   flowField,
   WetMedium
 };
-//# sourceMappingURL=chunk-IVSNUXW7.js.map
+//# sourceMappingURL=chunk-T7IZDNSL.js.map