archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DRW: support clipping for all lamp types

Browse Source
This commit is contained in:
Campbell Barton
2019-01-29 19:57:35 +11:00
parent 68ae1f4958
commit 851d58b34f
11 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpu/shaders/gpu_shader_3D_groundline_geom.glsl
View File

@@ -8,9 +8,18 @@ layout(line_strip, max_vertices = 2) out;
void main()
{
vec3 vert = gl_in[0].gl_Position.xyz;
gl_Position = ViewProjectionMatrix * vec4(vert.xyz, 1.0);
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_set_clip_distance(gl_in[0].gl_ClipDistance);
#endif
EmitVertex();
gl_Position = ViewProjectionMatrix * vec4(vert.xy, 0.0, 1.0);
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(vec3(vert.xy, 0.0));
#endif
EmitVertex();
EndPrimitive();
}

7
source/blender/gpu/shaders/gpu_shader_3D_groundpoint_vert.glsl
View File

@@ -6,6 +6,11 @@ in vec3 pos;
void main()
{
gl_Position = ViewProjectionMatrix * vec4(pos.xy, 0.0, 1.0);
vec4 pos_4d = vec4(pos.xy, 0.0, 1.0);
gl_Position = ViewProjectionMatrix * pos_4d;
gl_PointSize = 2.0;
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(pos_4d.xyz);
#endif
}

10
source/blender/gpu/shaders/gpu_shader_3D_passthrough_vert.glsl
View File

@@ -1,8 +1,16 @@
#ifdef USE_WORLD_CLIP_PLANES
uniform mat4 ModelMatrix;
#endif
/* Does Nothing */
in vec3 pos;
void main()
{
gl_Position = vec4(pos, 1.0);
vec4 pos_4d = vec4(pos, 1.0);
gl_Position = pos_4d;
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance((ModelMatrix * pos_4d).xyz);
#endif
}

7
source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl
View File

@@ -18,8 +18,13 @@ void main()
{
float len = end - start;
vec3 sta = vec3(0.0, 0.0, -start);
vec4 pos_4d = vec4(pos * -len + sta, 1.0);
gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4(pos * -len + sta, 1.0);
gl_Position = ViewProjectionMatrix * InstanceModelMatrix * pos_4d;
gl_PointSize = size;
finalColor = vec4(color, 1.0);
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance((InstanceModelMatrix * pos_4d).xyz);
#endif
}

8
source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_geom.glsl
View File

@@ -28,10 +28,18 @@ flat out vec4 finalColor;
void emitLine(vec4 color)
{
gl_Position = ProjectionMatrix * MV_pos[0];
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_set_clip_distance(gl_in[0].gl_ClipDistance);
#endif
EmitVertex();
gl_Position = ProjectionMatrix * MV_pos[1];
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_set_clip_distance(gl_in[1].gl_ClipDistance);
#endif
finalColor = color;
EmitVertex();
EndPrimitive();
}

7
source/blender/gpu/shaders/gpu_shader_instance_edges_variying_color_vert.glsl
View File

@@ -37,7 +37,8 @@ void main()
mat4 ModelViewMatrix = ViewMatrix * InstanceModelMatrix;
MV_pos = ModelViewMatrix * vec4(pos, 1.0);
vec4 pos_4d = vec4(pos, 1.0);
MV_pos = ModelViewMatrix * pos_4d;
mat3 NormalMatrix = transpose(inverse(mat3(ModelViewMatrix)));
@@ -60,4 +61,8 @@ void main()
edgeClass = -1.0; // back-facing edge
fCol = color;
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance((InstanceModelMatrix * vec4(pos, 1.0)).xyz);
#endif
}