首页 发现 帮助
登录
javascript
/
three.js
镜像自地址 https://github.com/tazdij/three.js.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Merge pull request #18631 from mrdoob/material_opaque

WebGLRenderer: Ignore map alpha in opaque materials
Mr.doob 5 年之前
父节点
7388badbb5 15947a3ac2
当前提交
a7d66b0820
共有 16 个文件被更改，包括 33 次插入 和 34 次删除
合并视图 显示文件统计
  1. 3 15
      examples/js/loaders/GLTFLoader.js
  2. 3 15
      examples/jsm/loaders/GLTFLoader.js
  3. 6 1
      examples/webgl_loader_gltf_extensions.html
  4. 2 0
      src/renderers/shaders/ShaderChunk.js
  5. 0 1
      src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js
  6. 7 0
      src/renderers/shaders/ShaderChunk/transparent_fragment.glsl.js
  7. 2 1
      src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js
  8. 1 0
      src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js
  9. 1 0
      src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js
  10. 1 0
      src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js
  11. 1 0
      src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
  12. 1 0
      src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js
  13. 1 0
      src/renderers/shaders/ShaderLib/points_frag.glsl.js
  14. 1 0
      src/renderers/shaders/ShaderLib/sprite_frag.glsl.js
  15. 1 0
      src/renderers/webgl/WebGLProgram.js
  16. 2 1
      src/renderers/webgl/WebGLPrograms.js

+ 3 - 15
examples/js/loaders/GLTFLoader.js
查看文件 

@@ -2093,27 +2093,15 @@ THREE.GLTFLoader = ( function () {
 
 
 
 		}
 
 		}
 
 
 
-		var alphaMode = materialDef.alphaMode || ALPHA_MODES.OPAQUE;
 
+		var alphaMode = materialDef.alphaMode;
 
 
 
 		if ( alphaMode === ALPHA_MODES.BLEND ) {
 
 		if ( alphaMode === ALPHA_MODES.BLEND ) {
 
 
 
 			materialParams.transparent = true;
 
 			materialParams.transparent = true;
 
 
 
-		} else {
 
-
 
-			materialParams.transparent = false;
 
-
 
-			if ( alphaMode === ALPHA_MODES.MASK ) {
 
-
 
-				materialParams.alphaTest = materialDef.alphaCutoff !== undefined ? materialDef.alphaCutoff : 0.5;
 
+		} else if ( alphaMode === ALPHA_MODES.MASK ) {
 
 
 
-			} else {
 
-
 
-				// for ALPHA_MODES.OPAQUE, we use a negative alphaTest value to enable alphaTesting,
 
-				// causing the test to always be passed, but also replacing any alpha value with 1.0.
 
-				materialParams.alphaTest = - 0.5;
 
-
 
-			}
 
+			materialParams.alphaTest = materialDef.alphaCutoff !== undefined ? materialDef.alphaCutoff : 0.5;
 
 
 
 		}
 
 		}

+ 3 - 15
examples/jsm/loaders/GLTFLoader.js
查看文件 

@@ -2156,27 +2156,15 @@ var GLTFLoader = ( function () {
 
 
 
 		}
 
 		}
 
 
 
-		var alphaMode = materialDef.alphaMode || ALPHA_MODES.OPAQUE;
 
+		var alphaMode = materialDef.alphaMode;
 
 
 
 		if ( alphaMode === ALPHA_MODES.BLEND ) {
 
 		if ( alphaMode === ALPHA_MODES.BLEND ) {
 
 
 
 			materialParams.transparent = true;
 
 			materialParams.transparent = true;
 
 
 
-		} else {
 
-
 
-			materialParams.transparent = false;
 
-
 
-			if ( alphaMode === ALPHA_MODES.MASK ) {
 
-
 
-				materialParams.alphaTest = materialDef.alphaCutoff !== undefined ? materialDef.alphaCutoff : 0.5;
 
+		} else if ( alphaMode === ALPHA_MODES.MASK ) {
 
 
 
-			} else {
 
-
 
-				// for ALPHA_MODES.OPAQUE, we use a negative alphaTest value to enable alphaTesting,
 
-				// causing the test to always be passed, but also replacing any alpha value with 1.0.
 
-				materialParams.alphaTest = - 0.5;
 
-
 
-			}
 
+			materialParams.alphaTest = materialDef.alphaCutoff !== undefined ? materialDef.alphaCutoff : 0.5;
 
 
 
 		}
 
 		}

+ 6 - 1
examples/webgl_loader_gltf_extensions.html
查看文件 

@@ -5,6 +5,11 @@
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<link type="text/css" rel="stylesheet" href="main.css">
 
 		<link type="text/css" rel="stylesheet" href="main.css">
 
