Merge branch 'main' into chore-emboss-filter-tweaks

pixijs · Feb 14, 2024 · 93c4db8 · 93c4db8
2 parents e35b39f + b512624
commit 93c4db8
Show file tree

Hide file tree

Showing 37 changed files with 85 additions and 76 deletions.
diff --git a/examples/src/DemoApplication.mjs b/examples/src/DemoApplication.mjs
@@ -273,7 +273,7 @@ export default class DemoApplication extends PIXI.Application
             name: id,
             enabled: false,
             opened: false,
-            args: null,
+            args: undefined,
             fishOnly: false,
             global: false,
             oncreate: null,

diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/screenshots/renderer.js b/scripts/screenshots/renderer.js
@@ -19,14 +19,16 @@ const outputOptions = {
     },
 };
 
+const indexCount = 0;
+
 const app = new Application();
 
 app.init({
     width: outputOptions.width,
     height: outputOptions.height,
     backgroundColor: outputOptions.border.color,
     autoStart: false,
-    preference: 'webgl',
+    preference: 'webgpu',
     hello: true,
 }).then(() =>
 {
@@ -163,8 +165,15 @@ app.init({
                 app.render();
                 const canvas = app.renderer.extract.canvas(app.stage);
 
+                const canvas2 = document.createElement('canvas');
+
+                canvas2.width = canvas.width;
+                canvas2.height = canvas.height;
+
                 document.body.appendChild(canvas);
-                const context = canvas.getContext('2d');
+                const context = canvas2.getContext('2d');
+
+                context.drawImage(canvas, 0, 0);
 
                 context.scale(1, -1);
                 const imageData = context.getImageData(0, 0, outputOptions.width, outputOptions.height);

diff --git a/src/adjustment/AdjustmentFilter.ts b/src/adjustment/AdjustmentFilter.ts
@@ -84,7 +84,7 @@ export class AdjustmentFilter extends Filter
     {
         options = { ...AdjustmentFilter.DEFAULT_OPTIONS, ...options };
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -95,7 +95,7 @@ export class AdjustmentFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'adjustment-filter'

diff --git 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/advanced-bloom/ExtractBrightnessFilter.ts b/src/advanced-bloom/ExtractBrightnessFilter.ts
@@ -31,7 +31,7 @@ export class ExtractBrightnessFilter extends Filter
     {
         options = { ...ExtractBrightnessFilter.DEFAULT_OPTIONS, ...options };
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -42,7 +42,7 @@ export class ExtractBrightnessFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'extract-brightness-filter',

diff --git 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/bevel/BevelFilter.ts b/src/bevel/BevelFilter.ts
@@ -78,7 +78,7 @@ export class BevelFilter extends Filter
 
         const rotation = (options.rotation ?? 45) * DEG_TO_RAD;
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -89,7 +89,7 @@ export class BevelFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'bevel-filter',

diff --git 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-gradient/ColorGradientFilter.ts b/src/color-gradient/ColorGradientFilter.ts
@@ -97,7 +97,7 @@ export class ColorGradientFilter extends Filter
             throw new Error('ColorGradientFilter requires at least 2 color stops.');
         }
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source,
                 entryPoint: 'mainVertex',
@@ -108,7 +108,7 @@ export class ColorGradientFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'color-gradient-filter',

diff --git 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
@@ -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
@@ -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
@@ -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/cross-hatch/CrossHatchFilter.ts b/src/cross-hatch/CrossHatchFilter.ts
@@ -15,7 +15,7 @@ export class CrossHatchFilter extends Filter
 {
     constructor()
     {
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -26,7 +26,7 @@ export class CrossHatchFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'cross-hatch-filter',

diff --git a/src/crt/CRTFilter.ts b/src/crt/CRTFilter.ts
@@ -116,7 +116,7 @@ export class CRTFilter extends Filter
     {
         options = { ...CRTFilter.DEFAULT_OPTIONS, ...options };
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -127,7 +127,7 @@ export class CRTFilter extends Filter
             },
         });
 
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment,
             name: 'crt-filter',

diff --git 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
@@ -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/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/glow/GlowFilter.ts b/src/glow/GlowFilter.ts
@@ -92,7 +92,7 @@ export class GlowFilter extends Filter
         const distance = options.distance ?? 10;
         const quality = options.quality ?? 0.1;
 
-        const gpuProgram = new GpuProgram({
+        const gpuProgram = GpuProgram.from({
             vertex: {
                 source: wgslVertex,
                 entryPoint: 'mainVertex',
@@ -108,7 +108,7 @@ export class GlowFilter extends Filter
          * since we hard-assign them during creation to allow
          * for the values to be used in GLSL loops
          */
-        const glProgram = new GlProgram({
+        const glProgram = GlProgram.from({
             vertex,
             fragment: fragment
                 .replace(/__ANGLE_STEP_SIZE__/gi, `${(1 / quality / distance).toFixed(7)}`)

diff --git 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',