Skip to content

Commit dba2260

Browse files
authored
Examples: Use GLSL1 in wireframe demo. (mrdoob#21402)
* Examples: Use GLSL1 in wireframe demo. * Examples: Enable extensions in wireframe demo.
1 parent 38d6dec commit dba2260

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

examples/webgl_materials_wireframe.html

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<script type="x-shader/x-vertex" id="vertexShader">
1515

16-
in vec3 center;
17-
out vec3 vCenter;
16+
attribute vec3 center;
17+
varying vec3 vCenter;
1818

1919
void main() {
2020

@@ -30,8 +30,7 @@
3030

3131
uniform float thickness;
3232

33-
in vec3 vCenter;
34-
out vec4 outColor;
33+
varying vec3 vCenter;
3534

3635
float edgeFactorTri() {
3736

@@ -47,16 +46,16 @@
4746

4847
if ( edgeFactorTri() > 0.99 ) discard;
4948

50-
outColor = gl_FrontFacing ? vec4( 0.9, 0.9, 1.0, 1.0 ) : vec4( 0.4, 0.4, 0.5, 1.0 );
49+
gl_FragColor = gl_FrontFacing ? vec4( 0.9, 0.9, 1.0, 1.0 ) : vec4( 0.4, 0.4, 0.5, 1.0 );
5150

5251
}
5352

5453
</script>
5554

5655
<script type="x-shader/x-vertex" id="vertexShaderATC">
5756

58-
in vec3 center;
59-
out vec3 vCenter;
57+
attribute vec3 center;
58+
varying vec3 vCenter;
6059

6160
void main() {
6261

@@ -72,19 +71,18 @@
7271

7372
uniform float thickness;
7473

75-
in vec3 vCenter;
76-
out vec4 outColor;
74+
varying vec3 vCenter;
7775

7876
void main() {
7977

8078
vec3 afwidth = fwidth( vCenter.xyz );
8179

8280
vec3 edge3 = smoothstep( thickness * afwidth, ( thickness + 1.0 ) * afwidth, vCenter.xyz );
83-
81+
8482
float edge = 1.0 - min( min( edge3.x, edge3.y ), edge3.z );
8583

86-
outColor.rgb = gl_FrontFacing ? vec3( 0.9, 0.9, 1.0 ) : vec3( 0.4, 0.4, 0.5 );
87-
outColor.a = edge;
84+
gl_FragColor.rgb = gl_FrontFacing ? vec3( 0.9, 0.9, 1.0 ) : vec3( 0.4, 0.4, 0.5 );
85+
gl_FragColor.a = edge;
8886

8987
}
9088

@@ -150,10 +148,10 @@
150148
uniforms: { 'thickness': { value: API.thickness } },
151149
vertexShader: document.getElementById( 'vertexShader' ).textContent,
152150
fragmentShader: document.getElementById( 'fragmentShader' ).textContent,
153-
side: THREE.DoubleSide,
154-
glslVersion: THREE.GLSL3
151+
side: THREE.DoubleSide
155152

156153
} );
154+
material2.extensions.derivatives = true;
157155

158156
mesh2 = new THREE.Mesh( geometry, material2 );
159157
mesh2.position.set( 0, 0, 0 );
@@ -168,10 +166,10 @@
168166
vertexShader: document.getElementById( 'vertexShaderATC' ).textContent,
169167
fragmentShader: document.getElementById( 'fragmentShaderATC' ).textContent,
170168
side: THREE.DoubleSide,
171-
glslVersion: THREE.GLSL3,
172169
alphaToCoverage: true // only works when WebGLRenderer's "antialias" is set to "true"
173170

174171
} );
172+
material3.extensions.derivatives = true;
175173

176174
mesh3 = new THREE.Mesh( geometry, material3 );
177175
mesh3.position.set( 60, 0, 0 );

0 commit comments

Comments
 (0)