+		<style>
 
+			body {
 
+				background-color: white;
 
+			}
 
+		</style>
 
 	</head>
 
 	</head>
 
 
 
 	<body>
 
 	<body>
 
@@ -14,7 +19,7 @@
 
 			<div id="description"></div>
 
 			<div id="description"></div>
 
 		</div>
 
 		</div>
 
 
 
-		<div id="container" style="background-color: white;"></div>
 
+		<div id="container"></div>
 
 
 
 		<script type="module">
 
 		<script type="module">

+ 2 - 0
src/renderers/shaders/ShaderChunk.js
查看文件 

@@ -84,6 +84,7 @@ import skinning_vertex from './ShaderChunk/skinning_vertex.glsl.js';
 
 import skinnormal_vertex from './ShaderChunk/skinnormal_vertex.glsl.js';
 
 import skinnormal_vertex from './ShaderChunk/skinnormal_vertex.glsl.js';
 
 import specularmap_fragment from './ShaderChunk/specularmap_fragment.glsl.js';
 
 import specularmap_fragment from './ShaderChunk/specularmap_fragment.glsl.js';
 
 import specularmap_pars_fragment from './ShaderChunk/specularmap_pars_fragment.glsl.js';
 
 import specularmap_pars_fragment from './ShaderChunk/specularmap_pars_fragment.glsl.js';
 
+import transparent_fragment from './ShaderChunk/transparent_fragment.glsl.js';
 
 import tonemapping_fragment from './ShaderChunk/tonemapping_fragment.glsl.js';
 
 import tonemapping_fragment from './ShaderChunk/tonemapping_fragment.glsl.js';
 
 import tonemapping_pars_fragment from './ShaderChunk/tonemapping_pars_fragment.glsl.js';
 
 import tonemapping_pars_fragment from './ShaderChunk/tonemapping_pars_fragment.glsl.js';
 
 import uv_pars_fragment from './ShaderChunk/uv_pars_fragment.glsl.js';
 
 import uv_pars_fragment from './ShaderChunk/uv_pars_fragment.glsl.js';
 
