Răsfoiți Sursa

WebGLPrograms; sheen and transmission checks clean up. (#25723)

mrdoob 2 ani în urmă
părinte
comite
2fd6f8c56b
1 a modificat fișierele cu 11 adăugiri și 8 ștergeri
  1. 11 8
      src/renderers/webgl/WebGLPrograms.js

+ 11 - 8
src/renderers/webgl/WebGLPrograms.js

@@ -98,8 +98,11 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 		const currentRenderTarget = renderer.getRenderTarget();
 
 		const useAlphaTest = material.alphaTest > 0;
+
 		const useClearcoat = material.clearcoat > 0;
 		const useIridescence = material.iridescence > 0;
+		const useSheen = material.sheen > 0;
+		const useTransmission = material.transmission > 0;
 
 		const parameters = {
 
@@ -149,6 +152,14 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			iridescenceMap: useIridescence && !! material.iridescenceMap,
 			iridescenceThicknessMap: useIridescence && !! material.iridescenceThicknessMap,
 
+			sheen: useSheen,
+			sheenColorMap: useSheen && !! material.sheenColorMap,
+			sheenRoughnessMap: useSheen && !! material.sheenRoughnessMap,
+
+			transmission: useTransmission,
+			transmissionMap: useTransmission && !! material.transmissionMap,
+			thicknessMap: useTransmission && !! material.thicknessMap,
+
 			displacementMap: !! material.displacementMap,
 			roughnessMap: !! material.roughnessMap,
 			metalnessMap: !! material.metalnessMap,
@@ -163,14 +174,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 
 			gradientMap: !! material.gradientMap,
 
-			sheen: material.sheen > 0,
-			sheenColorMap: !! material.sheenColorMap,
-			sheenRoughnessMap: !! material.sheenRoughnessMap,
-
-			transmission: material.transmission > 0,
-			transmissionMap: !! material.transmissionMap,
-			thicknessMap: !! material.thicknessMap,
-
 			combine: material.combine,
 
 			vertexTangents: ( !! material.normalMap && !! geometry.attributes.tangent ),