Przeglądaj źródła

[gltf] Use alphaMode for common materials as well as PBR.

Don McCurdy 8 lat temu
rodzic
commit
8a5673c5d9
1 zmienionych plików z 3 dodań i 9 usunięć
  1. 3 9
      examples/js/loaders/GLTF2Loader.js

+ 3 - 9
examples/js/loaders/GLTF2Loader.js

@@ -1958,14 +1958,6 @@ THREE.GLTF2Loader = ( function () {
 
 						materialParams.map = dependencies.textures[ metallicRoughness.baseColorTexture.index ];
 
-						var alphaMode = metallicRoughness.baseColorTexture.alphaMode || ALPHA_MODES.OPAQUE;
-
-						if ( alphaMode !== ALPHA_MODES.OPAQUE ) {
-
-							materialParams.transparent = true;
-
-						}
-
 					}
 
 					materialParams.metalness = metallicRoughness.metallicFactor !== undefined ? metallicRoughness.metallicFactor : 1.0;
@@ -1991,7 +1983,9 @@ THREE.GLTF2Loader = ( function () {
 
 				}
 
-				if ( materialParams.opacity !== undefined && materialParams.opacity < 1.0 ) {
+				var alphaMode = material.alphaMode || ALPHA_MODES.OPAQUE;
+
+				if ( alphaMode !== ALPHA_MODES.OPAQUE ) {
 
 					materialParams.transparent = true;