asciify-engine 1.0.61 → 1.0.64

package/dist/index.cjs

@@ -284,9 +284,7 @@ function getCellColorStr(cell, colorMode, acR, acG, acB, _isInverted = false) {
     case "matrix":
       return GREEN_LUT[0.299 * cell.r + 0.587 * cell.g + 0.114 * cell.b | 0];
     case "accent": {
-      const rawAb = (0.299 * cell.r + 0.587 * cell.g + 0.114 * cell.b) / 255;
-      const ab = _isInverted ? 1 - rawAb : rawAb;
-      return `rgb(${acR * ab | 0},${acG * ab | 0},${acB * ab | 0})`;
+      return `rgb(${acR},${acG},${acB})`;
     }
     default: {
       const gray = 0.299 * cell.r + 0.587 * cell.g + 0.114 * cell.b | 0;
@@ -310,11 +308,9 @@ function getCellColorRGB(cell, colorMode, acR, acG, acB, _isInverted = false) {
       break;
     }
     case "accent": {
-      const rawAb = (0.299 * cell.r + 0.587 * cell.g + 0.114 * cell.b) / 255;
-      const ab = _isInverted ? 1 - rawAb : rawAb;
-      _colorRGB[0] = acR * ab | 0;
-      _colorRGB[1] = acG * ab | 0;
-      _colorRGB[2] = acB * ab | 0;
+      _colorRGB[0] = acR;
+      _colorRGB[1] = acG;
+      _colorRGB[2] = acB;
       break;
     }
     default: {
@@ -730,9 +726,14 @@ function imageToAsciiFrame(source, options, targetWidth, targetHeight) {
   if (cols <= 0 || rows <= 0) {
     return { frame: [], cols: 0, rows: 0 };
   }
-  const { ctx } = createOffscreenCanvas(cols, rows);
-  ctx.drawImage(source, 0, 0, cols, rows);
-  const imageData = ctx.getImageData(0, 0, cols, rows);
+  const maxDim = 2048;
+  const ssX = Math.max(1, Math.min(Math.floor(maxDim / cols), Math.floor(srcWidth / cols)));
+  const ssY = Math.max(1, Math.min(Math.floor(maxDim / rows), Math.floor(srcHeight / rows)));
+  const sampleW = cols * ssX;
+  const sampleH = rows * ssY;
+  const { ctx } = createOffscreenCanvas(sampleW, sampleH);
+  ctx.drawImage(source, 0, 0, sampleW, sampleH);
+  const imageData = ctx.getImageData(0, 0, sampleW, sampleH);
   const pixels = imageData.data;
   const ck = options.chromaKey;
   const ckEnabled = ck != null && ck !== false;
@@ -771,36 +772,53 @@ function imageToAsciiFrame(source, options, targetWidth, targetHeight) {
   }
   const frame = [];
   const invertVal = resolveInvert(options.invert);
+  const effectiveCharset = ckEnabled ? options.charset.replace(/ /g, "") || options.charset : options.charset;
+  const ssCount = ssX * ssY;
   for (let y = 0; y < rows; y++) {
     const row = [];
     for (let x = 0; x < cols; x++) {
-      const i = (y * cols + x) * 4;
-      const r = pixels[i];
-      const g = pixels[i + 1];
-      const b = pixels[i + 2];
-      const a = pixels[i + 3];
-      if (ckEnabled) {
-        let keyed = false;
-        if (ckHeuristicGreen) {
-          keyed = g > r * 1.4 && g > b * 1.4 && g > 80;
-        } else if (ckHeuristicBlue) {
-          keyed = b > r * 1.4 && b > g * 1.4 && b > 80;
-        } else if (ckRGB !== null) {
-          const dr = r - ckRGB.r;
-          const dg = g - ckRGB.g;
-          const db = b - ckRGB.b;
-          keyed = dr * dr + dg * dg + db * db <= ckTolSq;
-        }
-        if (keyed) {
-          row.push({ char: " ", r: 0, g: 0, b: 0, a: 0 });
-          continue;
+      let sumR = 0, sumG = 0, sumB = 0, sumA = 0;
+      let keyedCount = 0;
+      for (let sy = 0; sy < ssY; sy++) {
+        const rowOff = (y * ssY + sy) * sampleW;
+        for (let sx = 0; sx < ssX; sx++) {
+          const i = (rowOff + x * ssX + sx) * 4;
+          const pr = pixels[i], pg = pixels[i + 1], pb = pixels[i + 2], pa = pixels[i + 3];
+          if (ckEnabled) {
+            let keyed = false;
+            if (ckHeuristicGreen) {
+              keyed = pg > pr * 1.4 && pg > pb * 1.4 && pg > 80;
+            } else if (ckHeuristicBlue) {
+              keyed = pb > pr * 1.4 && pb > pg * 1.4 && pb > 80;
+            } else if (ckRGB !== null) {
+              const dr = pr - ckRGB.r, dg = pg - ckRGB.g, db = pb - ckRGB.b;
+              keyed = dr * dr + dg * dg + db * db <= ckTolSq;
+            }
+            if (keyed) {
+              keyedCount++;
+              continue;
+            }
+          }
+          sumR += pr;
+          sumG += pg;
+          sumB += pb;
+          sumA += pa;
         }
       }
+      if (ckEnabled && keyedCount > ssCount / 2) {
+        row.push({ char: " ", r: 0, g: 0, b: 0, a: 0 });
+        continue;
+      }
+      const nonKeyed = ssCount - keyedCount;
+      const r = nonKeyed > 0 ? sumR / nonKeyed : 0;
+      const g = nonKeyed > 0 ? sumG / nonKeyed : 0;
+      const b = nonKeyed > 0 ? sumB / nonKeyed : 0;
+      const a = nonKeyed > 0 ? sumA / nonKeyed : 0;
       const rawLum = 0.299 * r + 0.587 * g + 0.114 * b;
       const lum = options.normalize ? (rawLum - normMin) / normRange * 255 : rawLum;
       const adjustedLum = adjustLuminance(lum, options.brightness, options.contrast);
       const ditheredLum = applyDither(adjustedLum, x, y, options.ditherStrength);
-      const char = options.customText ? customTextToChar(ditheredLum, options.customText, x, y, cols, invertVal) : luminanceToChar(ditheredLum, options.charset, invertVal);
+      const char = options.customText ? customTextToChar(ditheredLum, options.customText, x, y, cols, invertVal) : luminanceToChar(ditheredLum, effectiveCharset, invertVal);
       row.push({ char, r, g, b, a, lum: ditheredLum });
     }
     frame.push(row);