diff --git a/src/advanced-bloom/AdvancedBloomFilter.ts b/src/advanced-bloom/AdvancedBloomFilter.ts index de8475f79..9bd17f2c4 100644 --- a/src/advanced-bloom/AdvancedBloomFilter.ts +++ b/src/advanced-bloom/AdvancedBloomFilter.ts @@ -77,7 +77,7 @@ export class AdvancedBloomFilter extends Filter { options = { ...AdvancedBloomFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -88,7 +88,7 @@ export class AdvancedBloomFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'advanced-bloom-filter', diff --git a/src/ascii/AsciiFilter.ts b/src/ascii/AsciiFilter.ts index f8216521c..73433da43 100644 --- a/src/ascii/AsciiFilter.ts +++ b/src/ascii/AsciiFilter.ts @@ -59,7 +59,7 @@ export class AsciiFilter extends Filter options = { ...AsciiFilter.DEFAULT_OPTIONS, ...options } as AsciiFilterOptions; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -70,7 +70,7 @@ export class AsciiFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'ascii-filter', diff --git a/src/bulge-pinch/BulgePinchFilter.ts b/src/bulge-pinch/BulgePinchFilter.ts index c4a440194..004af846c 100644 --- a/src/bulge-pinch/BulgePinchFilter.ts +++ b/src/bulge-pinch/BulgePinchFilter.ts @@ -54,7 +54,7 @@ export class BulgePinchFilter extends Filter { options = { ...BulgePinchFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -64,7 +64,7 @@ export class BulgePinchFilter extends Filter entryPoint: 'mainFragment', }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'bulge-pinch-filter', diff --git a/src/color-map/ColorMapFilter.ts b/src/color-map/ColorMapFilter.ts index 52c448290..60b8a1080 100644 --- a/src/color-map/ColorMapFilter.ts +++ b/src/color-map/ColorMapFilter.ts @@ -60,7 +60,7 @@ export class ColorMapFilter extends Filter if (!options.colorMap) throw Error('No color map texture source was provided to ColorMapFilter'); - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -71,7 +71,7 @@ export class ColorMapFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'color-map-filter', diff --git a/src/color-overlay/ColorOverlayFilter.ts b/src/color-overlay/ColorOverlayFilter.ts index e1e86a37c..187ccf03d 100644 --- a/src/color-overlay/ColorOverlayFilter.ts +++ b/src/color-overlay/ColorOverlayFilter.ts @@ -45,7 +45,7 @@ export class ColorOverlayFilter extends Filter { options = { ...ColorOverlayFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -56,7 +56,7 @@ export class ColorOverlayFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'color-overlay-filter', diff --git a/src/color-replace/ColorReplaceFilter.ts b/src/color-replace/ColorReplaceFilter.ts index 7f670aee6..df575fc3f 100644 --- a/src/color-replace/ColorReplaceFilter.ts +++ b/src/color-replace/ColorReplaceFilter.ts @@ -77,7 +77,7 @@ export class ColorReplaceFilter extends Filter { options = { ...ColorReplaceFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -88,7 +88,7 @@ export class ColorReplaceFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'color-replace-filter', diff --git a/src/convolution/ConvolutionFilter.ts b/src/convolution/ConvolutionFilter.ts index 42008521d..c02e70e81 100644 --- a/src/convolution/ConvolutionFilter.ts +++ b/src/convolution/ConvolutionFilter.ts @@ -62,7 +62,7 @@ export class ConvolutionFilter extends Filter const width = options.width ?? 200; const height = options.height ?? 200; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -73,7 +73,7 @@ export class ConvolutionFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'convolution-filter', diff --git a/src/dot/DotFilter.ts b/src/dot/DotFilter.ts index ad48e70ac..61de05dd9 100644 --- a/src/dot/DotFilter.ts +++ b/src/dot/DotFilter.ts @@ -58,7 +58,7 @@ export class DotFilter extends Filter uGrayScale: { value: options.grayscale ? 1 : 0, type: 'f32' }, }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -69,7 +69,7 @@ export class DotFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'dot-filter', diff --git a/src/drop-shadow/DropShadowFilter.ts b/src/drop-shadow/DropShadowFilter.ts index 5b22288a0..0086ba450 100644 --- a/src/drop-shadow/DropShadowFilter.ts +++ b/src/drop-shadow/DropShadowFilter.ts @@ -101,7 +101,7 @@ export class DropShadowFilter extends Filter { options = { ...DropShadowFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -112,7 +112,7 @@ export class DropShadowFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'drop-shadow-filter', @@ -140,7 +140,7 @@ export class DropShadowFilter extends Filter }); this._basePass = new Filter({ - gpuProgram: new GpuProgram({ + gpuProgram: GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -160,7 +160,7 @@ export class DropShadowFilter extends Filter entryPoint: 'mainFragment', }, }), - glProgram: new GlProgram({ + glProgram: GlProgram.from({ vertex, fragment: ` in vec2 vTextureCoord; diff --git a/src/emboss/EmbossFilter.ts b/src/emboss/EmbossFilter.ts index f4dc29703..1fb50a605 100644 --- a/src/emboss/EmbossFilter.ts +++ b/src/emboss/EmbossFilter.ts @@ -35,7 +35,7 @@ export class EmbossFilter extends Filter { options = { ...EmbossFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -46,7 +46,7 @@ export class EmbossFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'emboss-filter', diff --git a/src/glitch/GlitchFilter.ts b/src/glitch/GlitchFilter.ts index 4fa8f0dbe..5bd0b9f53 100644 --- a/src/glitch/GlitchFilter.ts +++ b/src/glitch/GlitchFilter.ts @@ -121,7 +121,7 @@ export class GlitchFilter extends Filter { options = { ...GlitchFilter.defaults, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -132,7 +132,7 @@ export class GlitchFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'glitch-filter', diff --git a/src/godray/GodrayFilter.ts b/src/godray/GodrayFilter.ts index 4a78f8695..2cf5609fb 100644 --- a/src/godray/GodrayFilter.ts +++ b/src/godray/GodrayFilter.ts @@ -99,7 +99,7 @@ export class GodrayFilter extends Filter { options = { ...GodrayFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -109,7 +109,7 @@ export class GodrayFilter extends Filter entryPoint: 'mainFragment', }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment: fragment.replace('${PERLIN}', perlin), name: 'god-ray-filter', diff --git a/src/kawase-blur/KawaseBlurFilter.ts b/src/kawase-blur/KawaseBlurFilter.ts index 1c41c0815..f6e192a0c 100644 --- a/src/kawase-blur/KawaseBlurFilter.ts +++ b/src/kawase-blur/KawaseBlurFilter.ts @@ -65,7 +65,7 @@ export class KawaseBlurFilter extends Filter { options = { ...KawaseBlurFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -75,7 +75,7 @@ export class KawaseBlurFilter extends Filter entryPoint: 'mainFragment', }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment: options?.clamp ? fragmentClamp : fragment, name: 'kawase-blur-filter', diff --git a/src/motion-blur/MotionBlurFilter.ts b/src/motion-blur/MotionBlurFilter.ts index 57d64701f..c110423a3 100644 --- a/src/motion-blur/MotionBlurFilter.ts +++ b/src/motion-blur/MotionBlurFilter.ts @@ -55,7 +55,7 @@ export class MotionBlurFilter extends Filter { options = { ...MotionBlurFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -66,7 +66,7 @@ export class MotionBlurFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'motion-blur-filter', diff --git a/src/multi-color-replace/MultiColorReplaceFilter.ts b/src/multi-color-replace/MultiColorReplaceFilter.ts index 5363d39bb..35f71eaae 100644 --- a/src/multi-color-replace/MultiColorReplaceFilter.ts +++ b/src/multi-color-replace/MultiColorReplaceFilter.ts @@ -78,7 +78,7 @@ export class MultiColorReplaceFilter extends Filter const maxColors = options.maxColors ?? options.replacements.length; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -89,7 +89,7 @@ export class MultiColorReplaceFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment: fragment.replace(/\$\{MAX_COLORS\}/g, (maxColors).toFixed(0)), name: 'multi-color-replace-filter', diff --git a/src/old-film/OldFilmFilter.ts b/src/old-film/OldFilmFilter.ts index 1e59a01e9..256a16e4f 100644 --- a/src/old-film/OldFilmFilter.ts +++ b/src/old-film/OldFilmFilter.ts @@ -103,7 +103,7 @@ export class OldFilmFilter extends Filter { options = { ...OldFilmFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -114,7 +114,7 @@ export class OldFilmFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'old-film-filter', diff --git a/src/outline/OutlineFilter.ts b/src/outline/OutlineFilter.ts index 8acd250b6..7d9e75462 100644 --- a/src/outline/OutlineFilter.ts +++ b/src/outline/OutlineFilter.ts @@ -83,7 +83,7 @@ export class OutlineFilter extends Filter const quality = options.quality ?? 0.1; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -94,7 +94,7 @@ export class OutlineFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment: fragment.replace(/\$\{ANGLE_STEP\}/, OutlineFilter.getAngleStep(quality).toFixed(7)), name: 'outline-filter', diff --git a/src/pixelate/PixelateFilter.ts b/src/pixelate/PixelateFilter.ts index d3f335071..cb7f0382c 100644 --- a/src/pixelate/PixelateFilter.ts +++ b/src/pixelate/PixelateFilter.ts @@ -29,7 +29,7 @@ export class PixelateFilter extends Filter uSize: { value: new Float32Array(2), type: 'vec2' }, }); - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -40,7 +40,7 @@ export class PixelateFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'pixelate-filter', diff --git a/src/radial-blur/RadialBlurFilter.ts b/src/radial-blur/RadialBlurFilter.ts index ae487af78..b90f69730 100644 --- a/src/radial-blur/RadialBlurFilter.ts +++ b/src/radial-blur/RadialBlurFilter.ts @@ -63,7 +63,7 @@ export class RadialBlurFilter extends Filter { options = { ...RadialBlurFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -74,7 +74,7 @@ export class RadialBlurFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'radial-blur-filter', diff --git a/src/reflection/ReflectionFilter.ts b/src/reflection/ReflectionFilter.ts index ea486c627..77dd1994b 100644 --- a/src/reflection/ReflectionFilter.ts +++ b/src/reflection/ReflectionFilter.ts @@ -83,7 +83,7 @@ export class ReflectionFilter extends Filter { options = { ...ReflectionFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -93,7 +93,7 @@ export class ReflectionFilter extends Filter entryPoint: 'mainFragment', }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'reflection-filter', diff --git a/src/rgb-split/RGBSplitFilter.ts b/src/rgb-split/RGBSplitFilter.ts index 3904f8eb1..2e4a42ac4 100644 --- a/src/rgb-split/RGBSplitFilter.ts +++ b/src/rgb-split/RGBSplitFilter.ts @@ -49,7 +49,7 @@ export class RGBSplitFilter extends Filter { options = { ...RGBSplitFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -60,7 +60,7 @@ export class RGBSplitFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'rgb-split-filter', diff --git a/src/shockwave/ShockwaveFilter.ts b/src/shockwave/ShockwaveFilter.ts index fc3834d33..a8c0a6688 100644 --- a/src/shockwave/ShockwaveFilter.ts +++ b/src/shockwave/ShockwaveFilter.ts @@ -87,7 +87,7 @@ export class ShockwaveFilter extends Filter { options = { ...ShockwaveFilter.DEFAULT_OPTIONS, ...options }; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -98,7 +98,7 @@ export class ShockwaveFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'shockwave-filter' diff --git a/src/simple-lightmap/SimpleLightmapFilter.ts b/src/simple-lightmap/SimpleLightmapFilter.ts index 75e32233a..85cd10d07 100644 --- a/src/simple-lightmap/SimpleLightmapFilter.ts +++ b/src/simple-lightmap/SimpleLightmapFilter.ts @@ -61,7 +61,7 @@ export class SimpleLightmapFilter extends Filter if (!options.lightMap) throw Error('No light map texture source was provided to SimpleLightmapFilter'); - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -71,7 +71,7 @@ export class SimpleLightmapFilter extends Filter entryPoint: 'mainFragment', }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment, name: 'simple-lightmap-filter', diff --git a/src/zoom-blur/ZoomBlurFilter.ts b/src/zoom-blur/ZoomBlurFilter.ts index 84d860ccb..56595429b 100644 --- a/src/zoom-blur/ZoomBlurFilter.ts +++ b/src/zoom-blur/ZoomBlurFilter.ts @@ -66,7 +66,7 @@ export class ZoomBlurFilter extends Filter const kernelSize = options.maxKernelSize ?? 32; - const gpuProgram = new GpuProgram({ + const gpuProgram = GpuProgram.from({ vertex: { source: wgslVertex, entryPoint: 'mainVertex', @@ -77,7 +77,7 @@ export class ZoomBlurFilter extends Filter }, }); - const glProgram = new GlProgram({ + const glProgram = GlProgram.from({ vertex, fragment: fragment.replace('${MAX_KERNEL_SIZE}', kernelSize.toFixed(1)), name: 'zoom-blur-filter',