fly/fgdata
1
0
Fork 0
Code Activity

WS30: Fix merge markers.

Browse source
This commit is contained in:
Stuart Buchanan 2021-11-05 20:03:51 +00:00
parent e5123eeb46
commit aaa6c3ff42
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Shaders/ws30-ALS.frag
View file

@ -119,11 +119,7 @@ void main()
vec4 mat_diffuse = texture(diffuseArray, index);
vec4 mat_specular = texture(specularArray, index);
<<<<<<< HEAD
vec4 color = mat_diffuse * (gl_Color + NdotL * gl_LightSource[0].diffuse);
=======
vec4 color = gl_Color;
>>>>>>> e7c89ffb600d1bf5cee2936b7dbff31089452745
// Testing code:
// Use rlc even when looking up textures to recreate the extra performance hit