pixel-data-js 0.35.0 → 0.37.0

package/src/Paint/Commit/commitMaskPaintBuffer.ts

@@ -1,5 +1,5 @@
-import { type Color32 } from '../../_types'
 import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../../Color/_color-types'
 import type { PixelAccumulator } from '../../History/PixelAccumulator'
 import { blendColorPixelDataAlphaMask } from '../../PixelData/blendColorPixelDataAlphaMask'
 import { blendColorPixelDataBinaryMask } from '../../PixelData/blendColorPixelDataBinaryMask'
@@ -42,7 +42,6 @@ export function commitMaskPaintBuffer(
   blendColorPixelDataMaskFn: any,
 ) {
   const config = accumulator.config
-  const tileShift = config.tileShift
   const lookup = paintBuffer.lookup
 
   SCRATCH_OPTS.alpha = alpha
@@ -54,11 +53,8 @@ export function commitMaskPaintBuffer(
     if (tile) {
       const didChange = accumulator.storeTileBeforeState(tile.id, tile.tx, tile.ty)
 
-      const dx = tile.tx << tileShift
-      const dy = tile.ty << tileShift
-
-      SCRATCH_OPTS.x = dx
-      SCRATCH_OPTS.y = dy
+      SCRATCH_OPTS.x = tile.x
+      SCRATCH_OPTS.y = tile.y
       SCRATCH_OPTS.w = tile.w
       SCRATCH_OPTS.h = tile.h
 

package/src/Paint/Render/AlphaMaskPaintBufferCanvasRenderer.ts

@@ -1,31 +1,46 @@
-import type { Color32 } from '../../_types'
-import type { CanvasObjectFactory } from '../../Canvas/_canvas-types'
-import { DEFAULT_CANVAS_FACTORY } from '../../Internal/_constants'
-import { CANVAS_CTX_FAILED } from '../../Internal/_errors'
-import { makePixelData } from '../../PixelData/PixelData'
+import type { ReusableCanvasFactory } from '../../Canvas/_canvas-types'
+import { makeReusableOffscreenCanvas } from '../../Canvas/ReusableCanvas'
+import type { Color32 } from '../../Color/_color-types'
+import type { PixelData } from '../../PixelData/_pixelData-types'
+import { makeReusablePixelData } from '../../PixelData/ReusablePixelData'
+import type { AlphaMaskTile, TileTargetMeta } from '../../Tile/_tile-types'
 import type { AlphaMaskPaintBuffer } from '../AlphaMaskPaintBuffer'
 
 export type AlphaMaskPaintBufferCanvasRenderer = ReturnType<typeof makeAlphaMaskPaintBufferCanvasRenderer>
 
-export function makeAlphaMaskPaintBufferCanvasRenderer(
+export function makeAlphaMaskPaintBufferCanvasRenderer<T extends HTMLCanvasElement | OffscreenCanvas>(
   paintBuffer: AlphaMaskPaintBuffer,
-  canvasFactory: CanvasObjectFactory<any> = DEFAULT_CANVAS_FACTORY,
+  reusableCanvasFactory?: () => ReusableCanvasFactory<T>,
 ) {
-  const config = paintBuffer.config
-  const tileSize = config.tileSize
-  const tileShift = config.tileShift
-  const tileArea = config.tileArea
-  const lookup = paintBuffer.lookup
-
-  const canvas = canvasFactory(tileSize, tileSize)
-  const ctx = canvas.getContext('2d')
-  if (!ctx) throw new Error(CANVAS_CTX_FAILED)
-  ctx.imageSmoothingEnabled = false
-
-  const bridge = makePixelData(new ImageData(tileSize, tileSize))
-  const view32 = bridge.data
+  const factory = (reusableCanvasFactory ?? makeReusableOffscreenCanvas) as unknown as () => ReusableCanvasFactory<T>
+  const getBuffer = factory()
+  const getBridge = makeReusablePixelData()
+
+  let config: TileTargetMeta
+  let tileSize: number
+  let tileArea: number
+  let lookup: (AlphaMaskTile | undefined)[]
+  let view32: Uint32Array
+  let bridge: PixelData
+  let canvas: HTMLCanvasElement | OffscreenCanvas
+  let ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D
+
+  setBuffer(paintBuffer)
+
+  function setBuffer(value: AlphaMaskPaintBuffer) {
+    paintBuffer = value
+    config = paintBuffer.config
+    tileSize = config.tileSize
+    tileArea = config.tileArea
+    lookup = paintBuffer.lookup
+    bridge = getBridge(tileSize, tileSize)
+    view32 = bridge.data
+    const buff = getBuffer(tileSize, tileSize)
+    canvas = buff.canvas
+    ctx = buff.ctx
+  }
 
-  return function drawPaintBuffer(
+  function draw(
     targetCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
     color: Color32,
     alpha = 255,
@@ -64,15 +79,17 @@ export function makeAlphaMaskPaintBufferCanvasRenderer(
           }
         }
 
-        const dx = tile.tx << tileShift
-        const dy = tile.ty << tileShift
-
         ctx.putImageData(bridge.imageData, 0, 0)
-        targetCtx.drawImage(canvas, dx, dy)
+        targetCtx.drawImage(canvas, tile.x, tile.y)
       }
     }
 
     targetCtx.globalAlpha = 1
     targetCtx.globalCompositeOperation = 'source-over'
   }
+
+  return {
+    draw,
+    setBuffer,
+  }
 }

package/src/Paint/Render/BinaryMaskPaintBufferCanvasRenderer.ts

@@ -1,31 +1,46 @@
-import type { Color32 } from '../../_types'
-import type { CanvasObjectFactory } from '../../Canvas/_canvas-types'
-import { DEFAULT_CANVAS_FACTORY } from '../../Internal/_constants'
-import { CANVAS_CTX_FAILED } from '../../Internal/_errors'
-import { makePixelData } from '../../PixelData/PixelData'
+import type { ReusableCanvasFactory } from '../../Canvas/_canvas-types'
+import { makeReusableOffscreenCanvas } from '../../Canvas/ReusableCanvas'
+import type { Color32 } from '../../Color/_color-types'
+import type { PixelData } from '../../PixelData/_pixelData-types'
+import { makeReusablePixelData } from '../../PixelData/ReusablePixelData'
+import type { BinaryMaskTile, TileTargetMeta } from '../../Tile/_tile-types'
 import type { BinaryMaskPaintBuffer } from '../BinaryMaskPaintBuffer'
 
 export type BinaryMaskPaintBufferCanvasRenderer = ReturnType<typeof makeBinaryMaskPaintBufferCanvasRenderer>
 
-export function makeBinaryMaskPaintBufferCanvasRenderer(
+export function makeBinaryMaskPaintBufferCanvasRenderer<T extends HTMLCanvasElement | OffscreenCanvas>(
   paintBuffer: BinaryMaskPaintBuffer,
-  canvasFactory: CanvasObjectFactory<any> = DEFAULT_CANVAS_FACTORY,
+  reusableCanvasFactory?: () => ReusableCanvasFactory<T>,
 ) {
-  const config = paintBuffer.config
-  const tileSize = config.tileSize
-  const tileShift = config.tileShift
-  const tileArea = config.tileArea
-  const lookup = paintBuffer.lookup
+  const factory = (reusableCanvasFactory ?? makeReusableOffscreenCanvas) as unknown as () => ReusableCanvasFactory<T>
+  const getBuffer = factory()
+  const getBridge = makeReusablePixelData()
 
-  const canvas = canvasFactory(tileSize, tileSize)
-  const ctx = canvas.getContext('2d')
-  if (!ctx) throw new Error(CANVAS_CTX_FAILED)
-  ctx.imageSmoothingEnabled = false
+  let config: TileTargetMeta
+  let tileSize: number
+  let tileArea: number
+  let lookup: (BinaryMaskTile | undefined)[]
+  let view32: Uint32Array
+  let bridge: PixelData
+  let canvas: HTMLCanvasElement | OffscreenCanvas
+  let ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D
 
-  const bridge = makePixelData(new ImageData(tileSize, tileSize))
-  const view32 = bridge.data
+  setBuffer(paintBuffer)
 
-  return function drawPaintBuffer(
+  function setBuffer(value: BinaryMaskPaintBuffer) {
+    paintBuffer = value
+    config = paintBuffer.config
+    tileSize = config.tileSize
+    tileArea = config.tileArea
+    lookup = paintBuffer.lookup
+    bridge = getBridge(tileSize, tileSize)
+    view32 = bridge.data
+    const buff = getBuffer(tileSize, tileSize)
+    canvas = buff.canvas
+    ctx = buff.ctx
+  }
+
+  function draw(
     targetCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
     color: Color32,
     alpha = 255,
@@ -47,21 +62,22 @@ export function makeBinaryMaskPaintBufferCanvasRenderer(
         view32.fill(0)
 
         for (let p = 0; p < tileArea; p++) {
-          // If mask is solid, the final pixel is just the unmodified color
           if (data8[p] === 1) {
             view32[p] = color
           }
         }
 
-        const dx = tile.tx << tileShift
-        const dy = tile.ty << tileShift
-
         ctx.putImageData(bridge.imageData, 0, 0)
-        targetCtx.drawImage(canvas, dx, dy)
+        targetCtx.drawImage(canvas, tile.x, tile.y)
       }
     }
 
     targetCtx.globalAlpha = 1
     targetCtx.globalCompositeOperation = 'source-over'
   }
+
+  return {
+    draw,
+    setBuffer,
+  }
 }

package/src/Paint/Render/ColorPaintBufferCanvasRenderer.ts

@@ -1,47 +1,47 @@
-import type { CanvasObjectFactory } from '../../Canvas/_canvas-types'
-import { DEFAULT_CANVAS_FACTORY } from '../../Internal/_constants'
-import { CANVAS_CTX_FAILED } from '../../Internal/_errors'
+import type { ReusableCanvasFactory } from '../../Canvas/_canvas-types'
+import { makeReusableOffscreenCanvas } from '../../Canvas/ReusableCanvas'
 import type { ColorPaintBuffer } from '../ColorPaintBuffer'
 
 export type ColorPaintBufferCanvasRenderer = ReturnType<typeof makeColorPaintBufferCanvasRenderer>
 
-export function makeColorPaintBufferCanvasRenderer(
+export function makeColorPaintBufferCanvasRenderer<T extends HTMLCanvasElement | OffscreenCanvas>(
   paintBuffer: ColorPaintBuffer,
-  canvasFactory: CanvasObjectFactory<any> = DEFAULT_CANVAS_FACTORY,
+  reusableCanvasFactory?: () => ReusableCanvasFactory<T>,
 ) {
-  const config = paintBuffer.config
-  const tileSize = config.tileSize
-  const tileShift = config.tileShift
-  const lookup = paintBuffer.lookup
+  const factory = (reusableCanvasFactory ?? makeReusableOffscreenCanvas) as unknown as () => ReusableCanvasFactory<T>
+  const getBuffer = factory()
 
-  const canvas = canvasFactory(tileSize, tileSize)
-  const ctx = canvas.getContext('2d')
-  if (!ctx) throw new Error(CANVAS_CTX_FAILED)
-  ctx.imageSmoothingEnabled = false
-
-  return function drawPaintBuffer(
+  function draw(
     targetCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
     alpha = 255,
     compOperation: GlobalCompositeOperation = 'source-over',
   ): void {
+    const buff = getBuffer(paintBuffer.config.tileSize, paintBuffer.config.tileSize)
+    const lookup = paintBuffer.lookup
+    const length = lookup.length
+    const ctx = buff.ctx
+    const canvas = buff.canvas
 
     targetCtx.globalAlpha = alpha / 255
     targetCtx.globalCompositeOperation = compOperation
 
-    for (let i = 0; i < lookup.length; i++) {
+    for (let i = 0; i < length; i++) {
       const tile = lookup[i]
 
       if (tile) {
-        const dx = tile.tx << tileShift
-        const dy = tile.ty << tileShift
-
         ctx.putImageData(tile.imageData, 0, 0)
-
-        targetCtx.drawImage(canvas, dx, dy)
+        targetCtx.drawImage(canvas, tile.x, tile.y)
       }
     }
 
     targetCtx.globalAlpha = 1
     targetCtx.globalCompositeOperation = 'source-over'
   }
+
+  return {
+    draw,
+    setBuffer(value: ColorPaintBuffer) {
+      paintBuffer = value
+    },
+  }
 }

package/src/Paint/Render/PaintCursorRenderer.ts

@@ -1,7 +1,8 @@
-import { type Color32 } from '../../_types'
 import type { ReusableCanvasFactory } from '../../Canvas/_canvas-types'
 import { makeReusableOffscreenCanvas } from '../../Canvas/ReusableCanvas'
-import { packColor } from '../../color'
+import type { Color32 } from '../../Color/_color-types'
+
+import { packColor } from '../../Color/pack-color'
 import { _macro_paintRectCenterOffset } from '../../Internal/macros'
 import { type BinaryMask, MaskType } from '../../Mask/_mask-types'
 import { makeBinaryMaskFromAlphaMask } from '../../Mask/BinaryMask/makeBinaryMaskFromAlphaMask'
@@ -103,6 +104,14 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
     drawCtx.drawImage(canvas, Math.floor(dx), Math.floor(dy))
   }
 
+  function drawRaw(
+    drawCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
+    x: number,
+    y: number,
+  ) {
+    drawCtx.drawImage(canvas, Math.floor(x * _scale), Math.floor(y * _scale))
+  }
+
   function getSettings() {
     return {
       color: _color,
@@ -116,6 +125,7 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
     getBounds,
     getBoundsScaled: getOutlineBoundsScaled,
     draw,
+    drawRaw,
     getSettings,
   }
 }

package/src/Paint/eachTileInBounds.ts

@@ -1,32 +1,31 @@
-import type { PixelEngineConfig } from '../History/PixelEngineConfig'
 import type { Rect } from '../Rect/_rect-types'
-import type { Tile } from '../Tile/_tile-types'
+import type { Tile, TileTargetMeta } from '../Tile/_tile-types'
 import type { TilePool } from '../Tile/TilePool'
 
 export function eachTileInBounds<T extends Tile>(
-  config: PixelEngineConfig,
+  config: TileTargetMeta,
   lookup: (T | undefined)[],
   tilePool: TilePool<T>,
   bounds: Rect,
   callback: (tile: T, bX: number, bY: number, bW: number, bH: number) => void,
 ): void {
-  const { tileShift, targetColumns, targetRows, tileSize } = config
+  const { targetRows, targetColumns, tileSize } = config
 
-  const x1 = Math.max(0, bounds.x >> tileShift)
-  const y1 = Math.max(0, bounds.y >> tileShift)
-  const x2 = Math.min(targetColumns - 1, (bounds.x + bounds.w - 1) >> tileShift)
-  const y2 = Math.min(targetRows - 1, (bounds.y + bounds.h - 1) >> tileShift)
+  const x1 = Math.max(0, Math.floor(bounds.x / tileSize))
+  const y1 = Math.max(0, Math.floor(bounds.y / tileSize))
+  const x2 = Math.min(targetColumns - 1, Math.floor((bounds.x + bounds.w - 1) / tileSize))
+  const y2 = Math.min(targetRows - 1, Math.floor((bounds.y + bounds.h - 1) / tileSize))
 
   if (x1 > x2 || y1 > y2) return
 
   for (let ty = y1; ty <= y2; ty++) {
     const rowOffset = ty * targetColumns
-    const tileTop = ty << tileShift
+    const tileTop = ty * tileSize
 
     for (let tx = x1; tx <= x2; tx++) {
       const id = rowOffset + tx
       const tile = lookup[id] ?? (lookup[id] = tilePool.getTile(id, tx, ty))
-      const tileLeft = tx << tileShift
+      const tileLeft = tx * tileSize
 
       const startX = bounds.x > tileLeft ? bounds.x : tileLeft
       const startY = bounds.y > tileTop ? bounds.y : tileTop

package/src/PixelData/_pixelData-types.ts

@@ -15,3 +15,10 @@ export interface MutablePixelData32 {
 export interface PixelData<T extends ImageDataLike = ImageData> extends PixelData32 {
   readonly imageData: T
 }
+
+export interface MutablePixelData<T extends ImageDataLike = ImageData> extends PixelData32 {
+  imageData: T
+  data: Uint32Array
+  w: number
+  h: number
+}

package/src/PixelData/blendColorPixelData.ts

@@ -1,5 +1,6 @@
-import { type Color32, type ColorBlendOptions } from '../_types'
+import { type ColorBlendOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { PixelData32 } from './_pixelData-types'
 
 /**

package/src/PixelData/blendColorPixelDataAlphaMask.ts

@@ -1,5 +1,6 @@
-import type { Color32, ColorBlendMaskOptions } from '../_types'
+import type { ColorBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { AlphaMask } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 

package/src/PixelData/blendColorPixelDataBinaryMask.ts

@@ -1,5 +1,6 @@
-import type { Color32, ColorBlendMaskOptions } from '../_types'
+import type { ColorBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { BinaryMask } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 

package/src/PixelData/blendColorPixelDataMask.ts

@@ -1,4 +1,5 @@
-import { type Color32, type ColorBlendMaskOptions } from '../_types'
+import { type ColorBlendMaskOptions } from '../_types'
+import type { Color32 } from '../Color/_color-types'
 import { type Mask, MaskType } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'

package/src/PixelData/blendColorPixelDataPaintAlphaMask.ts

@@ -1,5 +1,5 @@
-import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { PaintAlphaMask } from '../Paint/_paint-types'
 import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'

package/src/PixelData/blendColorPixelDataPaintBinaryMask.ts

@@ -1,5 +1,5 @@
-import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { PaintBinaryMask } from '../Paint/_paint-types'
 import type { PixelData32 } from './_pixelData-types'
 import { blendColorPixelDataBinaryMask } from './blendColorPixelDataBinaryMask'

package/src/PixelData/blendColorPixelDataPaintMask.ts

@@ -1,8 +1,9 @@
-import { type Color32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import { MaskType } from '../Mask/_mask-types'
-import type { PaintMask } from '../Paint/_paint-types'
+import type { PaintMask, PaintRect } from '../Paint/_paint-types'
 import type { PixelData32 } from './_pixelData-types'
+import { blendColorPixelData } from './blendColorPixelData'
 import { blendColorPixelDataAlphaMask } from './blendColorPixelDataAlphaMask'
 import { blendColorPixelDataBinaryMask } from './blendColorPixelDataBinaryMask'
 
@@ -11,12 +12,14 @@ const SCRATCH_OPTS = {
   y: 0,
   alpha: 255,
   blendFn: sourceOverPerfect,
+  w: undefined as number | undefined,
+  h: undefined as number | undefined,
 }
 
 export function blendColorPixelDataPaintMask(
-  dst: PixelData32,
+  target: PixelData32,
   color: Color32,
-  mask: PaintMask,
+  mask: PaintMask | PaintRect,
   x: number,
   y: number,
   alpha = 255,
@@ -29,10 +32,18 @@ export function blendColorPixelDataPaintMask(
   SCRATCH_OPTS.y = ty
   SCRATCH_OPTS.alpha = alpha
   SCRATCH_OPTS.blendFn = blendFn
+  SCRATCH_OPTS.w = undefined
+  SCRATCH_OPTS.h = undefined
 
-  if (mask.type === MaskType.BINARY) {
-    return blendColorPixelDataBinaryMask(dst, color, mask, SCRATCH_OPTS)
-  } else {
-    return blendColorPixelDataAlphaMask(dst, color, mask, SCRATCH_OPTS)
+  if (mask.data) {
+    if (mask.type === MaskType.BINARY) {
+      return blendColorPixelDataBinaryMask(target, color, mask, SCRATCH_OPTS)
+    } else {
+      return blendColorPixelDataAlphaMask(target, color, mask, SCRATCH_OPTS)
+    }
   }
+  SCRATCH_OPTS.w = mask.w
+  SCRATCH_OPTS.h = mask.h
+
+  return blendColorPixelData(target, color, SCRATCH_OPTS)
 }

package/src/PixelData/blendPixel.ts

@@ -1,5 +1,6 @@
-import type { BlendColor32, Color32 } from '../_types'
+import type { BlendColor32 } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { PixelData32 } from './_pixelData-types'
 
 export function blendPixel(

package/src/PixelData/blendPixelData.ts

@@ -1,5 +1,6 @@
-import { type Color32, type PixelBlendOptions } from '../_types'
+import { type PixelBlendOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { PixelData32 } from './_pixelData-types'
 
 /**

package/src/PixelData/blendPixelDataAlphaMask.ts

@@ -1,5 +1,6 @@
-import { type Color32, type PixelBlendMaskOptions } from '../_types'
+import { type PixelBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { AlphaMask } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 

package/src/PixelData/blendPixelDataBinaryMask.ts

@@ -1,5 +1,6 @@
-import type { Color32, PixelBlendMaskOptions } from '../_types'
+import type { PixelBlendMaskOptions } from '../_types'
 import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
+import type { Color32 } from '../Color/_color-types'
 import type { BinaryMask } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 

package/src/PixelData/blendPixelDataPaintBuffer.ts

@@ -17,14 +17,13 @@ export function blendPixelDataPaintBuffer(
   blendFn?: BlendColor32,
   blendPixelDataFn = blendPixelData,
 ): void {
-  const tileShift = paintBuffer.config.tileShift
   const lookup = paintBuffer.lookup
   for (let i = 0; i < lookup.length; i++) {
     const tile = lookup[i]
 
     if (tile) {
-      const x = tile.tx << tileShift
-      const y = tile.ty << tileShift
+      const x = tile.x
+      const y = tile.y
 
       SCRATCH_OPTS.x = x
       SCRATCH_OPTS.y = y

package/src/PixelData/clearPixelDataFast.ts

@@ -1,4 +1,4 @@
-import type { Color32 } from '../_types'
+import type { Color32 } from '../Color/_color-types'
 import type { BinaryMaskRect } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 import { fillPixelDataFast } from './fillPixelDataFast'

package/src/PixelData/cropPixelData.ts

@@ -0,0 +1,36 @@
+import type { MutablePixelData, PixelData, PixelData32 } from './_pixelData-types'
+import { setPixelData } from './PixelData'
+
+export function cropPixelData(src: PixelData32, x: number, y: number, w: number, h: number, out?: MutablePixelData): PixelData {
+  const cx = Math.max(x, 0)
+  const cy = Math.max(y, 0)
+  const cw = Math.min(x + w, src.w) - cx
+  const ch = Math.min(y + h, src.h) - cy
+
+  if (cw <= 0 || ch <= 0) {
+    throw new Error(`Crop [${x},${y} ${w}x${h}] does not overlap PixelData [${src.w}x${src.h}]`)
+  }
+
+  const cropped = new ImageData(cw, ch)
+
+  let dst32: Uint32Array
+  if (out) {
+    setPixelData(out, cropped)
+    dst32 = out.data
+  } else {
+    dst32 = new Uint32Array(cropped.data.buffer)
+  }
+
+  for (let row = 0; row < ch; row++) {
+    const srcOffset = ((cy + row) * src.w) + cx
+    const dstOffset = row * cw
+    dst32.set(src.data.subarray(srcOffset, srcOffset + cw), dstOffset)
+  }
+
+  return out ?? {
+    data: dst32,
+    imageData: cropped,
+    w: cw,
+    h: ch,
+  }
+}

package/src/PixelData/fillPixelData.ts

@@ -1,4 +1,4 @@
-import type { Color32 } from '../_types'
+import type { Color32 } from '../Color/_color-types'
 import type { Rect } from '../Rect/_rect-types'
 import type { PixelData32 } from './_pixelData-types'
 
@@ -47,16 +47,16 @@ export function fillPixelData(
   let w: number
   let h: number
 
-  if (typeof _x === 'object') {
-    x = _x.x ?? 0
-    y = _x.y ?? 0
-    w = _x.w ?? dstW
-    h = _x.h ?? dstH
-  } else if (typeof _x === 'number') {
+  if (typeof _x === 'number') {
     x = _x
     y = _y!
     w = _w!
     h = _h!
+  } else if (typeof _x === 'object') {
+    x = _x.x ?? 0
+    y = _x.y ?? 0
+    w = _x.w ?? dstW
+    h = _x.h ?? dstH
   } else {
     x = 0
     y = 0

package/src/PixelData/fillPixelDataBinaryMask.ts

@@ -1,4 +1,4 @@
-import type { Color32 } from '../_types'
+import type { Color32 } from '../Color/_color-types'
 import type { BinaryMask } from '../Mask/_mask-types'
 import type { PixelData32 } from './_pixelData-types'
 

package/src/PixelData/fillPixelDataFast.ts

@@ -1,4 +1,4 @@
-import type { Color32 } from '../_types'
+import type { Color32 } from '../Color/_color-types'
 import type { Rect } from '../Rect/_rect-types'
 import type { PixelData32 } from './_pixelData-types'