@pixerate/editor 0.219.1 → 0.220.0

package/dist/{chunk-3X244IZ5.js → chunk-A7GJ6BXI.js}

@@ -810,54 +810,62 @@ function selectObjectIn(pixels, target, options = {}) {
   let half = Math.max(24, Math.round(0.3 * Math.max(w, h)));
   let seed = null;
   let reseeds = 0;
+  let small;
   for (; ; ) {
     const rx = Math.max(0, px - half);
     const ry = Math.max(0, py - half);
     const roi = { x: rx, y: ry, width: Math.min(w, px + half + 1) - rx, height: Math.min(h, py + half + 1) - ry };
     const whole = roi.width === w && roi.height === h;
     const band = Math.max(4, Math.round(0.15 * half));
-    const radius = seed ?? 0.3 * half;
     const n = roi.width * roi.height;
-    const initial = new Uint8Array(n);
     const hardBg = new Uint8Array(n);
     const hardFg = new Uint8Array(n);
     const inBand = (x, y) => rx > 0 && x < band || ry > 0 && y < band || rx + roi.width < w && x >= roi.width - band || ry + roi.height < h && y >= roi.height - band;
     for (let y = 0; y < roi.height; y++) {
       for (let x = 0; x < roi.width; x++) {
         const p = y * roi.width + x;
-        const d = Math.hypot(rx + x - px, ry + y - py);
         if (inBand(x, y)) hardBg[p] = 1;
-        else if (d <= radius) initial[p] = 1;
-        if (d <= 1.5) hardFg[p] = 1;
+        if (Math.hypot(rx + x - px, ry + y - py) <= 1.5) hardFg[p] = 1;
       }
     }
-    const label = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
-    keepMainPieces(label, roi.width, roi.height, (py - ry) * roi.width + (px - rx));
-    let touches = false;
-    for (let y = 0; y < roi.height && !touches; y++) {
-      for (let x = 0; x < roi.width; x++) {
-        if (label[y * roi.width + x] && (inBand(x - 1, y) || inBand(x + 1, y) || inBand(x, y - 1) || inBand(x, y + 1))) {
-          touches = true;
-          break;
+    const cut = (radius) => {
+      const initial = new Uint8Array(n);
+      let seeded2 = 0;
+      for (let y = 0; y < roi.height; y++) {
+        for (let x = 0; x < roi.width; x++) {
+          const p = y * roi.width + x;
+          if (!hardBg[p] && Math.hypot(rx + x - px, ry + y - py) <= radius) {
+            initial[p] = 1;
+            seeded2++;
+          }
         }
       }
-    }
-    if (!touches && reseeds < 2) {
-      let found = 0;
-      let seeded = 0;
-      for (let p = 0; p < n; p++) {
-        found += label[p];
-        seeded += initial[p];
-      }
-      if (found * 2 < seeded) {
-        reseeds++;
-        seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
-        continue;
+      const label2 = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
+      keepMainPieces(label2, roi.width, roi.height, (py - ry) * roi.width + (px - rx));
+      let found2 = 0;
+      let touches2 = false;
+      for (let y = 0; y < roi.height; y++) {
+        for (let x = 0; x < roi.width; x++) {
+          if (!label2[y * roi.width + x]) continue;
+          found2++;
+          if (inBand(x - 1, y) || inBand(x + 1, y) || inBand(x, y - 1) || inBand(x, y + 1)) touches2 = true;
+        }
       }
+      return { label: label2, seeded: seeded2, found: found2, touches: touches2 };
+    };
+    const { label, seeded, found, touches } = cut(seed ?? 0.3 * half);
+    if (!touches && reseeds < 2 && found * 2 < seeded) {
+      reseeds++;
+      seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
+      continue;
+    }
+    if (touches && small === void 0) {
+      const s = cut(Math.max(2, 0.05 * half));
+      small = !s.touches && s.found > 1.5 * s.seeded ? { roi, label: s.label } : null;
     }
     if (!touches || whole) {
       report?.(0.9, "Scaling up");
-      const out = upscaleRegion(work, pixels, roi, label, enhance);
+      const out = small && edgesReached(label, roi, w, h) >= 3 ? upscaleRegion(work, pixels, small.roi, small.label, enhance) : upscaleRegion(work, pixels, roi, label, enhance);
       report?.(1, "Done");
       return out;
     }
@@ -865,6 +873,15 @@ function selectObjectIn(pixels, target, options = {}) {
     seed = null;
   }
 }
+function edgesReached(label, roi, w, h) {
+  const { x: rx, y: ry, width: rw, height: rh } = roi;
+  const row = (y) => label.subarray(y * rw, (y + 1) * rw).includes(1);
+  const col = (x) => {
+    for (let y = 0; y < rh; y++) if (label[y * rw + x]) return true;
+    return false;
+  };
+  return +(rx === 0 && col(0)) + +(ry === 0 && row(0)) + +(rx + rw === w && col(rw - 1)) + +(ry + rh === h && row(rh - 1));
+}
 
 // src/image-editor/selection/segment/quick.ts
 var BINS = 16;

package/dist/{chunk-SRMDF2VN.cjs → chunk-JBBJE76O.cjs}

@@ -810,54 +810,62 @@ function selectObjectIn(pixels, target, options = {}) {
   let half = Math.max(24, Math.round(0.3 * Math.max(w, h)));
   let seed = null;
   let reseeds = 0;
+  let small;
   for (; ; ) {
     const rx = Math.max(0, px - half);
     const ry = Math.max(0, py - half);
     const roi = { x: rx, y: ry, width: Math.min(w, px + half + 1) - rx, height: Math.min(h, py + half + 1) - ry };
     const whole = roi.width === w && roi.height === h;
     const band = Math.max(4, Math.round(0.15 * half));
-    const radius = _nullishCoalesce(seed, () => ( 0.3 * half));
     const n = roi.width * roi.height;
-    const initial = new Uint8Array(n);
     const hardBg = new Uint8Array(n);
     const hardFg = new Uint8Array(n);
     const inBand = (x, y) => rx > 0 && x < band || ry > 0 && y < band || rx + roi.width < w && x >= roi.width - band || ry + roi.height < h && y >= roi.height - band;
     for (let y = 0; y < roi.height; y++) {
       for (let x = 0; x < roi.width; x++) {
         const p = y * roi.width + x;
-        const d = Math.hypot(rx + x - px, ry + y - py);
         if (inBand(x, y)) hardBg[p] = 1;
-        else if (d <= radius) initial[p] = 1;
-        if (d <= 1.5) hardFg[p] = 1;
+        if (Math.hypot(rx + x - px, ry + y - py) <= 1.5) hardFg[p] = 1;
       }
     }
-    const label = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
-    keepMainPieces(label, roi.width, roi.height, (py - ry) * roi.width + (px - rx));
-    let touches = false;
-    for (let y = 0; y < roi.height && !touches; y++) {
-      for (let x = 0; x < roi.width; x++) {
-        if (label[y * roi.width + x] && (inBand(x - 1, y) || inBand(x + 1, y) || inBand(x, y - 1) || inBand(x, y + 1))) {
-          touches = true;
-          break;
+    const cut = (radius) => {
+      const initial = new Uint8Array(n);
+      let seeded2 = 0;
+      for (let y = 0; y < roi.height; y++) {
+        for (let x = 0; x < roi.width; x++) {
+          const p = y * roi.width + x;
+          if (!hardBg[p] && Math.hypot(rx + x - px, ry + y - py) <= radius) {
+            initial[p] = 1;
+            seeded2++;
+          }
         }
       }
-    }
-    if (!touches && reseeds < 2) {
-      let found = 0;
-      let seeded = 0;
-      for (let p = 0; p < n; p++) {
-        found += label[p];
-        seeded += initial[p];
-      }
-      if (found * 2 < seeded) {
-        reseeds++;
-        seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
-        continue;
+      const label2 = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
+      keepMainPieces(label2, roi.width, roi.height, (py - ry) * roi.width + (px - rx));
+      let found2 = 0;
+      let touches2 = false;
+      for (let y = 0; y < roi.height; y++) {
+        for (let x = 0; x < roi.width; x++) {
+          if (!label2[y * roi.width + x]) continue;
+          found2++;
+          if (inBand(x - 1, y) || inBand(x + 1, y) || inBand(x, y - 1) || inBand(x, y + 1)) touches2 = true;
+        }
       }
+      return { label: label2, seeded: seeded2, found: found2, touches: touches2 };
+    };
+    const { label, seeded, found, touches } = cut(_nullishCoalesce(seed, () => ( 0.3 * half)));
+    if (!touches && reseeds < 2 && found * 2 < seeded) {
+      reseeds++;
+      seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
+      continue;
+    }
+    if (touches && small === void 0) {
+      const s = cut(Math.max(2, 0.05 * half));
+      small = !s.touches && s.found > 1.5 * s.seeded ? { roi, label: s.label } : null;
     }
     if (!touches || whole) {
       _optionalChain([report, 'optionalCall', _10 => _10(0.9, "Scaling up")]);
-      const out = upscaleRegion(work, pixels, roi, label, enhance);
+      const out = small && edgesReached(label, roi, w, h) >= 3 ? upscaleRegion(work, pixels, small.roi, small.label, enhance) : upscaleRegion(work, pixels, roi, label, enhance);
       _optionalChain([report, 'optionalCall', _11 => _11(1, "Done")]);
       return out;
     }
@@ -865,6 +873,15 @@ function selectObjectIn(pixels, target, options = {}) {
     seed = null;
   }
 }
+function edgesReached(label, roi, w, h) {
+  const { x: rx, y: ry, width: rw, height: rh } = roi;
+  const row = (y) => label.subarray(y * rw, (y + 1) * rw).includes(1);
+  const col = (x) => {
+    for (let y = 0; y < rh; y++) if (label[y * rw + x]) return true;
+    return false;
+  };
+  return +(rx === 0 && col(0)) + +(ry === 0 && row(0)) + +(rx + rw === w && col(rw - 1)) + +(ry + rh === h && row(rh - 1));
+}
 
 // src/image-editor/selection/segment/quick.ts
 var BINS = 16;