asciify-engine 1.0.60 → 1.0.63

package/dist/index.js

@@ -282,9 +282,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;
@@ -308,11 +306,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: {
@@ -732,11 +728,34 @@ function imageToAsciiFrame(source, options, targetWidth, targetHeight) {
   ctx.drawImage(source, 0, 0, cols, rows);
   const imageData = ctx.getImageData(0, 0, cols, rows);
   const pixels = imageData.data;
+  const ck = options.chromaKey;
+  const ckEnabled = ck != null && ck !== false;
+  const ckHeuristicGreen = ck === true;
+  const ckHeuristicBlue = ck === "blue-screen";
+  let ckRGB = null;
+  let ckTolSq = 0;
+  if (ckEnabled && !ckHeuristicGreen && !ckHeuristicBlue) {
+    ckRGB = parseChromaKeyColor(ck);
+    ckTolSq = (options.chromaKeyTolerance ?? 60) ** 2;
+  }
   let normMin = 0;
   let normRange = 255;
   if (options.normalize) {
     let lo = 255, hi = 0;
     for (let k = 0; k < pixels.length; k += 4) {
+      if (ckEnabled) {
+        const pr = pixels[k], pg = pixels[k + 1], pb = pixels[k + 2];
+        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) continue;
+      }
       const l = 0.299 * pixels[k] + 0.587 * pixels[k + 1] + 0.114 * pixels[k + 2];
       if (l < lo) lo = l;
       if (l > hi) hi = l;
@@ -746,16 +765,7 @@ function imageToAsciiFrame(source, options, targetWidth, targetHeight) {
   }
   const frame = [];
   const invertVal = resolveInvert(options.invert);
-  const ck = options.chromaKey;
-  const ckEnabled = ck != null && ck !== false;
-  const ckHeuristicGreen = ck === true;
-  const ckHeuristicBlue = ck === "blue-screen";
-  let ckRGB = null;
-  let ckTolSq = 0;
-  if (ckEnabled && !ckHeuristicGreen && !ckHeuristicBlue) {
-    ckRGB = parseChromaKeyColor(ck);
-    ckTolSq = (options.chromaKeyTolerance ?? 60) ** 2;
-  }
+  const effectiveCharset = ckEnabled ? options.charset.replace(/ /g, "") || options.charset : options.charset;
   for (let y = 0; y < rows; y++) {
     const row = [];
     for (let x = 0; x < cols; x++) {
@@ -785,7 +795,7 @@ function imageToAsciiFrame(source, options, targetWidth, targetHeight) {
       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);