Etusivu Tutki Apua
Kirjaudu sisään
javascript
/
three.js
peilaus alkaen https://github.com/tazdij/three.js.git
2
0
Fork 0
Tiedostot Ongelmat 0 Wiki
Selaa lähdekoodia

GLTFLoader: Simplified alphaMode handling.

Mr.doob 5 vuotta sitten
vanhempi
84c16ed8e1
commit
15947a3ac2
3 muutettua tiedostoa jossa 12 lisäystä ja 31 poistoa
Yhdistetty näkymä Näytä diff tilastot
  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

+ 3 - 15
examples/js/loaders/GLTFLoader.js
Näytä tiedosto 

@@ -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
Näytä tiedosto 

@@ -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
Näytä tiedosto 

@@ -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">