refactor: update passing of color argument for blended pixels

Author: EscapedGibbon

src/draw/drawCircleOnImage.ts

@@ -61,22 +61,20 @@ export function drawCircleOnImage(
   radius = Math.round(radius);
 
   if (radius === 0) {
-    setBlendedVisiblePixel(newImage, center.column, center.row, { color });
+    setBlendedVisiblePixel(newImage, center.column, center.row, color);
     return newImage;
   }
 
   if (!fill) {
     circle(center.column, center.row, radius, (column: number, row: number) => {
-      setBlendedVisiblePixel(newImage, column, row, { color });
+      setBlendedVisiblePixel(newImage, column, row, color);
     });
   } else {
     if (radius === 1) {
-      setBlendedVisiblePixel(newImage, center.column, center.row, {
-        color: fill,
-      });
+      setBlendedVisiblePixel(newImage, center.column, center.row, fill);
     }
     circle(center.column, center.row, radius, (column: number, row: number) => {
-      setBlendedVisiblePixel(newImage, column, row, { color });
+      setBlendedVisiblePixel(newImage, column, row, color);
 
       //todo: fill is not optimal we can fill symmetrically
       if (column - 1 > center.column) {

src/draw/drawLineOnImage.ts

@@ -57,7 +57,7 @@ export function drawLineOnImage(
     Math.round(origin.column + to.column),
     Math.round(origin.row + to.row),
     (column: number, row: number) => {
-      setBlendedVisiblePixel(newImage, column, row, { color });
+      setBlendedVisiblePixel(newImage, column, row, color);
     },
   );
   return newImage;

src/draw/drawPoints.ts

@@ -66,7 +66,7 @@ export function drawPoints(
       newImage,
       Math.round(origin.column + point.column),
       Math.round(origin.row + point.row),
-      { color },
+      color,
     );
   }
 

src/draw/drawPolygonOnImage.ts

@@ -66,7 +66,7 @@ export function drawPolygonOnImage(
             newImage,
             Math.round(origin.column) + column,
             Math.round(origin.row) + row,
-            { color: fillColor },
+            fillColor,
           );
         }
       }

src/draw/drawRectangle.ts

@@ -83,24 +83,26 @@ export function drawRectangle(
       currentColumn < column + width;
       currentColumn++
     ) {
-      setBlendedVisiblePixel(newImage, currentColumn, row, {
-        color: strokeColor,
-      });
-      setBlendedVisiblePixel(newImage, currentColumn, row + height - 1, {
-        color: strokeColor,
-      });
+      setBlendedVisiblePixel(newImage, currentColumn, row, strokeColor);
+      setBlendedVisiblePixel(
+        newImage,
+        currentColumn,
+        row + height - 1,
+        strokeColor,
+      );
     }
     for (
       let currentRow = row + 1;
       currentRow < row + height - 1;
       currentRow++
     ) {
-      setBlendedVisiblePixel(newImage, column, currentRow, {
-        color: strokeColor,
-      });
-      setBlendedVisiblePixel(newImage, column + width - 1, currentRow, {
-        color: strokeColor,
-      });
+      setBlendedVisiblePixel(newImage, column, currentRow, strokeColor);
+      setBlendedVisiblePixel(
+        newImage,
+        column + width - 1,
+        currentRow,
+        strokeColor,
+      );
     }
   }
   if (fillColor !== 'none') {
@@ -114,12 +116,7 @@ export function drawRectangle(
         currentColumn < column + width - 1;
         currentColumn++
       ) {
-        /* setBlendedVisiblePixel(newImage, currentColumn, currentRow, {
-          color: fillColor,
-        });*/
-        setBlendedVisiblePixel(newImage, currentColumn, currentRow, {
-          color: fillColor,
-        });
+        setBlendedVisiblePixel(newImage, currentColumn, currentRow, fillColor);
       }
     }
   }

src/operations/copyTo.ts

@@ -69,9 +69,7 @@ export function copyTo(
         currentColumn - column,
         currentRow - row,
       );
-      setBlendedPixel(result, currentColumn, currentRow, {
-        color: sourcePixel,
-      });
+      setBlendedPixel(result, currentColumn, currentRow, sourcePixel);
     }
   }
 

src/operations/paintMaskOnImage.ts

@@ -68,9 +68,7 @@ export function paintMaskOnImage(
         currentColumn++
       ) {
         if (mask.getBit(currentColumn - column, currentRow - row)) {
-          setBlendedPixel(result, currentColumn, currentRow, {
-            color,
-          });
+          setBlendedPixel(result, currentColumn, currentRow, color);
         }
       }
     }

src/utils/setBlendedPixel.ts

@@ -4,28 +4,21 @@ import { Mask } from '../Mask';
 import { getDefaultColor } from './getDefaultColor';
 import { assert } from './validators/assert';
 
-export interface SetBlendedPixelOptions {
-  /**
-   * Color with which to blend the image pixel.
-   * @default `'Opaque black'`.
-   */
-  color?: number[];
-}
-
 /**
  * Blend the given pixel with the pixel at the specified location in the image.
  * @param image - The image with which to blend.
  * @param column - Column of the target pixel.
  * @param row - Row of the target pixel.
- * @param options - Set blended pixel options.
+ * @param color - Color with which to blend the image pixel. @default `'Opaque black'`.
  */
+
 export function setBlendedPixel(
   image: Image | Mask,
   column: number,
   row: number,
-  options: SetBlendedPixelOptions = {},
+  color?: number[],
 ) {
-  const { color = getDefaultColor(image) } = options;
+  color = color ?? getDefaultColor(image);
 
   if (!image.alpha) {
     image.setPixel(column, row, color);

src/utils/setBlendedVisiblePixel.ts

@@ -1,67 +1,22 @@
 import { Image } from '../Image';
 import { Mask } from '../Mask';
 
-import { getDefaultColor } from './getDefaultColor';
-import { assert } from './validators/assert';
-
-export interface SetBlendedVisiblePixelOptions {
-  /**
-   * Color with which to blend the image pixel.
-   * @default `'Opaque black'`.
-   */
-  color?: number[];
-}
+import { setBlendedPixel } from './setBlendedPixel';
 
 /**
  * Blend the given pixel with the pixel at the specified location in the image if the pixel is in image's bounds.
  * @param image - The image with which to blend.
  * @param column - Column of the target pixel.
  * @param row - Row of the target pixel.
- * @param options - Set blended pixel options.
+ * @param color - Color with which to blend the image pixel. @default `'Opaque black'`.
  */
 export function setBlendedVisiblePixel(
   image: Image | Mask,
   column: number,
   row: number,
-  options: SetBlendedVisiblePixelOptions = {},
+  color?: number[],
 ) {
-  const { color = getDefaultColor(image) } = options;
-
-  if (!image.alpha) {
-    image.setVisiblePixel(column, row, color);
-  } else {
-    assert(image instanceof Image);
-
-    const sourceAlpha = color.at(-1) as number;
-
-    if (sourceAlpha === image.maxValue) {
-      image.setVisiblePixel(column, row, color);
-      return;
-    }
-
-    const targetAlpha = image.getValue(column, row, image.channels - 1);
-
-    const newAlpha =
-      sourceAlpha + targetAlpha * (1 - sourceAlpha / image.maxValue);
-    if (column >= 0 && column < image.width && row >= 0 && row < image.height) {
-      image.setValue(column, row, image.channels - 1, newAlpha);
-    }
-    for (let component = 0; component < image.components; component++) {
-      const sourceComponent = color[component];
-      const targetComponent = image.getValue(column, row, component);
-
-      const newComponent =
-        (sourceComponent * sourceAlpha +
-          targetComponent * targetAlpha * (1 - sourceAlpha / image.maxValue)) /
-        newAlpha;
-      if (
-        column >= 0 &&
-        column < image.width &&
-        row >= 0 &&
-        row < image.height
-      ) {
-        image.setValue(column, row, component, newComponent);
-      }
-    }
+  if (column >= 0 && column < image.width && row >= 0 && row < image.height) {
+    setBlendedPixel(image, column, row, color);
   }
 }