From 265e824780f722b413f10eced2544d7b4a199674 Mon Sep 17 00:00:00 2001 From: Baz Utsahajit Date: Thu, 8 Feb 2024 12:30:54 +0000 Subject: [PATCH] Chore: Pixelate Filter Tweaks --- src/pixelate/PixelateFilter.ts | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/pixelate/PixelateFilter.ts b/src/pixelate/PixelateFilter.ts index d3f335071..8b5a13e7c 100644 --- a/src/pixelate/PixelateFilter.ts +++ b/src/pixelate/PixelateFilter.ts @@ -1,4 +1,4 @@ -import { Filter, GlProgram, GpuProgram, Point, UniformGroup } from 'pixi.js'; +import { Filter, GlProgram, GpuProgram, Point } from 'pixi.js'; import { vertex, wgslVertex } from '../defaults'; import fragment from './pixelate.frag'; import source from './pixelate.wgsl'; @@ -15,21 +15,12 @@ type Size = number | number[] | Point; */ export class PixelateFilter extends Filter { - /** Default values for options. */ - public static readonly DEFAULT_SIZE: Size = 10; - /** * @param {Point|Array|number} [size=10] - Either the width/height of the size of the pixels, or square size */ - constructor(size: Size) + constructor(size: Size = 10) { - size = size ?? PixelateFilter.DEFAULT_SIZE; - - const pixelateUniforms = new UniformGroup({ - uSize: { value: new Float32Array(2), type: 'vec2' }, - }); - - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -40,7 +31,7 @@ export class PixelateFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'pixelate-filter', @@ -50,7 +41,9 @@ export class PixelateFilter extends Filter gpuProgram, glProgram, resources: { - pixelateUniforms, + pixelateUniforms: { + uSize: { value: new Float32Array(2), type: 'vec2' }, + }, }, });