Skip to content

Commit 2fa75e6

Browse files
committed
WebGLPrograms: Don't use flat shading with enabled wireframe.
1 parent 4948a07 commit 2fa75e6

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

docs/scenes/material-browser.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
const folder = gui.addFolder( 'THREE.MeshBasicMaterial' );
371371

372372
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
373-
folder.add( material, 'wireframe' );
373+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
374374
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
375375
folder.add( material, 'fog' ).onChange( needsUpdate( material, geometry ) );
376376

@@ -391,7 +391,7 @@
391391

392392
const folder = gui.addFolder( 'THREE.MeshDepthMaterial' );
393393

394-
folder.add( material, 'wireframe' );
394+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
395395

396396
folder.add( data, 'alphaMap', alphaMapKeys ).onChange( updateTexture( material, 'alphaMap', alphaMaps ) );
397397

@@ -402,7 +402,7 @@
402402
const folder = gui.addFolder( 'THREE.MeshNormalMaterial' );
403403

404404
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
405-
folder.add( material, 'wireframe' );
405+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
406406

407407
}
408408

@@ -438,7 +438,7 @@
438438
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
439439
folder.addColor( data, 'emissive' ).onChange( handleColorChange( material.emissive ) );
440440

441-
folder.add( material, 'wireframe' );
441+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
442442
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
443443
folder.add( material, 'fog' ).onChange( needsUpdate( material, geometry ) );
444444

@@ -488,7 +488,7 @@
488488

489489
folder.add( material, 'shininess', 0, 100 );
490490
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
491-
folder.add( material, 'wireframe' );
491+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
492492
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
493493
folder.add( material, 'fog' ).onChange( needsUpdate( material, geometry ) );
494494
folder.add( data, 'envMaps', envMapKeys ).onChange( updateTexture( material, 'envMap', envMaps ) );
@@ -538,7 +538,7 @@
538538
folder.add( material, 'roughness', 0, 1 );
539539
folder.add( material, 'metalness', 0, 1 );
540540
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
541-
folder.add( material, 'wireframe' );
541+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
542542
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
543543
folder.add( material, 'fog' ).onChange( needsUpdate( material, geometry ) );
544544
folder.add( data, 'envMaps', envMapKeysPBR ).onChange( updateTexture( material, 'envMap', envMaps ) );
@@ -580,10 +580,10 @@
580580
folder.addColor( data, 'sheenColor' ).onChange( handleColorChange( material.sheenColor ) );
581581
folder.add( material, 'clearcoat', 0, 1 ).step( 0.01 );
582582
folder.add( material, 'clearcoatRoughness', 0, 1 ).step( 0.01 );
583-
folder.add( material, 'specularIntensity', 0, 1);
583+
folder.add( material, 'specularIntensity', 0, 1 );
584584
folder.addColor( data, 'specularColor' ).onChange( handleColorChange( material.specularColor ) );
585585
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
586-
folder.add( material, 'wireframe' );
586+
folder.add( material, 'wireframe' ).onChange( needsUpdate( material, geometry ) );
587587
folder.add( material, 'vertexColors' ).onChange( needsUpdate( material, geometry ) );
588588
folder.add( material, 'fog' ).onChange( needsUpdate( material, geometry ) );
589589
folder.add( data, 'envMaps', envMapKeysPBR ).onChange( updateTexture( material, 'envMap', envMaps ) );

src/renderers/webgl/WebGLPrograms.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
302302
useFog: material.fog === true,
303303
fogExp2: ( !! fog && fog.isFogExp2 ),
304304

305-
flatShading: material.flatShading === true,
305+
flatShading: ( material.flatShading === true && material.wireframe === false ),
306306

307307
sizeAttenuation: material.sizeAttenuation === true,
308308
logarithmicDepthBuffer: logarithmicDepthBuffer,

0 commit comments

Comments
 (0)