Skip to content

Commit 15d3dfa

Browse files
authored
Material: Remove alphaWrite. (mrdoob#23361)
1 parent 2d80739 commit 15d3dfa

File tree

6 files changed

+5
-9
lines changed

6 files changed

+5
-9
lines changed

examples/js/loaders/GLTFLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2885,7 +2885,6 @@
28852885
} else {
28862886

28872887
materialParams.transparent = false;
2888-
materialParams.alphaWrite = false;
28892888

28902889
if ( alphaMode === ALPHA_MODES.MASK ) {
28912890

examples/jsm/loaders/GLTFLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3178,7 +3178,6 @@ class GLTFParser {
31783178
} else {
31793179

31803180
materialParams.transparent = false;
3181-
materialParams.alphaWrite = false;
31823181

31833182
if ( alphaMode === ALPHA_MODES.MASK ) {
31843183

src/loaders/MaterialLoader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class MaterialLoader extends Loader {
100100
if ( json.depthTest !== undefined ) material.depthTest = json.depthTest;
101101
if ( json.depthWrite !== undefined ) material.depthWrite = json.depthWrite;
102102
if ( json.colorWrite !== undefined ) material.colorWrite = json.colorWrite;
103-
if ( json.alphaWrite !== undefined ) material.alphaWrite = json.alphaWrite;
104103

105104
if ( json.stencilWrite !== undefined ) material.stencilWrite = json.stencilWrite;
106105
if ( json.stencilWriteMask !== undefined ) material.stencilWriteMask = json.stencilWriteMask;

src/materials/Material.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class Material extends EventDispatcher {
5353
this.shadowSide = null;
5454

5555
this.colorWrite = true;
56-
this.alphaWrite = true;
5756

5857
this.precision = null; // override the renderer's default precision for this material
5958

@@ -312,7 +311,6 @@ class Material extends EventDispatcher {
312311
data.depthTest = this.depthTest;
313312
data.depthWrite = this.depthWrite;
314313
data.colorWrite = this.colorWrite;
315-
data.alphaWrite = this.alphaWrite;
316314

317315
data.stencilWrite = this.stencilWrite;
318316
data.stencilWriteMask = this.stencilWriteMask;
@@ -448,7 +446,6 @@ class Material extends EventDispatcher {
448446
this.shadowSide = source.shadowSide;
449447

450448
this.colorWrite = source.colorWrite;
451-
this.alphaWrite = source.alphaWrite;
452449

453450
this.precision = source.precision;
454451

src/renderers/webgl/WebGLProgram.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
654654
( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '',
655655

656656
parameters.dithering ? '#define DITHERING' : '',
657-
parameters.alphaWrite ? '' : '#define OPAQUE',
657+
parameters.transparent ? '' : '#define OPAQUE',
658658

659659
ShaderChunk[ 'encodings_pars_fragment' ], // this code is required here because it is used by the various encoding/decoding function defined below
660660
getTexelEncodingFunction( 'linearToOutputTexel', parameters.outputEncoding ),

src/renderers/webgl/WebGLPrograms.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,10 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
176176
specularIntensityMap: !! material.specularIntensityMap,
177177
specularColorMap: !! material.specularColorMap,
178178

179+
transparent: material.transparent,
180+
179181
alphaMap: !! material.alphaMap,
180182
alphaTest: useAlphaTest,
181-
alphaWrite: material.alphaWrite || material.transparent,
182183

183184
gradientMap: !! material.gradientMap,
184185

@@ -325,7 +326,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
325326
array.push( parameters.toneMapping );
326327
array.push( parameters.numClippingPlanes );
327328
array.push( parameters.numClipIntersection );
328-
array.push( parameters.alphaWrite );
329329

330330
}
331331

@@ -447,6 +447,8 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
447447
_programLayers.enable( 21 );
448448
if ( parameters.decodeVideoTexture )
449449
_programLayers.enable( 22 );
450+
if ( parameters.transparent )
451+
_programLayers.enable( 23 );
450452

451453
array.push( _programLayers.mask );
452454

0 commit comments

Comments
 (0)