pixel-data-js 0.30.0 → 0.32.0

package/src/PixelData/writePixelDataBuffer.ts

@@ -1,20 +1,25 @@
 import type { Rect } from '../Rect/_rect-types'
-import { makeClippedBlit, resolveBlitClipping } from '../Rect/resolveClipping'
 import type { PixelData32 } from './_pixelData-types'
 
-const SCRATCH_BLIT = makeClippedBlit()
-
 /**
  * Copies a pixel buffer into a specific region of a {@link PixelData32} object.
- *
- * This function performs a direct memory copy from a {@link Uint32Array}
- * into the target buffer.
+ * @param target - The target to write into.
+ * @param data - The source pixel data (Uint32Array).
+ * @param rect - A rect defining the destination region.
  */
 export function writePixelDataBuffer(
   target: PixelData32,
   data: Uint32Array,
   rect: Rect,
 ): void
+/**
+ * @param target - The target to write into.
+ * @param data - The source pixel data (Uint32Array).
+ * @param x - The starting horizontal coordinate in the target.
+ * @param y - The starting vertical coordinate in the target.
+ * @param w - The width of the region to write.
+ * @param h - The height of the region to write.
+ */
 export function writePixelDataBuffer(
   target: PixelData32,
   data: Uint32Array,
@@ -31,49 +36,59 @@ export function writePixelDataBuffer(
   _w?: number,
   _h?: number,
 ): void {
-  const { x, y, w, h } = typeof _x === 'object'
-    ? _x
-    : {
-      x: _x,
-      y: _y!,
-      w: _w!,
-      h: _h!,
-    }
+  let x: number
+  let y: number
+  let w: number
+  let h: number
+
+  if (typeof _x === 'object') {
+    x = _x.x
+    y = _x.y
+    w = _x.w
+    h = _x.h
+  } else {
+    x = _x
+    y = _y!
+    w = _w!
+    h = _h!
+  }
+
+  if (w <= 0 || h <= 0) return
 
   const dstW = target.w
   const dstH = target.h
   const dstData = target.data
 
-  // treat the source buffer as a Source Image starting at 0,0 with size w,h
-  const clip = resolveBlitClipping(
-    x,
-    y,
-    0,
-    0,
-    w,
-    h,
-    dstW,
-    dstH,
-    w,
-    h,
-    SCRATCH_BLIT,
-  )
+  // Inline clipping logic
+  let dstX = x
+  let dstY = y
+  let srcX = 0
+  let srcY = 0
+  let copyW = w
+  let copyH = h
+
+  if (dstX < 0) {
+    srcX = -dstX
+    copyW += dstX
+    dstX = 0
+  }
+
+  if (dstY < 0) {
+    srcY = -dstY
+    copyH += dstY
+    dstY = 0
+  }
 
-  if (!clip.inBounds) return
+  copyW = Math.min(copyW, dstW - dstX)
+  copyH = Math.min(copyH, dstH - dstY)
 
-  const {
-    x: dstX,
-    y: dstY,
-    sx: srcX,
-    sy: srcY,
-    w: copyW,
-    h: copyH,
-  } = clip
+  if (copyW <= 0 || copyH <= 0) return
 
   for (let row = 0; row < copyH; row++) {
     const dstStart = (dstY + row) * dstW + dstX
     const srcStart = (srcY + row) * w + srcX
+    const chunk = data.subarray(srcStart, srcStart + copyW)
 
-    dstData.set(data.subarray(srcStart, srcStart + copyW), dstStart)
+    dstData.set(chunk, dstStart)
   }
 }

package/src/index.ts

@@ -26,6 +26,9 @@ export * from './Clipboard/writeImgBlobToClipboard'
 
 export * from './color'
 
+export * from './Control/BatchedQueue'
+export * from './Control/RenderQueue'
+
 export * from './History/HistoryAction'
 export * from './History/HistoryManager'
 export * from './History/PixelAccumulator'
@@ -55,6 +58,7 @@ export * from './History/PixelWriter'
 
 export * from './ImageData/_ImageData-types'
 export * from './ImageData/copyImageData'
+export * from './ImageData/extractImageData'
 export * from './ImageData/extractImageDataBuffer'
 export * from './ImageData/ImageDataLike'
 export * from './ImageData/imageDataToAlphaMaskBuffer'
@@ -157,6 +161,7 @@ export * from './PixelData/PixelData'
 export * from './PixelData/pixelDataToAlphaMask'
 export * from './PixelData/reflectPixelData'
 export * from './PixelData/resamplePixelData'
+export * from './PixelData/resizePixelData'
 export * from './PixelData/ReusablePixelData'
 export * from './PixelData/rotatePixelData'
 export * from './PixelData/uInt32ArrayToPixelData'
@@ -165,7 +170,6 @@ export * from './PixelData/writePixelDataBuffer'
 
 export * from './Rect/_rect-types'
 export * from './Rect/getRectsBounds'
-export * from './Rect/resolveClipping'
 export * from './Rect/trimMaskRectBounds'
 export * from './Rect/trimRectBounds'
 

package/src/Rect/resolveClipping.ts

@@ -1,140 +0,0 @@
-export type ClippedRect = {
-  x: number
-  y: number
-  w: number
-  h: number
-  inBounds: boolean
-}
-
-export type ClippedBlit = {
-  x: number
-  y: number
-  sx: number
-  sy: number
-  w: number
-  h: number
-  inBounds: boolean
-}
-
-// use factory functions when creating reusable objects ensure property order for JIT perf
-export const makeClippedRect = (): ClippedRect => ({
-  x: 0,
-  y: 0,
-  w: 0,
-  h: 0,
-  inBounds: false,
-})
-
-export const makeClippedBlit = (): ClippedBlit => ({
-  x: 0,
-  y: 0,
-  sx: 0,
-  sy: 0,
-  w: 0,
-  h: 0,
-  inBounds: false,
-})
-
-/**
- * Calculates the intersection of a target rectangle and a bounding box (usually 0,0 -> width,height).
- * Handles negative offsets by shrinking dimensions.
- */
-export function resolveRectClipping(
-  x: number,
-  y: number,
-  w: number,
-  h: number,
-  boundaryW: number,
-  boundaryH: number,
-  out: ClippedRect,
-): ClippedRect {
-  // Destination Clipping (Top/Left)
-  if (x < 0) {
-    w += x
-    x = 0
-  }
-  if (y < 0) {
-    h += y
-    y = 0
-  }
-
-  // Destination Clipping (Bottom/Right)
-  const actualW = Math.min(w, boundaryW - x)
-  const actualH = Math.min(h, boundaryH - y)
-
-  if (actualW <= 0 || actualH <= 0) {
-    out.inBounds = false
-    return out
-  }
-
-  out.x = x
-  out.y = y
-  out.w = actualW
-  out.h = actualH
-  out.inBounds = true
-
-  return out
-}
-
-/**
- * Calculates the clipping for transferring data from a Source to a Destination.
- * Handles cases where the source is out of bounds (shifting the destination target)
- * AND cases where the destination is out of bounds (shifting the source target).
- */
-export function resolveBlitClipping(
-  x: number,
-  y: number,
-  sx: number,
-  sy: number,
-  w: number,
-  h: number,
-  dstW: number,
-  dstH: number,
-  srcW: number,
-  srcH: number,
-  out: ClippedBlit,
-): ClippedBlit {
-  // 1. Source Clipping: If reading from negative source, shift target right and shrink
-  if (sx < 0) {
-    x -= sx
-    w += sx
-    sx = 0
-  }
-  if (sy < 0) {
-    y -= sy
-    h += sy
-    sy = 0
-  }
-  w = Math.min(w, srcW - sx)
-  h = Math.min(h, srcH - sy)
-
-  // 2. Destination Clipping: If writing to negative dest, shift source right and shrink
-  if (x < 0) {
-    sx -= x
-    w += x
-    x = 0
-  }
-  if (y < 0) {
-    sy -= y
-    h += y
-    y = 0
-  }
-
-  const actualW = Math.min(w, dstW - x)
-  const actualH = Math.min(h, dstH - y)
-
-  if (actualW <= 0 || actualH <= 0) {
-    out.inBounds = false
-    return out
-  }
-
-  out.x = x
-  out.y = y
-  out.sx = sx
-  out.sy = sy
-  out.w = actualW
-  out.h = actualH
-  out.inBounds = true
-
-  return out
-}