Skip to content
Snippets Groups Projects
Commit 124c5cf4 authored by Michael Pohoreski (Ptolemy Linden)'s avatar Michael Pohoreski (Ptolemy Linden)
Browse files

SL-12472 to address SL-11406

parent 05e54ac9
No related branches found
No related tags found
No related merge requests found
...@@ -277,7 +277,7 @@ void main() ...@@ -277,7 +277,7 @@ void main()
final_color.a = max(final_color.a, emissive_brightness); final_color.a = max(final_color.a, emissive_brightness);
// Texture // Texture
// [x] Full Bright Object // [x] Full Bright (emissive_brightness > 0.0)
// Shininess (specular) // Shininess (specular)
// [X] Texture // [X] Texture
// Environment Intensity = 1 // Environment Intensity = 1
...@@ -292,11 +292,14 @@ void main() ...@@ -292,11 +292,14 @@ void main()
// We remap the environment intensity to closely simulate what non-EEP is doing. // We remap the environment intensity to closely simulate what non-EEP is doing.
// At midnight the brightness is exact. // At midnight the brightness is exact.
// At midday the brightness is very close. // At midday the brightness is very close.
#ifdef HAS_SKIN
vec4 final_normal = vec4(abnormal, env_intensity, 0.0); vec4 final_normal = vec4(abnormal, env_intensity, 0.0);
#else
float ei = env_intensity*0.5 + 0.5; #ifdef HAS_SPECULAR_MAP
vec4 final_normal = vec4(abnormal, ei, 0.0); if( emissive_brightness > 0.0)
{
float ei = env_intensity*0.5 + 0.5;
final_normal = vec4(abnormal, ei, 0.0);
}
#endif #endif
vec4 final_specular = spec; vec4 final_specular = spec;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment