pixel-data-js 0.24.0 → 0.25.2

package/src/index.ts

@@ -12,6 +12,7 @@ export * from './BlendModes/BlendModeRegistry'
 export * from './BlendModes/toBlendModeIndexAndName'
 
 export * from './Canvas/_constants'
+export * from './Canvas/canvas-blend-modes'
 export * from './Canvas/CanvasFrameRenderer'
 export * from './Canvas/PixelCanvas'
 export * from './Canvas/ReusableCanvas'
@@ -30,20 +31,8 @@ export * from './History/PixelWriter'
 
 export * from './History/PixelMutator/mutatorApplyAlphaMask'
 export * from './History/PixelMutator/mutatorApplyBinaryMask'
-
-export * from './History/PixelMutator/mutatorApplyCircleBrushStroke'
-export * from './History/PixelMutator/mutatorBlendColorCircleMask'
-
-export * from './History/PixelMutator/mutatorApplyCirclePencil'
-export * from './History/PixelMutator/mutatorApplyCirclePencilStroke'
-
-export * from './History/PixelMutator/mutatorApplyRectPencil'
-export * from './History/PixelMutator/mutatorApplyRectPencilStroke'
-
-export * from './History/PixelMutator/mutatorApplyRectBrush'
-export * from './History/PixelMutator/mutatorApplyRectBrushStroke'
-
 export * from './History/PixelMutator/mutatorBlendColor'
+export * from './History/PixelMutator/mutatorBlendPaintMask'
 export * from './History/PixelMutator/mutatorBlendPixel'
 export * from './History/PixelMutator/mutatorBlendPixelData'
 export * from './History/PixelMutator/mutatorBlendPixelDataAlphaMask'
@@ -83,9 +72,6 @@ export * from './Input/getSupportedRasterFormats'
 export * from './Mask/AlphaMask'
 export * from './Mask/BinaryMask'
 
-export * from './Mask/CircleAlphaMask'
-export * from './Mask/CircleBinaryMask'
-
 export * from './Mask/applyBinaryMaskToAlphaMask'
 export * from './Mask/copyMask'
 export * from './Mask/extractMask'
@@ -101,10 +87,8 @@ export * from './MaskRect/subtractBinaryMaskRects'
 
 export * from './PixelData/applyAlphaMaskToPixelData'
 export * from './PixelData/applyBinaryMaskToPixelData'
-export * from './PixelData/blendColorPixelDataCircleMask'
 export * from './PixelData/PixelData'
 
-export * from './PixelData/applyRectBrushToPixelData'
 export * from './PixelData/blendColorPixelData'
 export * from './PixelData/blendColorPixelDataAlphaMask'
 export * from './PixelData/blendColorPixelDataBinaryMask'
@@ -126,17 +110,20 @@ export * from './PixelData/pixelDataToAlphaMask'
 export * from './PixelData/reflectPixelData'
 export * from './PixelData/resamplePixelData'
 export * from './PixelData/rotatePixelData'
+export * from './PixelData/writePaintBufferToPixelData'
 export * from './PixelData/writePixelDataBuffer'
 
-export * from './Rect/getCircleBrushOrPencilBounds'
-export * from './Rect/getCircleBrushOrPencilStrokeBounds'
-export * from './Rect/getRectBrushOrPencilBounds'
-export * from './Rect/getRectBrushOrPencilStrokeBounds'
 export * from './Rect/getRectsBounds'
+export * from './Rect/trimMaskRectBounds'
 export * from './Rect/trimRectBounds'
 
-export * from './PixelTile/PaintBuffer'
-export * from './PixelTile/PaintBufferRenderer'
+export * from './Paint/makeCirclePaintAlphaMask'
+export * from './Paint/makeCirclePaintBinaryMask'
+export * from './Paint/makePaintMask'
+export * from './Paint/makeRectFalloffPaintAlphaMask'
+export * from './Paint/PaintBuffer'
+export * from './Paint/PaintBufferCanvasRenderer'
+
 export * from './PixelTile/PixelTile'
 export * from './PixelTile/PixelTilePool'
 

package/src/History/PixelMutator/mutatorApplyCircleBrushStroke.ts

@@ -1,182 +0,0 @@
-import {
-  type AlphaMask,
-  type BlendColor32,
-  type CircleAlphaMask,
-  type Color32,
-  type ColorBlendMaskOptions,
-  type HistoryMutator,
-  MaskType,
-  type Rect,
-} from '../../_types'
-import { forEachLinePoint } from '../../Algorithm/forEachLinePoint'
-import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
-import { blendColorPixelDataAlphaMask } from '../../PixelData/blendColorPixelDataAlphaMask'
-import { getCircleBrushOrPencilBounds } from '../../Rect/getCircleBrushOrPencilBounds'
-import { getCircleBrushOrPencilStrokeBounds } from '../../Rect/getCircleBrushOrPencilStrokeBounds'
-import { PixelWriter } from '../PixelWriter'
-
-const defaults = {
-  forEachLinePoint,
-  blendColorPixelDataAlphaMask,
-  getCircleBrushOrPencilBounds,
-  getCircleBrushOrPencilStrokeBounds,
-}
-
-type Deps = Partial<typeof defaults>
-
-/**
- * @param deps - @hidden
- */
-export const mutatorApplyCircleBrushStroke = ((writer: PixelWriter<any>, deps: Deps = defaults) => {
-  const {
-    forEachLinePoint = defaults.forEachLinePoint,
-    blendColorPixelDataAlphaMask = defaults.blendColorPixelDataAlphaMask,
-    getCircleBrushOrPencilBounds = defaults.getCircleBrushOrPencilBounds,
-    getCircleBrushOrPencilStrokeBounds = defaults.getCircleBrushOrPencilStrokeBounds,
-  } = deps
-
-  const strokeBoundsOut: Rect = {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const circleBrushBounds: Rect = {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const blendColorPixelOptions: ColorBlendMaskOptions = {
-    alpha: 255,
-    blendFn: sourceOverPerfect,
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const mask = {
-    type: MaskType.ALPHA,
-    data: null as unknown as Uint8Array,
-    w: 0,
-    h: 0,
-  }
-
-  return {
-    applyCircleBrushStroke(
-      color: Color32,
-      x0: number,
-      y0: number,
-      x1: number,
-      y1: number,
-      brush: CircleAlphaMask,
-      alpha = 255,
-      blendFn: BlendColor32 = sourceOverPerfect,
-    ) {
-      const brushSize = brush.size
-
-      const {
-        x: bx,
-        y: by,
-        w: bw,
-        h: bh,
-      } = getCircleBrushOrPencilStrokeBounds(
-        x0,
-        y0,
-        x1,
-        y1,
-        brushSize,
-        strokeBoundsOut,
-      )
-
-      if (bw <= 0 || bh <= 0) return
-
-      mask.data = new Uint8Array(bw * bh)
-      mask.w = bw
-      mask.h = bh
-
-      const maskData = mask.data
-      const brushData = brush.data
-      const minOffset = brush.minOffset
-
-      const target = writer.config.target
-      const targetWidth = target.width
-      const targetHeight = target.height
-
-      forEachLinePoint(
-        x0,
-        y0,
-        x1,
-        y1,
-        (px, py) => {
-          const {
-            x: cbx,
-            y: cby,
-            w: cbw,
-            h: cbh,
-          } = getCircleBrushOrPencilBounds(
-            px,
-            py,
-            brushSize,
-            targetWidth,
-            targetHeight,
-            circleBrushBounds,
-          )
-
-          writer.accumulator.storeRegionBeforeState(
-            cbx,
-            cby,
-            cbw,
-            cbh,
-          )
-
-          const startX = Math.max(bx, cbx)
-          const startY = Math.max(by, cby)
-          const endX = Math.min(bx + bw, cbx + cbw)
-          const endY = Math.min(by + bh, cby + cbh)
-
-          const unclippedStartX = Math.floor(px + minOffset)
-          const unclippedStartY = Math.floor(py + minOffset)
-
-          for (let my = startY; my < endY; my++) {
-            const strokeMaskY = my - by
-            const strokeMaskRowOffset = strokeMaskY * bw
-
-            const brushY = my - unclippedStartY
-            const brushRowOffset = brushY * brushSize
-
-            for (let mx = startX; mx < endX; mx++) {
-              const brushX = mx - unclippedStartX
-              const brushVal = brushData[brushRowOffset + brushX]
-
-              if (brushVal > 0) {
-                const strokeMaskIdx = strokeMaskRowOffset + (mx - bx)
-
-                if (brushVal > maskData[strokeMaskIdx]) {
-                  maskData[strokeMaskIdx] = brushVal
-                }
-              }
-            }
-          }
-        },
-      )
-
-      blendColorPixelOptions.blendFn = blendFn
-      blendColorPixelOptions.alpha = alpha
-      blendColorPixelOptions.x = bx
-      blendColorPixelOptions.y = by
-      blendColorPixelOptions.w = bw
-      blendColorPixelOptions.h = bh
-
-      blendColorPixelDataAlphaMask(
-        target,
-        color,
-        mask as AlphaMask,
-        blendColorPixelOptions,
-      )
-    },
-  }
-}) satisfies HistoryMutator<any, Deps>

package/src/History/PixelMutator/mutatorApplyCirclePencil.ts

@@ -1,59 +0,0 @@
-import type { BlendColor32, CircleMask, Color32, HistoryMutator, Rect } from '../../_types'
-import { blendColorPixelDataCircleMask } from '../../PixelData/blendColorPixelDataCircleMask'
-import { getCircleBrushOrPencilBounds } from '../../Rect/getCircleBrushOrPencilBounds'
-import { PixelWriter } from '../PixelWriter'
-
-const defaults = {
-  applyCircleMaskToPixelData: blendColorPixelDataCircleMask,
-  getCircleBrushOrPencilBounds,
-}
-
-type Deps = Partial<typeof defaults>
-
-/**
- * @param deps - @hidden
- **/
-export const mutatorApplyCirclePencil = ((writer: PixelWriter<any>, deps: Deps = defaults) => {
-  const {
-    applyCircleMaskToPixelData = defaults.applyCircleMaskToPixelData,
-    getCircleBrushOrPencilBounds = defaults.getCircleBrushOrPencilBounds,
-  } = deps
-
-  const boundsOut: Rect = { x: 0, y: 0, w: 0, h: 0 }
-
-  return {
-    applyCirclePencil(
-      color: Color32,
-      centerX: number,
-      centerY: number,
-      brush: CircleMask,
-      alpha = 255,
-      blendFn?: BlendColor32,
-    ): boolean {
-
-      const target = writer.config.target
-      const b = getCircleBrushOrPencilBounds(
-        centerX,
-        centerY,
-        brush.size,
-        target.width,
-        target.height,
-        boundsOut,
-      )
-
-      const didChange = writer.accumulator.storeRegionBeforeState(b.x, b.y, b.w, b.h)
-      return didChange(
-        applyCircleMaskToPixelData(
-          target,
-          color,
-          centerX,
-          centerY,
-          brush,
-          alpha,
-          blendFn,
-          b,
-        ),
-      )
-    },
-  }
-}) satisfies HistoryMutator<any, Deps>

package/src/History/PixelMutator/mutatorApplyCirclePencilStroke.ts

@@ -1,172 +0,0 @@
-import {
-  type BinaryMask,
-  type BlendColor32,
-  type CircleBinaryMask,
-  type Color32,
-  type ColorBlendMaskOptions,
-  type HistoryMutator,
-  MaskType,
-  type Rect,
-} from '../../_types'
-import { forEachLinePoint } from '../../Algorithm/forEachLinePoint'
-import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
-import { blendColorPixelDataBinaryMask } from '../../PixelData/blendColorPixelDataBinaryMask'
-import { getCircleBrushOrPencilBounds } from '../../Rect/getCircleBrushOrPencilBounds'
-import { getCircleBrushOrPencilStrokeBounds } from '../../Rect/getCircleBrushOrPencilStrokeBounds'
-import { PixelWriter } from '../PixelWriter'
-
-const defaults = {
-  forEachLinePoint,
-  blendColorPixelDataBinaryMask,
-  getCircleBrushOrPencilBounds,
-  getCircleBrushOrPencilStrokeBounds,
-}
-
-type Deps = Partial<typeof defaults>
-
-/**
- * @param deps - @hidden
- */
-export const mutatorApplyCirclePencilStroke = ((writer: PixelWriter<any>, deps: Deps = defaults) => {
-  const {
-    forEachLinePoint = defaults.forEachLinePoint,
-    blendColorPixelDataBinaryMask = defaults.blendColorPixelDataBinaryMask,
-    getCircleBrushOrPencilStrokeBounds = defaults.getCircleBrushOrPencilStrokeBounds,
-    getCircleBrushOrPencilBounds = defaults.getCircleBrushOrPencilBounds,
-  } = deps
-
-  const strokeBoundsOut: Rect = {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const circlePencilBounds: Rect = {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const blendColorPixelOptions: ColorBlendMaskOptions = {
-    alpha: 255,
-    blendFn: sourceOverPerfect,
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0,
-  }
-
-  const mask = {
-    type: MaskType.BINARY,
-    data: null as unknown as Uint8Array,
-    w: 0,
-    h: 0,
-  }
-
-  return {
-    applyCirclePencilStroke(
-      color: Color32,
-      x0: number,
-      y0: number,
-      x1: number,
-      y1: number,
-      brush: CircleBinaryMask,
-      alpha = 255,
-      blendFn: BlendColor32 = sourceOverPerfect,
-    ) {
-      const {
-        x: bx,
-        y: by,
-        w: bw,
-        h: bh,
-      } = getCircleBrushOrPencilStrokeBounds(
-        x0,
-        y0,
-        x1,
-        y1,
-        brush.size,
-        strokeBoundsOut,
-      )
-
-      if (bw <= 0 || bh <= 0) return
-
-      mask.data = new Uint8Array(bw * bh)
-      mask.w = bw
-      mask.h = bh
-
-      const maskData = mask.data
-      const target = writer.config.target
-      const targetWidth = target.width
-      const targetHeight = target.height
-
-      forEachLinePoint(
-        x0,
-        y0,
-        x1,
-        y1,
-        (px, py) => {
-          const {
-            x: cbx,
-            y: cby,
-            w: cbw,
-            h: cbh,
-          } = getCircleBrushOrPencilBounds(
-            px,
-            py,
-            brush.size,
-            targetWidth,
-            targetHeight,
-            circlePencilBounds,
-          )
-
-          writer.accumulator.storeRegionBeforeState(
-            cbx,
-            cby,
-            cbw,
-            cbh,
-          )
-
-          const unclippedStartX = Math.floor(px + brush.minOffset)
-          const unclippedStartY = Math.floor(py + brush.minOffset)
-
-          const startX = Math.max(bx, unclippedStartX)
-          const startY = Math.max(by, unclippedStartY)
-          const endX = Math.min(bx + bw, unclippedStartX + brush.w)
-          const endY = Math.min(by + bh, unclippedStartY + brush.h)
-
-          for (let my = startY; my < endY; my++) {
-            const brushY = my - unclippedStartY
-            const maskRowOffset = (my - by) * bw
-            const brushRowOffset = brushY * brush.w
-
-            for (let mx = startX; mx < endX; mx++) {
-              const brushX = mx - unclippedStartX
-              const brushAlpha = brush.data[brushRowOffset + brushX]
-
-              if (brushAlpha > 0) {
-                const maskIdx = maskRowOffset + (mx - bx)
-                maskData[maskIdx] = brushAlpha
-              }
-            }
-          }
-        },
-      )
-
-      blendColorPixelOptions.blendFn = blendFn
-      blendColorPixelOptions.alpha = alpha
-      blendColorPixelOptions.x = bx
-      blendColorPixelOptions.y = by
-      blendColorPixelOptions.w = bw
-      blendColorPixelOptions.h = bh
-
-      blendColorPixelDataBinaryMask(
-        target,
-        color,
-        mask as BinaryMask,
-        blendColorPixelOptions,
-      )
-    },
-  }
-}) satisfies HistoryMutator<any, Deps>

package/src/History/PixelMutator/mutatorApplyRectBrush.ts

@@ -1,64 +0,0 @@
-import type { BlendColor32, Color32, HistoryMutator, Rect } from '../../_types'
-import { applyRectBrushToPixelData } from '../../PixelData/applyRectBrushToPixelData'
-import { getRectBrushOrPencilBounds } from '../../Rect/getRectBrushOrPencilBounds'
-import { PixelWriter } from '../PixelWriter'
-
-const defaults = {
-  applyRectBrushToPixelData,
-  getRectBrushOrPencilBounds,
-}
-
-type Deps = Partial<typeof defaults>
-
-/**
- * @param deps - @hidden
- */
-export const mutatorApplyRectBrush = ((writer: PixelWriter<any>, deps: Deps = defaults) => {
-  const {
-    applyRectBrushToPixelData = defaults.applyRectBrushToPixelData,
-    getRectBrushOrPencilBounds = defaults.getRectBrushOrPencilBounds,
-  } = deps
-
-  const boundsOut: Rect = { x: 0, y: 0, w: 0, h: 0 }
-
-  return {
-    applyRectBrush(
-      color: Color32,
-      centerX: number,
-      centerY: number,
-      brushWidth: number,
-      brushHeight: number,
-      alpha = 255,
-      fallOff: (dist: number) => number,
-      blendFn?: BlendColor32,
-    ): boolean {
-
-      const target = writer.config.target
-      const b = getRectBrushOrPencilBounds(
-        centerX,
-        centerY,
-        brushWidth,
-        brushHeight,
-        target.width,
-        target.height,
-        boundsOut,
-      )
-
-      const didChange = writer.accumulator.storeRegionBeforeState(b.x, b.y, b.w, b.h)
-      return didChange(
-        applyRectBrushToPixelData(
-          target,
-          color,
-          centerX,
-          centerY,
-          brushWidth,
-          brushHeight,
-          alpha,
-          fallOff,
-          blendFn,
-          b,
-        ),
-      )
-    },
-  }
-}) satisfies HistoryMutator<any, Deps>