Cherry-picking 118f4859c472ccbc30b43101c6674dadc81d7b12
And resolve conflicts
This commit is contained in:
parent
ce5d242f76
commit
f100a59688
19 changed files with 674 additions and 735 deletions
19
resources/shaders/ES/gouraud_light_clip.fs
Normal file
19
resources/shaders/ES/gouraud_light_clip.fs
Normal file
|
@ -0,0 +1,19 @@
|
|||
#version 100
|
||||
|
||||
precision highp float;
|
||||
|
||||
uniform vec4 uniform_color;
|
||||
uniform float emission_factor;
|
||||
|
||||
// x = tainted, y = specular;
|
||||
varying vec2 intensity;
|
||||
|
||||
varying float clipping_planes_dot;
|
||||
|
||||
void main()
|
||||
{
|
||||
if (clipping_planes_dot < 0.0)
|
||||
discard;
|
||||
|
||||
gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue