Skip to content

Commit f4b95ab

Browse files
committed
New simplified Graphics shaders
1 parent 6af8070 commit f4b95ab

4 files changed

Lines changed: 10 additions & 40 deletions

File tree

src/renderer/webgl/shaders/Graphics-frag.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@ module.exports = [
33
'',
44
'precision mediump float;',
55
'',
6-
'uniform sampler2D uMainSampler;',
7-
'',
8-
'varying vec2 outTexCoord;',
9-
'varying float outTintEffect;',
10-
'varying vec4 outTint;',
6+
'varying vec4 outColor;',
117
'',
128
'void main()',
139
'{',
14-
' vec4 color = vec4(outTint.bgr * outTint.a, outTint.a);',
15-
'',
16-
' gl_FragColor = color;',
10+
' gl_FragColor = vec4(outColor.bgr * outColor.a, outColor.a);',
1711
'}',
1812
''
1913
].join('\n');

src/renderer/webgl/shaders/Graphics-vert.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,15 @@ module.exports = [
66
'uniform mat4 uProjectionMatrix;',
77
'',
88
'attribute vec2 inPosition;',
9-
'attribute vec2 inTexCoord;',
10-
'attribute float inTexId;',
11-
'attribute float inTintEffect;',
12-
'attribute vec4 inTint;',
9+
'attribute vec4 inColor;',
1310
'',
14-
'varying vec2 outTexCoord;',
15-
'varying float outTintEffect;',
16-
'varying vec4 outTint;',
11+
'varying vec4 outColor;',
1712
'',
1813
'void main ()',
1914
'{',
2015
' gl_Position = uProjectionMatrix * vec4(inPosition, 1.0, 1.0);',
2116
'',
22-
' outTexCoord = inTexCoord;',
23-
' outTint = inTint;',
24-
' outTintEffect = inTintEffect;',
17+
' outColor = inColor;',
2518
'}',
2619
''
2720
].join('\n');

src/renderer/webgl/shaders/src/Graphics.frag

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,9 @@
22

33
precision mediump float;
44

5-
uniform sampler2D uMainSampler;
6-
7-
varying vec2 outTexCoord;
8-
varying float outTintEffect;
9-
varying vec4 outTint;
10-
11-
// uniform vec2 repeat = vec2(2, 2);
5+
varying vec4 outColor;
126

137
void main()
148
{
15-
// pixel = v_colour * texture2D(t0, vec2(mod(tex_coords.x * repeat.x, 1), mod(tex_coords.y * repeat.y, 1)));
16-
17-
vec4 color = vec4(outTint.bgr * outTint.a, outTint.a);
18-
19-
gl_FragColor = color;
9+
gl_FragColor = vec4(outColor.bgr * outColor.a, outColor.a);
2010
}

src/renderer/webgl/shaders/src/Graphics.vert

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,13 @@ precision mediump float;
55
uniform mat4 uProjectionMatrix;
66

77
attribute vec2 inPosition;
8-
attribute vec2 inTexCoord;
9-
attribute float inTexId;
10-
attribute float inTintEffect;
11-
attribute vec4 inTint;
8+
attribute vec4 inColor;
129

13-
varying vec2 outTexCoord;
14-
varying float outTintEffect;
15-
varying vec4 outTint;
10+
varying vec4 outColor;
1611

1712
void main ()
1813
{
1914
gl_Position = uProjectionMatrix * vec4(inPosition, 1.0, 1.0);
2015

21-
outTexCoord = inTexCoord;
22-
outTint = inTint;
23-
outTintEffect = inTintEffect;
16+
outColor = inColor;
2417
}

0 commit comments

Comments
 (0)