Skip to content

Commit

Permalink
Fix lint warningsn
Browse files Browse the repository at this point in the history
  • Loading branch information
bbazukun123 committed Jan 6, 2024
1 parent 7bfc122 commit 3c641ee
Show file tree
Hide file tree
Showing 29 changed files with 77 additions and 100 deletions.
4 changes: 2 additions & 2 deletions filters/adjustment/src/AdjustmentFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './adjustment.frag';
import source from './adjustment.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

export interface AdjustmentFilterOptions
{
Expand Down
6 changes: 3 additions & 3 deletions filters/advanced-bloom/src/AdvancedBloomFilter.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ExtractBrightnessFilter } from './ExtractBrightnessFilter';
import { Filter, FilterSystem, GlProgram, GpuProgram, PointData, RenderSurface, Texture, TexturePool } from 'pixi.js';
import { KawaseBlurFilter } from '@pixi/filter-kawase-blur';
import { vertex, wgslVertex } from '@tools/fragments';
import fragment from './advanced-bloom.frag';
import source from './advanced-bloom.wgsl';
import { Filter, GlProgram, GpuProgram, TexturePool, FilterSystem, PointData, RenderSurface, Texture } from 'pixi.js';
import { ExtractBrightnessFilter } from './ExtractBrightnessFilter';
import { vertex, wgslVertex } from '@tools/fragments';

export interface AdvancedBloomFilterOptions
{
Expand Down
4 changes: 2 additions & 2 deletions filters/advanced-bloom/src/ExtractBrightnessFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './extract-brightness.frag';
import source from './extract-brightness.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

export interface ExtractBrightnessFilterOptions
{
Expand Down
7 changes: 4 additions & 3 deletions filters/bulge-pinch/src/BulgePinchFilter.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './bulge-pinch.frag';
import source from './bulge-pinch.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import type { FilterSystem, Texture, RenderSurface, PointData } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { FilterSystem, PointData, RenderSurface, Texture } from 'pixi.js';

// This WebGPU filter has been ported from the WebGL renderer that was originally created by Julien CLEREL (@JuloxRox)

Expand Down
3 changes: 1 addition & 2 deletions filters/color-gradient/src/CssGradientParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import {
parse,
ShapeNode
} from 'gradient-parser';

import { ColorStop } from './ColorGradientFilter';
import { Color } from 'pixi.js';
import { ColorStop } from './ColorGradientFilter';

export type ParseResult = {
type: number;
Expand Down
10 changes: 5 additions & 5 deletions filters/color-gradient/test/CssGradientParser.test.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { describe, expect, jest, test } from '@jest/globals';
import { ColorStop as CssColorStop, parse } from 'gradient-parser';
import { Color, ColorSource } from 'pixi.js';
import { ColorStop } from '../src';
import {
angleFromCssOrientation,
angleFromDirectionalValue,
colorAsNormalizedRgbaFromCssStop,
offsetsFromCssColorStops,
parseCssGradient,
trimCssGradient,
typeFromCssType,
} from '../src/CssGradientParser';

import { ColorStop } from '../src';
import { describe, expect, jest, test } from '@jest/globals';

jest.mock('./../src/colorGradient.frag', () => '');
jest.mock('./../src/colorGradient.vert', () => '');
Expand Down Expand Up @@ -124,10 +123,11 @@ describe('CssGradientParser', () =>
for (let i = 0; i < testCases.length; i++)
{
const { stop, expectedValue } = testCases[i];
const color = new Color();

test(`${stop.value} = ${expectedValue}`, () =>
{
expect(colorAsNormalizedRgbaFromCssStop(stop)).toEqual(expectedValue);
expect(color.setValue(stop.value as ColorSource)).toEqual(expectedValue);
});
}
});
Expand Down
36 changes: 0 additions & 36 deletions filters/color-gradient/test/utils.test.ts

This file was deleted.

4 changes: 2 additions & 2 deletions filters/convolution/src/ConvolutionFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './convolution.frag';
import source from './convolution.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

type FixedArray<T, L extends number> = [ T, ...Array<T> ] & { length: L };

Expand Down
4 changes: 2 additions & 2 deletions filters/cross-hatch/src/CrossHatchFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './crosshatch.frag';
import source from './crosshatch.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

/**
* A Cross Hatch effect filter.<br>
Expand Down
5 changes: 3 additions & 2 deletions filters/crt/src/CRTFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './crt.frag';
import source from './crt.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { FilterSystem, RenderSurface, Texture } from 'pixi.js';

export interface CRTFilterOptions
Expand Down
4 changes: 2 additions & 2 deletions filters/dot/src/DotFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './dot.frag';
import source from './dot.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

// @author Mat Groves http://matgroves.com/ @Doormat23
// original filter: https://github.com/evanw/glfx.js/blob/master/src/filters/fun/dotscreen.js
Expand Down
18 changes: 9 additions & 9 deletions filters/drop-shadow/src/DropShadowFilter.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { KawaseBlurFilter } from '@pixi/filter-kawase-blur';
import { vertex, wgslVertex } from '@tools/fragments';
import fragment from './drop-shadow.frag';
import source from './drop-shadow.wgsl';
import {
Color,
ColorSource,
Filter,
GpuProgram,
TexturePool,
GlProgram,
FilterSystem,
GlProgram,
GpuProgram,
PointData,
ColorSource,
Color,
RenderSurface,
Texture,
TexturePool,
} from 'pixi.js';
import { KawaseBlurFilter } from '@pixi/filter-kawase-blur';
import fragment from './drop-shadow.frag';
import source from './drop-shadow.wgsl';
import { vertex, wgslVertex } from '@tools/fragments';

export interface DropShadowFilterOptions
{
Expand Down
9 changes: 5 additions & 4 deletions filters/godray/src/GodrayFilter.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { vertex, wgslVertex } from '@tools/fragments';
import perlin from './perlin.frag';
import sourcePerlin from './perlin.wgsl';
import { DEG_TO_RAD, Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './god-ray.frag';
import source from './god-ray.wgsl';
import { Filter, DEG_TO_RAD, GlProgram, GpuProgram } from 'pixi.js';
import perlin from './perlin.frag';
import sourcePerlin from './perlin.wgsl';
import { vertex, wgslVertex } from '@tools/fragments';

import type { FilterSystem, PointData, RenderSurface, Texture } from 'pixi.js';

export interface GodrayFilterOptions
Expand Down
2 changes: 1 addition & 1 deletion filters/grayscale/src/GrayscaleFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';
import fragment from './grayscale.frag';
import source from './grayscale.wgsl';
import { vertex, wgslVertex } from '@tools/fragments';

/**
* This filter applies a grayscale effect.<br>
Expand Down
2 changes: 1 addition & 1 deletion filters/hsl-adjustment/src/HslAdjustmentFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';
import fragment from './hsladjustment.frag';
import source from './hsladjustment.wgsl';
import { vertex, wgslVertex } from '@tools/fragments';

// This WebGPU filter has been ported from the WebGL renderer that was originally created by Viktor Persson (@vikpe)

Expand Down
7 changes: 4 additions & 3 deletions filters/kawase-blur/src/KawaseBlurFilter.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram, TexturePool } from 'pixi.js';
import fragment from './kawase-blur.frag';
import fragmentClamp from './kawase-blur-clamp.frag';
import source from './kawase-blur.wgsl';
import fragmentClamp from './kawase-blur-clamp.frag';
import sourceClamp from './kawase-blur-clamp.wgsl';
import { Filter, GlProgram, GpuProgram, TexturePool } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { FilterSystem, PointData, RenderSurface, Texture } from 'pixi.js';

export interface KawaseBlurFilterOptions
Expand Down
5 changes: 3 additions & 2 deletions filters/motion-blur/src/MotionBlurFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './motion-blur.frag';
import source from './motion-blur.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { PointData } from 'pixi.js';

export interface MotionBlurFilterOptions
Expand Down
5 changes: 3 additions & 2 deletions filters/radial-blur/src/RadialBlurFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './radial-blur.frag';
import source from './radial-blur.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { PointData } from 'pixi.js';

export interface RadialBlurFilterOptions
Expand Down
5 changes: 3 additions & 2 deletions filters/reflection/src/ReflectionFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import fragment from './reflection.frag';
import source from './reflection.wgsl';
import { Filter, GlProgram, GpuProgram } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

import type { FilterSystem, RenderSurface, Texture } from 'pixi.js';

/** [MIN, MAX] */
Expand Down
6 changes: 3 additions & 3 deletions filters/shockwave/src/ShockwaveFilter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { vertex, wgslVertex } from '@tools/fragments';
import fragment from './shockwave.frag';
import source from './shockwave.wgsl';
import {
Filter,
FilterSystem,
Expand All @@ -11,6 +8,9 @@ import {
Texture,
UniformGroup,
} from 'pixi.js';
import fragment from './shockwave.frag';
import source from './shockwave.wgsl';
import { vertex, wgslVertex } from '@tools/fragments';

/**
* Options for ShockwaveFilter
Expand Down
14 changes: 8 additions & 6 deletions filters/tilt-shift/src/TiltShiftAxisFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import fragment from './tilt-shift.frag';
import source from './tilt-shift.wgsl';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

// @author Vico @vicocotea
// original filter https://github.com/evanw/glfx.js/blob/master/src/filters/blur/tiltshift.js
Expand Down Expand Up @@ -81,10 +81,12 @@ export class TiltShiftAxisFilter extends Filter
glProgram,
resources: {
tiltShiftUniforms: {
uBlur: { value: new Float32Array([
options.blur ?? 100,
options.gradientBlur ?? 600
]), type: 'vec2<f32>' },
uBlur: {
value: new Float32Array([
options.blur ?? 100,
options.gradientBlur ?? 600
]), type: 'vec2<f32>'
},
uStart: { value: options.start, type: 'vec2<f32>' },
uEnd: { value: options.end, type: 'vec2<f32>' },
uDelta: { value: new Float32Array([30, 30]), type: 'vec2<f32>' },
Expand Down
3 changes: 2 additions & 1 deletion filters/tilt-shift/src/TiltShiftFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { FilterSystem, TexturePool } from 'pixi.js';
import type { PointData, RenderSurface, Texture } from 'pixi.js';
import { TiltShiftAxisFilter } from './TiltShiftAxisFilter';

import type { PointData, RenderSurface, Texture } from 'pixi.js';

// @author Vico @vicocotea
// original filter https://github.com/evanw/glfx.js/blob/master/src/filters/blur/tiltshift.js
// by Evan Wallace : http://madebyevan.com/
Expand Down
2 changes: 1 addition & 1 deletion filters/tilt-shift/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './TiltShiftFilter';
export * from './TiltShiftAxisFilter';
export * from './TiltShiftFilter';
4 changes: 2 additions & 2 deletions filters/twist/src/TwistFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import fragment from './twist.frag';
import source from './twist.wgsl';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

export interface TwistFilterOptions
{
Expand Down
4 changes: 2 additions & 2 deletions filters/zoom-blur/src/ZoomBlurFilter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { vertex, wgslVertex } from '@tools/fragments';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import fragment from './zoom-blur.frag';
import source from './zoom-blur.wgsl';
import { Filter, GlProgram, GpuProgram, PointData } from 'pixi.js';
import { vertex, wgslVertex } from '@tools/fragments';

export interface ZoomBlurFilterOptions
{
Expand Down
1 change: 1 addition & 0 deletions tools/demo/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import esbuild from 'rollup-plugin-esbuild';
import resolve from '@rollup/plugin-node-resolve';

const globals = {
'pixi.js': 'PIXI',
};
Expand Down
1 change: 1 addition & 0 deletions tools/demo/src/filters/color-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default function ()
folder.add(this, 'mix', 0, 1);
folder.add(this, 'nearest');

// eslint-disable-next-line no-empty-function
this._noop = () => {};
folder.add(this, '_noop').name('<img src="./images/colormap.png" width="220" height="13">');
},
Expand Down
1 change: 1 addition & 0 deletions tools/demo/src/filters/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable simple-import-sort/exports */
// Order here is the dat-gui order
export { default as adjustment } from './adjustment';
export { default as advancedBloom } from './advanced-bloom';
Expand Down
1 change: 1 addition & 0 deletions tools/demo/src/filters/lightmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default function ()
folder.addColor(this, 'color');
folder.add(this, 'alpha', 0, 1);

// eslint-disable-next-line no-empty-function
this._noop = () => {};
folder.add(this, '_noop').name('<img src="./images/lightmap.png" width="220" height="13">');
},
Expand Down

0 comments on commit 3c641ee

Please sign in to comment.