Skip to content

Commit 97ad764

Browse files
bbazukun123bbazukun123
committed
Merge branch 'main' into chore-deprecation-reflection
2 parents cca1975 + b512624 commit 97ad764

38 files changed

+87
-78
lines changed

‎examples/src/DemoApplication.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ export default class DemoApplication extends PIXI.Application
273273
name: id,
274274
enabled: false,
275275
opened: false,
276-
args: null,
276+
args: undefined,
277277
fishOnly: false,
278278
global: false,
279279
oncreate: null,

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/screenshots/renderer.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ const outputOptions = {
1919
},
2020
};
2121

22+
const indexCount = 0;
23+
2224
const app = new Application();
2325

2426
app.init({
2527
width: outputOptions.width,
2628
height: outputOptions.height,
2729
backgroundColor: outputOptions.border.color,
2830
autoStart: false,
29-
preference: 'webgl',
31+
preference: 'webgpu',
3032
hello: true,
3133
}).then(() =>
3234
{
@@ -163,8 +165,15 @@ app.init({
163165
app.render();
164166
const canvas = app.renderer.extract.canvas(app.stage);
165167

168+
const canvas2 = document.createElement('canvas');
169+
170+
canvas2.width = canvas.width;
171+
canvas2.height = canvas.height;
172+
166173
document.body.appendChild(canvas);
167-
const context = canvas.getContext('2d');
174+
const context = canvas2.getContext('2d');
175+
176+
context.drawImage(canvas, 0, 0);
168177

169178
context.scale(1, -1);
170179
const imageData = context.getImageData(0, 0, outputOptions.width, outputOptions.height);

‎src/adjustment/AdjustmentFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class AdjustmentFilter extends Filter
8484
{
8585
options = { ...AdjustmentFilter.DEFAULT_OPTIONS, ...options };
8686

87-
const gpuProgram = new GpuProgram({
87+
const gpuProgram = GpuProgram.from({
8888
vertex: {
8989
source: wgslVertex,
9090
entryPoint: 'mainVertex',
@@ -95,7 +95,7 @@ export class AdjustmentFilter extends Filter
9595
},
9696
});
9797

98-
const glProgram = new GlProgram({
98+
const glProgram = GlProgram.from({
9999
vertex,
100100
fragment,
101101
name: 'adjustment-filter'

‎src/advanced-bloom/AdvancedBloomFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class AdvancedBloomFilter extends Filter
7777
{
7878
options = { ...AdvancedBloomFilter.DEFAULT_OPTIONS, ...options };
7979

80-
const gpuProgram = new GpuProgram({
80+
const gpuProgram = GpuProgram.from({
8181
vertex: {
8282
source: wgslVertex,
8383
entryPoint: 'mainVertex',
@@ -88,7 +88,7 @@ export class AdvancedBloomFilter extends Filter
8888
},
8989
});
9090

91-
const glProgram = new GlProgram({
91+
const glProgram = GlProgram.from({
9292
vertex,
9393
fragment,
9494
name: 'advanced-bloom-filter',

‎src/advanced-bloom/ExtractBrightnessFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class ExtractBrightnessFilter extends Filter
3131
{
3232
options = { ...ExtractBrightnessFilter.DEFAULT_OPTIONS, ...options };
3333

34-
const gpuProgram = new GpuProgram({
34+
const gpuProgram = GpuProgram.from({
3535
vertex: {
3636
source: wgslVertex,
3737
entryPoint: 'mainVertex',
@@ -42,7 +42,7 @@ export class ExtractBrightnessFilter extends Filter
4242
},
4343
});
4444

45-
const glProgram = new GlProgram({
45+
const glProgram = GlProgram.from({
4646
vertex,
4747
fragment,
4848
name: 'extract-brightness-filter',

‎src/ascii/AsciiFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class AsciiFilter extends Filter
5959

6060
options = { ...AsciiFilter.DEFAULT_OPTIONS, ...options } as AsciiFilterOptions;
6161

62-
const gpuProgram = new GpuProgram({
62+
const gpuProgram = GpuProgram.from({
6363
vertex: {
6464
source: wgslVertex,
6565
entryPoint: 'mainVertex',
@@ -70,7 +70,7 @@ export class AsciiFilter extends Filter
7070
},
7171
});
7272

73-
const glProgram = new GlProgram({
73+
const glProgram = GlProgram.from({
7474
vertex,
7575
fragment,
7676
name: 'ascii-filter',

‎src/bevel/BevelFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class BevelFilter extends Filter
7878

7979
const rotation = (options.rotation ?? 45) * DEG_TO_RAD;
8080

81-
const gpuProgram = new GpuProgram({
81+
const gpuProgram = GpuProgram.from({
8282
vertex: {
8383
source: wgslVertex,
8484
entryPoint: 'mainVertex',
@@ -89,7 +89,7 @@ export class BevelFilter extends Filter
8989
},
9090
});
9191

92-
const glProgram = new GlProgram({
92+
const glProgram = GlProgram.from({
9393
vertex,
9494
fragment,
9595
name: 'bevel-filter',

‎src/bulge-pinch/BulgePinchFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class BulgePinchFilter extends Filter
5454
{
5555
options = { ...BulgePinchFilter.DEFAULT_OPTIONS, ...options };
5656

57-
const gpuProgram = new GpuProgram({
57+
const gpuProgram = GpuProgram.from({
5858
vertex: {
5959
source: wgslVertex,
6060
entryPoint: 'mainVertex',
@@ -64,7 +64,7 @@ export class BulgePinchFilter extends Filter
6464
entryPoint: 'mainFragment',
6565
},
6666
});
67-
const glProgram = new GlProgram({
67+
const glProgram = GlProgram.from({
6868
vertex,
6969
fragment,
7070
name: 'bulge-pinch-filter',

‎src/color-gradient/ColorGradientFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class ColorGradientFilter extends Filter
9797
throw new Error('ColorGradientFilter requires at least 2 color stops.');
9898
}
9999

100-
const gpuProgram = new GpuProgram({
100+
const gpuProgram = GpuProgram.from({
101101
vertex: {
102102
source,
103103
entryPoint: 'mainVertex',
@@ -108,7 +108,7 @@ export class ColorGradientFilter extends Filter
108108
},
109109
});
110110

111-
const glProgram = new GlProgram({
111+
const glProgram = GlProgram.from({
112112
vertex,
113113
fragment,
114114
name: 'color-gradient-filter',

‎src/color-map/ColorMapFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class ColorMapFilter extends Filter
6060

6161
if (!options.colorMap) throw Error('No color map texture source was provided to ColorMapFilter');
6262

63-
const gpuProgram = new GpuProgram({
63+
const gpuProgram = GpuProgram.from({
6464
vertex: {
6565
source: wgslVertex,
6666
entryPoint: 'mainVertex',
@@ -71,7 +71,7 @@ export class ColorMapFilter extends Filter
7171
},
7272
});
7373

74-
const glProgram = new GlProgram({
74+
const glProgram = GlProgram.from({
7575
vertex,
7676
fragment,
7777
name: 'color-map-filter',

‎src/color-overlay/ColorOverlayFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ColorOverlayFilter extends Filter
4545
{
4646
options = { ...ColorOverlayFilter.DEFAULT_OPTIONS, ...options };
4747

48-
const gpuProgram = new GpuProgram({
48+
const gpuProgram = GpuProgram.from({
4949
vertex: {
5050
source: wgslVertex,
5151
entryPoint: 'mainVertex',
@@ -56,7 +56,7 @@ export class ColorOverlayFilter extends Filter
5656
},
5757
});
5858

59-
const glProgram = new GlProgram({
59+
const glProgram = GlProgram.from({
6060
vertex,
6161
fragment,
6262
name: 'color-overlay-filter',

‎src/color-replace/ColorReplaceFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class ColorReplaceFilter extends Filter
7777
{
7878
options = { ...ColorReplaceFilter.DEFAULT_OPTIONS, ...options };
7979

80-
const gpuProgram = new GpuProgram({
80+
const gpuProgram = GpuProgram.from({
8181
vertex: {
8282
source: wgslVertex,
8383
entryPoint: 'mainVertex',
@@ -88,7 +88,7 @@ export class ColorReplaceFilter extends Filter
8888
},
8989
});
9090

91-
const glProgram = new GlProgram({
91+
const glProgram = GlProgram.from({
9292
vertex,
9393
fragment,
9494
name: 'color-replace-filter',

‎src/convolution/ConvolutionFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class ConvolutionFilter extends Filter
6262
const width = options.width ?? 200;
6363
const height = options.height ?? 200;
6464

65-
const gpuProgram = new GpuProgram({
65+
const gpuProgram = GpuProgram.from({
6666
vertex: {
6767
source: wgslVertex,
6868
entryPoint: 'mainVertex',
@@ -73,7 +73,7 @@ export class ConvolutionFilter extends Filter
7373
},
7474
});
7575

76-
const glProgram = new GlProgram({
76+
const glProgram = GlProgram.from({
7777
vertex,
7878
fragment,
7979
name: 'convolution-filter',

‎src/cross-hatch/CrossHatchFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class CrossHatchFilter extends Filter
1515
{
1616
constructor()
1717
{
18-
const gpuProgram = new GpuProgram({
18+
const gpuProgram = GpuProgram.from({
1919
vertex: {
2020
source: wgslVertex,
2121
entryPoint: 'mainVertex',
@@ -26,7 +26,7 @@ export class CrossHatchFilter extends Filter
2626
},
2727
});
2828

29-
const glProgram = new GlProgram({
29+
const glProgram = GlProgram.from({
3030
vertex,
3131
fragment,
3232
name: 'cross-hatch-filter',

‎src/crt/CRTFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class CRTFilter extends Filter
116116
{
117117
options = { ...CRTFilter.DEFAULT_OPTIONS, ...options };
118118

119-
const gpuProgram = new GpuProgram({
119+
const gpuProgram = GpuProgram.from({
120120
vertex: {
121121
source: wgslVertex,
122122
entryPoint: 'mainVertex',
@@ -127,7 +127,7 @@ export class CRTFilter extends Filter
127127
},
128128
});
129129

130-
const glProgram = new GlProgram({
130+
const glProgram = GlProgram.from({
131131
vertex,
132132
fragment,
133133
name: 'crt-filter',

‎src/dot/DotFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export class DotFilter extends Filter
5858
uGrayScale: { value: options.grayscale ? 1 : 0, type: 'f32' },
5959
};
6060

61-
const gpuProgram = new GpuProgram({
61+
const gpuProgram = GpuProgram.from({
6262
vertex: {
6363
source: wgslVertex,
6464
entryPoint: 'mainVertex',
@@ -69,7 +69,7 @@ export class DotFilter extends Filter
6969
},
7070
});
7171

72-
const glProgram = new GlProgram({
72+
const glProgram = GlProgram.from({
7373
vertex,
7474
fragment,
7575
name: 'dot-filter',

‎src/drop-shadow/DropShadowFilter.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class DropShadowFilter extends Filter
101101
{
102102
options = { ...DropShadowFilter.DEFAULT_OPTIONS, ...options };
103103

104-
const gpuProgram = new GpuProgram({
104+
const gpuProgram = GpuProgram.from({
105105
vertex: {
106106
source: wgslVertex,
107107
entryPoint: 'mainVertex',
@@ -112,7 +112,7 @@ export class DropShadowFilter extends Filter
112112
},
113113
});
114114

115-
const glProgram = new GlProgram({
115+
const glProgram = GlProgram.from({
116116
vertex,
117117
fragment,
118118
name: 'drop-shadow-filter',
@@ -140,7 +140,7 @@ export class DropShadowFilter extends Filter
140140
});
141141

142142
this._basePass = new Filter({
143-
gpuProgram: new GpuProgram({
143+
gpuProgram: GpuProgram.from({
144144
vertex: {
145145
source: wgslVertex,
146146
entryPoint: 'mainVertex',
@@ -160,7 +160,7 @@ export class DropShadowFilter extends Filter
160160
entryPoint: 'mainFragment',
161161
},
162162
}),
163-
glProgram: new GlProgram({
163+
glProgram: GlProgram.from({
164164
vertex,
165165
fragment: `
166166
in vec2 vTextureCoord;

‎src/emboss/EmbossFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class EmbossFilter extends Filter
3535
{
3636
options = { ...EmbossFilter.DEFAULT_OPTIONS, ...options };
3737

38-
const gpuProgram = new GpuProgram({
38+
const gpuProgram = GpuProgram.from({
3939
vertex: {
4040
source: wgslVertex,
4141
entryPoint: 'mainVertex',
@@ -46,7 +46,7 @@ export class EmbossFilter extends Filter
4646
},
4747
});
4848

49-
const glProgram = new GlProgram({
49+
const glProgram = GlProgram.from({
5050
vertex,
5151
fragment,
5252
name: 'emboss-filter',

‎src/glitch/GlitchFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class GlitchFilter extends Filter
121121
{
122122
options = { ...GlitchFilter.defaults, ...options };
123123

124-
const gpuProgram = new GpuProgram({
124+
const gpuProgram = GpuProgram.from({
125125
vertex: {
126126
source: wgslVertex,
127127
entryPoint: 'mainVertex',
@@ -132,7 +132,7 @@ export class GlitchFilter extends Filter
132132
},
133133
});
134134

135-
const glProgram = new GlProgram({
135+
const glProgram = GlProgram.from({
136136
vertex,
137137
fragment,
138138
name: 'glitch-filter',

‎src/glow/GlowFilter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class GlowFilter extends Filter
9292
const distance = options.distance ?? 10;
9393
const quality = options.quality ?? 0.1;
9494

95-
const gpuProgram = new GpuProgram({
95+
const gpuProgram = GpuProgram.from({
9696
vertex: {
9797
source: wgslVertex,
9898
entryPoint: 'mainVertex',
@@ -108,7 +108,7 @@ export class GlowFilter extends Filter
108108
* since we hard-assign them during creation to allow
109109
* for the values to be used in GLSL loops
110110
*/
111-
const glProgram = new GlProgram({
111+
const glProgram = GlProgram.from({
112112
vertex,
113113
fragment: fragment
114114
.replace(/__ANGLE_STEP_SIZE__/gi, `${(1 / quality / distance).toFixed(7)}`)

0 commit comments

Comments
 (0)