pixel-data-js 0.33.0 → 0.35.0

package/package.json

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

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,14 @@
+import { _macro_paintRectCenterOffset } from '../Internal/macros'
+import { PaintMaskOutline, type PaintRect } from './_paint-types'
+
+export function makePaintRect(w: number, h: number): PaintRect {
+  return {
+    type: null,
+    outlineType: PaintMaskOutline.RECT,
+    data: null,
+    w,
+    h,
+    centerOffsetX: _macro_paintRectCenterOffset(w),
+    centerOffsetY: _macro_paintRectCenterOffset(h),
+  }
+}

package/src/Paint/Render/PaintCursorRenderer.ts

@@ -11,7 +11,7 @@ import { makeRectBinaryMaskOutline } from '../../Mask/BinaryMask/makeRectBinaryM
 import { fillPixelDataBinaryMask } from '../../PixelData/fillPixelDataBinaryMask'
 import { makeReusablePixelData } from '../../PixelData/ReusablePixelData'
 import type { Rect } from '../../Rect/_rect-types'
-import { type PaintMask, PaintMaskOutline } from '../_paint-types'
+import { type PaintBrush, PaintMaskOutline } from '../_paint-types'
 
 export type PaintCursorRenderer = ReturnType<typeof makePaintCursorRenderer>
 
@@ -27,39 +27,42 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
   let _color = packColor(0, 255, 255, 255)
   let _scale = 1
 
-  let currentMask: PaintMask = {
-    type: MaskType.BINARY,
+  let currentBrush: PaintBrush = {
+    type: null,
     outlineType: PaintMaskOutline.RECT,
     w: 1,
     h: 1,
     centerOffsetX: _macro_paintRectCenterOffset(10),
     centerOffsetY: _macro_paintRectCenterOffset(10),
-  } as PaintMask
+    data: null,
+  }
 
   let outline: BinaryMask
 
-  function update(paintMask?: PaintMask, scale?: number, color?: Color32, alphaThreshold = 127) {
-    currentMask = paintMask ?? currentMask
+  function update(paintMask?: PaintBrush, scale?: number, color?: Color32, alphaThreshold = 127) {
+    currentBrush = paintMask ?? currentBrush
 
     _scale = scale ?? _scale
     _color = color ?? _color
 
     updateBuffer(
-      currentMask.w * _scale + 2 * _scale,
-      currentMask.h * _scale + 2 * _scale,
+      currentBrush.w * _scale + 2 * _scale,
+      currentBrush.h * _scale + 2 * _scale,
     )
 
-    if (currentMask.type === MaskType.BINARY) {
-      if (currentMask.outlineType === PaintMaskOutline.CIRCLE) {
-        outline = makeCircleBinaryMaskOutline(currentMask.w, _scale)
-      } else if (currentMask.outlineType === PaintMaskOutline.RECT) {
-        outline = makeRectBinaryMaskOutline(currentMask.w, currentMask.h, _scale)
-      } else if (currentMask.outlineType === PaintMaskOutline.MASKED) {
-        outline = makeBinaryMaskOutline(currentMask, _scale)
+    if (currentBrush.type === MaskType.BINARY) {
+      if (currentBrush.outlineType === PaintMaskOutline.CIRCLE) {
+        outline = makeCircleBinaryMaskOutline(currentBrush.w, _scale)
+      } else if (currentBrush.outlineType === PaintMaskOutline.RECT) {
+        outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale)
+      } else if (currentBrush.outlineType === PaintMaskOutline.MASKED) {
+        outline = makeBinaryMaskOutline(currentBrush, _scale)
       }
-    } else if (currentMask.type === MaskType.ALPHA) {
-      const mask = makeBinaryMaskFromAlphaMask(currentMask, alphaThreshold)
+    } else if (currentBrush.type === MaskType.ALPHA) {
+      const mask = makeBinaryMaskFromAlphaMask(currentBrush, alphaThreshold)
       outline = makeBinaryMaskOutline(mask, _scale)
+    } else {
+      outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale)
     }
 
     const pixelData = getPixelData(outline.w, outline.h)
@@ -70,10 +73,10 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
   const boundsScratch = { x: 0, y: 0, w: 0, h: 0 }
 
   function getBounds(centerX: number, centerY: number): Rect {
-    boundsScratch.x = centerX + currentMask.centerOffsetX
-    boundsScratch.y = centerY + currentMask.centerOffsetY
-    boundsScratch.w = currentMask.w
-    boundsScratch.h = currentMask.h
+    boundsScratch.x = centerX + currentBrush.centerOffsetX
+    boundsScratch.y = centerY + currentBrush.centerOffsetY
+    boundsScratch.w = currentBrush.w
+    boundsScratch.h = currentBrush.h
 
     return boundsScratch
   }
@@ -81,10 +84,10 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
   const boundsScaledScratch = { x: 0, y: 0, w: 0, h: 0 }
 
   function getOutlineBoundsScaled(centerX: number, centerY: number): Rect {
-    boundsScaledScratch.x = centerX * _scale + currentMask.centerOffsetX * _scale - 1
-    boundsScaledScratch.y = centerY * _scale + currentMask.centerOffsetY * _scale - 1
-    boundsScaledScratch.w = currentMask.w * _scale
-    boundsScaledScratch.h = currentMask.h * _scale
+    boundsScaledScratch.x = centerX * _scale + currentBrush.centerOffsetX * _scale - 1
+    boundsScaledScratch.y = centerY * _scale + currentBrush.centerOffsetY * _scale - 1
+    boundsScaledScratch.w = currentBrush.w * _scale
+    boundsScaledScratch.h = currentBrush.h * _scale
 
     return boundsScaledScratch
   }
@@ -94,8 +97,8 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
     centerX: number,
     centerY: number,
   ) {
-    const dx = centerX * _scale + currentMask.centerOffsetX * _scale - 1
-    const dy = centerY * _scale + currentMask.centerOffsetY * _scale - 1
+    const dx = centerX * _scale + currentBrush.centerOffsetX * _scale - 1
+    const dy = centerY * _scale + currentBrush.centerOffsetY * _scale - 1
 
     drawCtx.drawImage(canvas, Math.floor(dx), Math.floor(dy))
   }
@@ -104,7 +107,7 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
     return {
       color: _color,
       scale: _scale,
-      currentMask,
+      currentBrush,
     }
   }
 

package/src/Paint/_paint-types.ts

@@ -20,3 +20,14 @@ export interface PaintBinaryMask<T extends PaintMaskOutline = PaintMaskOutline>
 
 export type PaintMask = PaintAlphaMask<any> | PaintBinaryMask<any>
 
+export type PaintBrush = PaintMask | PaintRect
+
+export interface PaintRect {
+  type: null,
+  readonly outlineType: PaintMaskOutline.RECT
+  w: number,
+  h: number,
+  centerOffsetX: number,
+  centerOffsetY: number,
+  data: null,
+}

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'