Explorar el Código

Merge pull request #46205 from clayjohn/GLES3-multi-light

Multiply vertex lit DirectionalLights by albedo in GLES3
Rémi Verschelde hace 4 años
padre
commit
be8b7571c8
Se han modificado 1 ficheros con 5 adiciones y 4 borrados
  1. 5 4
      drivers/gles3/shaders/scene.glsl

+ 5 - 4
drivers/gles3/shaders/scene.glsl

@@ -2159,12 +2159,13 @@ FRAGMENT_SHADER_CODE
 
 #endif //#USE_LIGHT_DIRECTIONAL
 
-#ifdef USE_FORWARD_LIGHTING
-
 #ifdef USE_VERTEX_LIGHTING
-
 	diffuse_light *= albedo;
-#else
+#endif
+
+#ifdef USE_FORWARD_LIGHTING
+
+#ifndef USE_VERTEX_LIGHTING
 
 	for (int i = 0; i < omni_light_count; i++) {
 		light_process_omni(omni_light_indices[i], vertex, eye_vec, normal, binormal, tangent, albedo, transmission, roughness, metallic, specular, rim, rim_tint, clearcoat, clearcoat_gloss, anisotropy, specular_blob_intensity, diffuse_light, specular_light, alpha);