pixel-data-js 0.32.0 → 0.34.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixel-data-js",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "packageManager": "pnpm@10.33.0",
   "description": "JS Pixel and ImageData operations",
   "author": {

package/src/ImageData/copyImageData.ts

@@ -1,7 +1,9 @@
 import type { ImageDataLike } from './_ImageData-types'
 
-export function copyImageData({ data, width, height }: ImageDataLike): ImageData {
-  return new ImageData(data.slice(), width, height)
+export function copyImageData(source: ImageDataLike): ImageData {
+  const dataCopy = new Uint8ClampedArray(source.data)
+
+  return new ImageData(dataCopy, source.width, source.height)
 }
 
 export function copyImageDataLike({ data, width, height }: ImageDataLike): ImageDataLike {

package/src/ImageData/extractImageData.ts

@@ -42,8 +42,7 @@ export function extractImageData(
     ? _x
     : { x: _x, y: _y!, w: _w!, h: _h! }
 
-  if (w <= 0) return null
-  if (h <= 0) return null
+  if (w <= 0 || h <= 0) return null
 
   const result = new ImageData(w, h)
 

package/src/ImageData/extractImageDataBuffer.ts

@@ -40,8 +40,7 @@ export function extractImageDataBuffer(
   const { x, y, w, h } = typeof _x === 'object'
     ? _x
     : { x: _x, y: _y!, w: _w!, h: _h! }
-  if (w <= 0) return new Uint8ClampedArray(0)
-  if (h <= 0) return new Uint8ClampedArray(0)
+  if (w <= 0 || h <= 0) return new Uint8ClampedArray(0)
 
   const srcW = imageData.width
   const srcH = imageData.height
@@ -72,8 +71,7 @@ export function extractImageDataBuffer(
   copyW = Math.min(copyW, srcW - srcX)
   copyH = Math.min(copyH, srcH - srcY)
 
-  if (copyW <= 0) return out
-  if (copyH <= 0) return out
+  if (copyW <= 0 || copyH <= 0) return out
 
   // 2. Perform high-speed block copy
   // Attempt to use a 32-bit view if the buffer is memory-aligned.

package/src/ImageData/writeImageData.ts

@@ -1,5 +1,5 @@
 /**
- * Writes image data from a source to a target with support for clipping and alpha masking.
+ * Writes image data from a source to a target.
  *
  * @param target - The destination ImageData to write to.
  * @param source - The source ImageData to read from.
@@ -9,8 +9,8 @@
 export function writeImageData(
   target: ImageData,
   source: ImageData,
-  x: number,
-  y: number,
+  x = 0,
+  y = 0,
 ): void {
   const dstW = target.width
   const dstH = target.height
@@ -42,8 +42,7 @@ export function writeImageData(
   copyW = Math.min(copyW, dstW - dstX)
   copyH = Math.min(copyH, dstH - dstY)
 
-  if (copyW <= 0) return
-  if (copyH <= 0) return
+  if (copyW <= 0 || copyH <= 0) return
 
   const isDstAligned = dst.byteOffset % 4 === 0
   const isSrcAligned = src.byteOffset % 4 === 0

package/src/ImageData/writeImageDataBuffer.ts

@@ -57,8 +57,7 @@ export function writeImageDataBuffer(
     h = _h!
   }
 
-  if (w <= 0) return
-  if (h <= 0) return
+  if (w <= 0 || h <= 0) return
 
   const dstW = target.width
   const dstH = target.height
@@ -87,8 +86,7 @@ export function writeImageDataBuffer(
   copyW = Math.min(copyW, dstW - dstX)
   copyH = Math.min(copyH, dstH - dstY)
 
-  if (copyW <= 0) return
-  if (copyH <= 0) return
+  if (copyW <= 0 || copyH <= 0) return
 
   // Fast-path: Both arrays must be 4-byte aligned to use Uint32Array safely
   const isDstAligned = dst.byteOffset % 4 === 0

package/src/Paint/AlphaMaskPaintBuffer.ts

@@ -1,11 +1,10 @@
 import { forEachLinePoint } from '../Algorithm/forEachLinePoint'
 import type { PixelEngineConfig } from '../History/PixelEngineConfig'
-import { _macro_paintRectCenterOffset } from '../Internal/macros'
 import type { Rect } from '../Rect/_rect-types'
 import { trimRectBounds } from '../Rect/trimRectBounds'
 import type { AlphaMaskTile } from '../Tile/_tile-types'
 import type { TilePool } from '../Tile/TilePool'
-import type { PaintAlphaMask, PaintBinaryMask } from './_paint-types'
+import type { PaintAlphaMask, PaintBinaryMask, PaintRect } from './_paint-types'
 import { eachTileInBounds } from './eachTileInBounds'
 
 export class AlphaMaskPaintBuffer {
@@ -187,15 +186,13 @@ export class AlphaMaskPaintBuffer {
 
   paintRect(
     alpha: number,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x: number,
     y: number,
   ): boolean
   paintRect(
     alpha: number,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     startX: number,
     startY: number,
     endX: number,
@@ -203,8 +200,7 @@ export class AlphaMaskPaintBuffer {
   ): boolean
   paintRect(
     alpha: number,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x0: number,
     y0: number,
     x1: number = x0,
@@ -218,8 +214,10 @@ export class AlphaMaskPaintBuffer {
     const tileMask = config.tileMask
     const target = config.target
 
-    const centerOffsetX = _macro_paintRectCenterOffset(brushWidth)
-    const centerOffsetY = _macro_paintRectCenterOffset(brushHeight)
+    const brushWidth = brush.w
+    const brushHeight = brush.h
+    const centerOffsetX = brush.centerOffsetX
+    const centerOffsetY = brush.centerOffsetY
 
     const trimRectBoundsFn = this.trimRectBoundsFn
     const eachTileInBoundsFn = this.eachTileInBoundsFn

package/src/Paint/BinaryMaskPaintBuffer.ts

@@ -1,11 +1,10 @@
 import { forEachLinePoint } from '../Algorithm/forEachLinePoint'
 import type { PixelEngineConfig } from '../History/PixelEngineConfig'
-import { _macro_paintRectCenterOffset } from '../Internal/macros'
 import type { Rect } from '../Rect/_rect-types'
 import { trimRectBounds } from '../Rect/trimRectBounds'
 import type { BinaryMaskTile } from '../Tile/_tile-types'
 import type { TilePool } from '../Tile/TilePool'
-import type { PaintBinaryMask } from './_paint-types'
+import type { PaintBinaryMask, PaintRect } from './_paint-types'
 import { eachTileInBounds } from './eachTileInBounds'
 
 export class BinaryMaskPaintBuffer {
@@ -104,22 +103,19 @@ export class BinaryMaskPaintBuffer {
   }
 
   paintRect(
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x: number,
     y: number,
   ): boolean
   paintRect(
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     startX: number,
     startY: number,
     endX: number,
     endY: number,
   ): boolean
   paintRect(
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x0: number,
     y0: number,
     x1: number = x0,
@@ -133,8 +129,10 @@ export class BinaryMaskPaintBuffer {
     const tileMask = config.tileMask
     const target = config.target
 
-    const centerOffsetX = _macro_paintRectCenterOffset(brushWidth)
-    const centerOffsetY = _macro_paintRectCenterOffset(brushHeight)
+    const brushWidth = brush.w
+    const brushHeight = brush.h
+    const centerOffsetX = brush.centerOffsetX
+    const centerOffsetY = brush.centerOffsetY
 
     const trimRectBoundsFn = this.trimRectBoundsFn
     const eachTileInBoundsFn = this.eachTileInBoundsFn

package/src/Paint/ColorPaintBuffer.ts

@@ -1,12 +1,11 @@
 import type { Color32 } from '../_types'
 import { forEachLinePoint } from '../Algorithm/forEachLinePoint'
 import type { PixelEngineConfig } from '../History/PixelEngineConfig'
-import { _macro_paintRectCenterOffset } from '../Internal/macros'
 import type { Rect } from '../Rect/_rect-types'
 import { trimRectBounds } from '../Rect/trimRectBounds'
 import type { PixelTile } from '../Tile/_tile-types'
 import type { TilePool } from '../Tile/TilePool'
-import type { PaintAlphaMask, PaintBinaryMask } from './_paint-types'
+import type { PaintAlphaMask, PaintBinaryMask, PaintRect } from './_paint-types'
 import { eachTileInBounds } from './eachTileInBounds'
 
 export class ColorPaintBuffer {
@@ -191,15 +190,13 @@ export class ColorPaintBuffer {
 
   paintRect(
     color: Color32,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x: number,
     y: number,
   ): boolean
   paintRect(
     color: Color32,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     startX: number,
     startY: number,
     endX: number,
@@ -207,8 +204,7 @@ export class ColorPaintBuffer {
   ): boolean
   paintRect(
     color: Color32,
-    brushWidth: number,
-    brushHeight: number,
+    brush: PaintRect,
     x0: number,
     y0: number,
     x1: number = x0,
@@ -225,8 +221,10 @@ export class ColorPaintBuffer {
     const tileMask = config.tileMask
     const target = config.target
 
-    const centerOffsetX = _macro_paintRectCenterOffset(brushWidth)
-    const centerOffsetY = _macro_paintRectCenterOffset(brushHeight)
+    const brushWidth = brush.w
+    const brushHeight = brush.h
+    const centerOffsetX = brush.centerOffsetX
+    const centerOffsetY = brush.centerOffsetY
 
     let changed = false
 

package/src/Paint/PaintRect.ts

@@ -0,0 +1,11 @@
+import { _macro_paintRectCenterOffset } from '../Internal/macros'
+import type { PaintRect } from './_paint-types'
+
+export function makePaintRect(w: number, h: number): PaintRect {
+  return {
+    w,
+    h,
+    centerOffsetX: _macro_paintRectCenterOffset(w),
+    centerOffsetY: _macro_paintRectCenterOffset(h),
+  }
+}

package/src/Paint/_paint-types.ts

@@ -20,3 +20,9 @@ export interface PaintBinaryMask<T extends PaintMaskOutline = PaintMaskOutline>
 
 export type PaintMask = PaintAlphaMask<any> | PaintBinaryMask<any>
 
+export interface PaintRect {
+  w: number,
+  h: number,
+  centerOffsetX: number,
+  centerOffsetY: number,
+}

package/src/PixelData/extractPixelDataBuffer.ts

@@ -44,8 +44,7 @@ export function extractPixelDataBuffer(
   const srcH = source.h
   const srcData = source.data
 
-  if (w <= 0) return new Uint32Array(0)
-  if (h <= 0) return new Uint32Array(0)
+  if (w <= 0 || h <= 0) return new Uint32Array(0)
 
   const dstData = new Uint32Array(w * h)
 
@@ -72,8 +71,7 @@ export function extractPixelDataBuffer(
   copyW = Math.min(copyW, srcW - srcX)
   copyH = Math.min(copyH, srcH - srcY)
 
-  if (copyW <= 0) return dstData
-  if (copyH <= 0) return dstData
+  if (copyW <= 0 || copyH <= 0) return dstData
 
   for (let row = 0; row < copyH; row++) {
     const srcStart = (srcY + row) * srcW + srcX

package/src/PixelData/fillPixelData.ts

@@ -83,8 +83,7 @@ export function fillPixelData(
   fillW = Math.min(fillW, dstW - dstX)
   fillH = Math.min(fillH, dstH - dstY)
 
-  if (fillW <= 0) return false
-  if (fillH <= 0) return false
+  if (fillW <= 0 || fillH <= 0) return false
 
   const dst32 = dst.data
   let hasChanged = false

package/src/PixelData/fillPixelDataFast.ts

@@ -85,8 +85,7 @@ export function fillPixelDataFast(
   fillW = Math.min(fillW, dstW - dstX)
   fillH = Math.min(fillH, dstH - dstY)
 
-  if (fillW <= 0) return
-  if (fillH <= 0) return
+  if (fillW <= 0 || fillH <= 0) return
 
   const dst32 = dst.data
   const dw = dst.w

package/src/PixelData/writePixelData.ts

@@ -0,0 +1,55 @@
+import type { PixelData32 } from './_pixelData-types'
+
+/**
+ * Writes PixelData from a source to a target.
+ * @param target - The destination to write to.
+ * @param source - The source to read from.
+ * @param x - The x-coordinate in the target where drawing starts.
+ * @param y - The y-coordinate in the target where drawing starts.
+ */
+export function writePixelData(
+  target: PixelData32,
+  source: PixelData32,
+  x = 0,
+  y = 0,
+): void {
+  const dstW = target.w
+  const dstH = target.h
+  const dst = target.data
+
+  const srcW = source.w
+  const srcH = source.h
+  const src = source.data
+
+  let dstX = x
+  let dstY = y
+  let srcX = 0
+  let srcY = 0
+  let copyW = srcW
+  let copyH = srcH
+
+  if (dstX < 0) {
+    srcX = -dstX
+    copyW += dstX
+    dstX = 0
+  }
+
+  if (dstY < 0) {
+    srcY = -dstY
+    copyH += dstY
+    dstY = 0
+  }
+
+  copyW = Math.min(copyW, dstW - dstX)
+  copyH = Math.min(copyH, dstH - dstY)
+
+  if (copyW <= 0 || copyH <= 0) return
+
+  for (let row = 0; row < copyH; row++) {
+    const dstStart = (dstY + row) * dstW + dstX
+    const srcStart = (srcY + row) * srcW + srcX
+    const chunk = src.subarray(srcStart, srcStart + copyW)
+
+    dst.set(chunk, dstStart)
+  }
+}

package/src/index.ts

@@ -126,6 +126,7 @@ export * from './Paint/eachTileInBounds'
 export * from './Paint/makeCirclePaintMask'
 export * from './Paint/makePaintMask'
 export * from './Paint/makeRectFalloffPaintAlphaMask'
+export * from './Paint/PaintRect'
 
 export * from './Paint/Render/AlphaMaskPaintBufferCanvasRenderer'
 export * from './Paint/Render/BinaryMaskPaintBufferCanvasRenderer'
@@ -166,6 +167,7 @@ export * from './PixelData/ReusablePixelData'
 export * from './PixelData/rotatePixelData'
 export * from './PixelData/uInt32ArrayToPixelData'
 export * from './PixelData/writePaintBufferToPixelData'
+export * from './PixelData/writePixelData'
 export * from './PixelData/writePixelDataBuffer'
 
 export * from './Rect/_rect-types'