@@ -214,6 +215,7 @@ export var ShaderChunk = {
 
 	skinnormal_vertex: skinnormal_vertex,
 
 	skinnormal_vertex: skinnormal_vertex,
 
 	specularmap_fragment: specularmap_fragment,
 
 	specularmap_fragment: specularmap_fragment,
 
 	specularmap_pars_fragment: specularmap_pars_fragment,
 
 	specularmap_pars_fragment: specularmap_pars_fragment,
 
+	transparent_fragment: transparent_fragment,
 
 	tonemapping_fragment: tonemapping_fragment,
 
 	tonemapping_fragment: tonemapping_fragment,
 
 	tonemapping_pars_fragment: tonemapping_pars_fragment,
 
 	tonemapping_pars_fragment: tonemapping_pars_fragment,
 
 	uv_pars_fragment: uv_pars_fragment,
 
 	uv_pars_fragment: uv_pars_fragment,

+ 0 - 1
src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js
查看文件 

@@ -2,7 +2,6 @@ export default /* glsl */`
 
 #ifdef ALPHATEST
 
 #ifdef ALPHATEST
 
 
 
 	if ( diffuseColor.a < ALPHATEST ) discard;
 
 	if ( diffuseColor.a < ALPHATEST ) discard;
 
-	diffuseColor.a = 1.0;
 
 
 
 #endif
 
 #endif
 
 `;
 
 `;

+ 7 - 0
src/renderers/shaders/ShaderChunk/transparent_fragment.glsl.js
查看文件 

@@ -0,0 +1,7 @@
 
+export default /* glsl */`
 
+#ifndef TRANSPARENT
 
+
 
+	diffuseColor.a = 1.0;
 
+
 
+#endif
 
+`;

+ 2 - 1
src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js
查看文件 

@@ -35,13 +35,14 @@ void main() {
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <specularmap_fragment>
 
 
 
 	ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) );
 
 	ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) );
 
 
 
 	// accumulation (baked indirect lighting only)
 
 	// accumulation (baked indirect lighting only)
 
 	#ifdef USE_LIGHTMAP
 
 	#ifdef USE_LIGHTMAP
 
-	
+
 
 		vec4 lightMapTexel= texture2D( lightMap, vUv2 );
 
 		vec4 lightMapTexel= texture2D( lightMap, vUv2 );
 
 		reflectedLight.indirectDiffuse += lightMapTexelToLinear( lightMapTexel ).rgb * lightMapIntensity;
 
 		reflectedLight.indirectDiffuse += lightMapTexelToLinear( lightMapTexel ).rgb * lightMapIntensity;

+ 1 - 0
src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js
查看文件 

@@ -48,6 +48,7 @@ void main() {
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <emissivemap_fragment>
 
 	#include <emissivemap_fragment>

+ 1 - 0
src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js
查看文件 

@@ -34,6 +34,7 @@ void main() {
 
 	#include <map_fragment>
 
 	#include <map_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_maps>
 
 	#include <normal_fragment_maps>

+ 1 - 0
src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js
查看文件 

@@ -45,6 +45,7 @@ void main() {
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_maps>
 
 	#include <normal_fragment_maps>

+ 1 - 0
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
查看文件 

@@ -85,6 +85,7 @@ void main() {
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <roughnessmap_fragment>
 
 	#include <roughnessmap_fragment>
 
 	#include <metalnessmap_fragment>
 
 	#include <metalnessmap_fragment>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_begin>

+ 1 - 0
src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js
查看文件 

@@ -43,6 +43,7 @@ void main() {
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <specularmap_fragment>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_begin>
 
 	#include <normal_fragment_maps>
 
 	#include <normal_fragment_maps>

+ 1 - 0
src/renderers/shaders/ShaderLib/points_frag.glsl.js
查看文件 

@@ -20,6 +20,7 @@ void main() {
 
 	#include <map_particle_fragment>
 
 	#include <map_particle_fragment>
 
 	#include <color_fragment>
 
 	#include <color_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 
 
 	outgoingLight = diffuseColor.rgb;
 
 	outgoingLight = diffuseColor.rgb;

+ 1 - 0
src/renderers/shaders/ShaderLib/sprite_frag.glsl.js
查看文件 

@@ -21,6 +21,7 @@ void main() {
 
 	#include <map_fragment>
 
 	#include <map_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphamap_fragment>
 
 	#include <alphatest_fragment>
 
 	#include <alphatest_fragment>
 
+	#include <transparent_fragment>
 
 
 
 	outgoingLight = diffuseColor.rgb;
 
 	outgoingLight = diffuseColor.rgb;

+ 1 - 0
src/renderers/webgl/WebGLProgram.js
查看文件 

@@ -625,6 +625,7 @@ function WebGLProgram( renderer, cacheKey, parameters ) {
 
 			( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '',
 
 			( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '',
 
 
 
 			parameters.dithering ? '#define DITHERING' : '',
 
 			parameters.dithering ? '#define DITHERING' : '',
 
+			parameters.transparent ? '#define TRANSPARENT' : '',
 
 
 
 			( parameters.outputEncoding || parameters.mapEncoding || parameters.matcapEncoding || parameters.envMapEncoding || parameters.emissiveMapEncoding || parameters.lightMapEncoding ) ?
 
 			( parameters.outputEncoding || parameters.mapEncoding || parameters.matcapEncoding || parameters.envMapEncoding || parameters.emissiveMapEncoding || parameters.lightMapEncoding ) ?
 
 				ShaderChunk[ 'encodings_pars_fragment' ] : '', // this code is required here because it is used by the various encoding/decoding function defined below
 
 				ShaderChunk[ 'encodings_pars_fragment' ] : '', // this code is required here because it is used by the various encoding/decoding function defined below

+ 2 - 1
src/renderers/webgl/WebGLPrograms.js
查看文件 

@@ -49,7 +49,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 		"numDirLightShadows", "numPointLightShadows", "numSpotLightShadows",
 
 		"numDirLightShadows", "numPointLightShadows", "numSpotLightShadows",
 
 		"shadowMapEnabled", "shadowMapType", "toneMapping", 'physicallyCorrectLights',
 
 		"shadowMapEnabled", "shadowMapType", "toneMapping", 'physicallyCorrectLights',
 
 		"alphaTest", "doubleSided", "flipSided", "numClippingPlanes", "numClipIntersection", "depthPacking", "dithering",
 
 		"alphaTest", "doubleSided", "flipSided", "numClippingPlanes", "numClipIntersection", "depthPacking", "dithering",
 
-		"sheen"
 
+		"sheen", "transparent"
 
 	];
 
 	];
 
 
 
 	function getShaderObject( material, shaderID ) {
 
 	function getShaderObject( material, shaderID ) {
 
@@ -262,6 +262,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 			numClipIntersection: nClipIntersection,
 
 			numClipIntersection: nClipIntersection,
 
 
 
 			dithering: material.dithering,
 
 			dithering: material.dithering,
 
+			transparent: material.transparent,
 
 
 
 			shadowMapEnabled: renderer.shadowMap.enabled && shadows.length > 0,
 
 			shadowMapEnabled: renderer.shadowMap.enabled && shadows.length > 0,
 
 			shadowMapType: renderer.shadowMap.type,
 
 			shadowMapType: renderer.shadowMap.type,