pixel-data-js 0.33.0 → 0.34.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixel-data-js",
   "type": "module",
-  "version": "0.33.0",
+  "version": "0.34.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,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/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'