From 04dd6c672e3cdafa62b4a195df68c5863e5ecca6 Mon Sep 17 00:00:00 2001 From: Baz Utsahajit Date: Thu, 8 Feb 2024 11:53:27 +0000 Subject: [PATCH 1/2] Chore: ASCII Filter Deprecations --- src/ascii/AsciiFilter.ts | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/ascii/AsciiFilter.ts b/src/ascii/AsciiFilter.ts index f8216521c..2f999ff9a 100644 --- a/src/ascii/AsciiFilter.ts +++ b/src/ascii/AsciiFilter.ts @@ -1,4 +1,5 @@ -import { Color, ColorSource, Filter, GlProgram, GpuProgram } from 'pixi.js'; +// eslint-disable-next-line camelcase +import { Color, ColorSource, deprecation, Filter, GlProgram, GpuProgram, v8_0_0 } from 'pixi.js'; import { vertex, wgslVertex } from '../defaults'; import fragment from './ascii.frag'; import source from './ascii.wgsl'; @@ -53,13 +54,30 @@ export class AsciiFilter extends Filter private _color!: Color; - constructor(options?: AsciiFilterOptions) + constructor(options?: AsciiFilterOptions); + /** + * @deprecated since 8.0.0 + * + * @param {number} [size=8] - Size of the font + */ + constructor(size: number); + constructor(...args: [AsciiFilterOptions?] | [number]) { + let options = args[0] ?? {}; + + if (typeof options === 'number') + { + // eslint-disable-next-line max-len + deprecation(v8_0_0, 'AsciiFilter constructor params are now options object. See params: { size, color, replaceColor }'); + + options = { size: options }; + } + const replaceColor = options?.color && options.replaceColor !== false; options = { ...AsciiFilter.DEFAULT_OPTIONS, ...options } as AsciiFilterOptions; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -70,7 +88,7 @@ export class AsciiFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'ascii-filter', From ae4bddc05d6d032c3ace2bfbc6e4a1b18d73b394 Mon Sep 17 00:00:00 2001 From: Baz Utsahajit Date: Wed, 14 Feb 2024 11:42:40 +0000 Subject: [PATCH 2/2] Cleanup --- src/ascii/AsciiFilter.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ascii/AsciiFilter.ts b/src/ascii/AsciiFilter.ts index 2f999ff9a..da63f5315 100644 --- a/src/ascii/AsciiFilter.ts +++ b/src/ascii/AsciiFilter.ts @@ -1,5 +1,4 @@ -// eslint-disable-next-line camelcase -import { Color, ColorSource, deprecation, Filter, GlProgram, GpuProgram, v8_0_0 } from 'pixi.js'; +import { Color, ColorSource, deprecation, Filter, GlProgram, GpuProgram } from 'pixi.js'; import { vertex, wgslVertex } from '../defaults'; import fragment from './ascii.frag'; import source from './ascii.wgsl'; @@ -56,7 +55,7 @@ export class AsciiFilter extends Filter constructor(options?: AsciiFilterOptions); /** - * @deprecated since 8.0.0 + * @deprecated since 6.0.0 * * @param {number} [size=8] - Size of the font */ @@ -68,7 +67,7 @@ export class AsciiFilter extends Filter if (typeof options === 'number') { // eslint-disable-next-line max-len - deprecation(v8_0_0, 'AsciiFilter constructor params are now options object. See params: { size, color, replaceColor }'); + deprecation('6.0.0', 'AsciiFilter constructor params are now options object. See params: { size, color, replaceColor }'); options = { size: options }; }