pixel-data-js 0.28.0 → 0.30.0

package/src/Paint/{BinaryMaskPaintBufferCanvasRenderer.ts → Render/BinaryMaskPaintBufferCanvasRenderer.ts}

@@ -1,13 +1,15 @@
-import type { Color32 } from '../_types'
-import { CANVAS_CTX_FAILED } from '../Internal/_errors'
-import { makePixelData } from '../PixelData/PixelData'
-import type { BinaryMaskPaintBuffer } from './BinaryMaskPaintBuffer'
+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 { BinaryMaskPaintBuffer } from '../BinaryMaskPaintBuffer'
 
 export type BinaryMaskPaintBufferCanvasRenderer = ReturnType<typeof makeBinaryMaskPaintBufferCanvasRenderer>
 
 export function makeBinaryMaskPaintBufferCanvasRenderer(
   paintBuffer: BinaryMaskPaintBuffer,
-  offscreenCanvasClass = OffscreenCanvas,
+  canvasFactory: CanvasObjectFactory<any> = DEFAULT_CANVAS_FACTORY,
 ) {
   const config = paintBuffer.config
   const tileSize = config.tileSize
@@ -15,18 +17,16 @@ export function makeBinaryMaskPaintBufferCanvasRenderer(
   const tileArea = config.tileArea
   const lookup = paintBuffer.lookup
 
-  const canvas = new offscreenCanvasClass(tileSize, tileSize)
+  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
 
   return function drawPaintBuffer(
-    targetCtx: CanvasRenderingContext2D,
+    targetCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
     color: Color32,
     alpha = 255,
     compOperation: GlobalCompositeOperation = 'source-over',

package/src/Paint/{ColorPaintBufferCanvasRenderer.ts → Render/ColorPaintBufferCanvasRenderer.ts}

@@ -1,28 +1,26 @@
-import { CANVAS_CTX_FAILED } from '../Internal/_errors'
-import type { ColorPaintBuffer } from './ColorPaintBuffer'
+import type { CanvasObjectFactory } from '../../Canvas/_canvas-types'
+import { DEFAULT_CANVAS_FACTORY } from '../../Internal/_constants'
+import { CANVAS_CTX_FAILED } from '../../Internal/_errors'
+import type { ColorPaintBuffer } from '../ColorPaintBuffer'
 
 export type ColorPaintBufferCanvasRenderer = ReturnType<typeof makeColorPaintBufferCanvasRenderer>
 
-/**
- *
- * @param paintBuffer
- * @param offscreenCanvasClass - @internal
- */
 export function makeColorPaintBufferCanvasRenderer(
   paintBuffer: ColorPaintBuffer,
-  offscreenCanvasClass = OffscreenCanvas,
+  canvasFactory: CanvasObjectFactory<any> = DEFAULT_CANVAS_FACTORY,
 ) {
   const config = paintBuffer.config
   const tileSize = config.tileSize
   const tileShift = config.tileShift
   const lookup = paintBuffer.lookup
-  const canvas = new offscreenCanvasClass(tileSize, tileSize)
+
+  const canvas = canvasFactory(tileSize, tileSize)
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error(CANVAS_CTX_FAILED)
   ctx.imageSmoothingEnabled = false
 
   return function drawPaintBuffer(
-    targetCtx: CanvasRenderingContext2D,
+    targetCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D,
     alpha = 255,
     compOperation: GlobalCompositeOperation = 'source-over',
   ): void {

package/src/Paint/{PaintCursorRenderer.ts → Render/PaintCursorRenderer.ts}

@@ -1,27 +1,26 @@
-import { type Color32 } from '../_types'
-import type { CanvasContext, CanvasObjectFactory } from '../Canvas/_canvas-types'
-import { packColor } from '../color'
-import { CANVAS_CTX_FAILED } from '../Internal/_errors'
-import { _macro_paintRectCenterOffset } from '../Internal/macros'
-import { type BinaryMask, MaskType } from '../Mask/_mask-types'
-import { makeBinaryMaskFromAlphaMask } from '../Mask/BinaryMask/makeBinaryMaskFromAlphaMask'
-import { makeBinaryMaskOutline } from '../Mask/BinaryMask/makeBinaryMaskOutline'
-import { makeCircleBinaryMaskOutline } from '../Mask/BinaryMask/makeCircleBinaryMaskOutline'
-import { makeRectBinaryMaskOutline } from '../Mask/BinaryMask/makeRectBinaryMaskOutline'
-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 Color32 } from '../../_types'
+import type { ReusableCanvasFactory } from '../../Canvas/_canvas-types'
+import { makeReusableOffscreenCanvas } from '../../Canvas/ReusableCanvas'
+import { packColor } from '../../color'
+import { _macro_paintRectCenterOffset } from '../../Internal/macros'
+import { type BinaryMask, MaskType } from '../../Mask/_mask-types'
+import { makeBinaryMaskFromAlphaMask } from '../../Mask/BinaryMask/makeBinaryMaskFromAlphaMask'
+import { makeBinaryMaskOutline } from '../../Mask/BinaryMask/makeBinaryMaskOutline'
+import { makeCircleBinaryMaskOutline } from '../../Mask/BinaryMask/makeCircleBinaryMaskOutline'
+import { makeRectBinaryMaskOutline } from '../../Mask/BinaryMask/makeRectBinaryMaskOutline'
+import { fillPixelDataBinaryMask } from '../../PixelData/fillPixelDataBinaryMask'
+import { makeReusablePixelData } from '../../PixelData/ReusablePixelData'
+import type { Rect } from '../../Rect/_rect-types'
+import { type PaintMask, PaintMaskOutline } from '../_paint-types'
 
 export type PaintCursorRenderer = ReturnType<typeof makePaintCursorRenderer>
 
-export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenCanvas>(
-  factory: CanvasObjectFactory<T> = (w, h) => new OffscreenCanvas(w, h) as T,
+export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenCanvas = OffscreenCanvas>(
+  reusableCanvasFactory?: () => ReusableCanvasFactory<T>,
 ) {
-  const canvas = factory(1, 1)
-  const ctx = canvas.getContext('2d')! as CanvasContext<T>
-  if (!ctx) throw new Error(CANVAS_CTX_FAILED)
-  ctx.imageSmoothingEnabled = false
+  const factory = (reusableCanvasFactory ?? makeReusableOffscreenCanvas) as unknown as () => ReusableCanvasFactory<T>
+  const updateBuffer = factory()
+  const { canvas, ctx } = updateBuffer(1, 1)
 
   const getPixelData = makeReusablePixelData()
 
@@ -45,8 +44,10 @@ export function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenC
     _scale = scale ?? _scale
     _color = color ?? _color
 
-    canvas.width = currentMask.w * _scale + 2 * _scale
-    canvas.height = currentMask.h * _scale + 2 * _scale
+    updateBuffer(
+      currentMask.w * _scale + 2 * _scale,
+      currentMask.h * _scale + 2 * _scale,
+    )
 
     if (currentMask.type === MaskType.BINARY) {
       if (currentMask.outlineType === PaintMaskOutline.CIRCLE) {

package/src/index.ts

@@ -106,16 +106,27 @@ export * from './MaskRect/subtractBinaryMaskRects'
 
 export * from './Paint/_paint-types'
 export * from './Paint/AlphaMaskPaintBuffer'
-export * from './Paint/AlphaMaskPaintBufferCanvasRenderer'
 export * from './Paint/BinaryMaskPaintBuffer'
-export * from './Paint/BinaryMaskPaintBufferCanvasRenderer'
 export * from './Paint/ColorPaintBuffer'
-export * from './Paint/ColorPaintBufferCanvasRenderer'
+
+export * from './Paint/Commit/AlphaMaskPaintBufferCommitter'
+export * from './Paint/Commit/AlphaMaskPaintBufferManager'
+export * from './Paint/Commit/BinaryMaskPaintBufferCommitter'
+export * from './Paint/Commit/BinaryMaskPaintBufferManager'
+export * from './Paint/Commit/ColorPaintBufferCommitter'
+export * from './Paint/Commit/ColorPaintBufferManager'
+export * from './Paint/Commit/commitColorPaintBuffer'
+export * from './Paint/Commit/commitMaskPaintBuffer'
+
 export * from './Paint/eachTileInBounds'
 export * from './Paint/makeCirclePaintMask'
 export * from './Paint/makePaintMask'
 export * from './Paint/makeRectFalloffPaintAlphaMask'
-export * from './Paint/PaintCursorRenderer'
+
+export * from './Paint/Render/AlphaMaskPaintBufferCanvasRenderer'
+export * from './Paint/Render/BinaryMaskPaintBufferCanvasRenderer'
+export * from './Paint/Render/ColorPaintBufferCanvasRenderer'
+export * from './Paint/Render/PaintCursorRenderer'
 
 export * from './PixelData/_pixelData-types'
 export * from './PixelData/applyAlphaMaskToPixelData'