diff options
Diffstat (limited to 'source/blender/draw/engines/overlay/shaders')
7 files changed, 7 insertions, 61 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl index 0d01f67c6ea..2989e07691f 100644 --- a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl @@ -1,4 +1,6 @@ +#pragma BLENDER_REQUIRE(common_math_lib.glsl) + uniform sampler2D colorTex; uniform sampler2D depthTex; uniform sampler2D lineTex; diff --git a/source/blender/draw/engines/overlay/shaders/armature_sphere_solid_frag.glsl b/source/blender/draw/engines/overlay/shaders/armature_sphere_solid_frag.glsl index 380708795e9..0925901a9c9 100644 --- a/source/blender/draw/engines/overlay/shaders/armature_sphere_solid_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/armature_sphere_solid_frag.glsl @@ -14,19 +14,6 @@ layout(depth_greater) out float gl_FragDepth; layout(location = 0) out vec4 fragColor; layout(location = 1) out vec4 lineOutput; -#define cameraPos ViewMatrixInverse[3].xyz - -float get_depth_from_view_z(float z) -{ - if (ProjectionMatrix[3][3] == 0.0) { - z = (-ProjectionMatrix[3][2] / z) - ProjectionMatrix[2][2]; - } - else { - z = z * ProjectionMatrix[2][2] / (1.0 - ProjectionMatrix[3][2]); - } - return z * 0.5 + 0.5; -} - void main() { const float sphere_radius = 0.05; diff --git a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl index 317e9fe0447..d0b68df0625 100644 --- a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl @@ -14,8 +14,6 @@ uniform float meshSize; uniform float lineKernel = 0.0; uniform sampler2D depthBuffer; -#define cameraPos (ViewMatrixInverse[3].xyz) - uniform int gridFlag; #define STEPS_LEN 8 diff --git a/source/blender/draw/engines/overlay/shaders/grid_vert.glsl b/source/blender/draw/engines/overlay/shaders/grid_vert.glsl index 496bb011c74..dd0e771ad93 100644 --- a/source/blender/draw/engines/overlay/shaders/grid_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/grid_vert.glsl @@ -7,8 +7,6 @@ uniform float meshSize; uniform int gridFlag; -#define cameraPos (ViewMatrixInverse[3].xyz) - #define PLANE_XY (1 << 4) #define PLANE_XZ (1 << 5) #define PLANE_YZ (1 << 6) diff --git a/source/blender/draw/engines/overlay/shaders/outline_prepass_vert.glsl b/source/blender/draw/engines/overlay/shaders/outline_prepass_vert.glsl index a2021759196..582a7c6cae2 100644 --- a/source/blender/draw/engines/overlay/shaders/outline_prepass_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/outline_prepass_vert.glsl @@ -1,7 +1,7 @@ uniform bool isTransform; -#ifndef USE_GPENCIL +#if !defined(USE_GPENCIL) && !defined(POINTCLOUD) in vec3 pos; #endif @@ -56,7 +56,11 @@ void main() # endif #else +# ifdef POINTCLOUD + vec3 world_pos = pointcloud_get_pos(); +# else vec3 world_pos = point_object_to_world(pos); +# endif gl_Position = point_world_to_ndc(world_pos); # ifdef USE_GEOM vPos = point_world_to_view(world_pos); diff --git a/source/blender/draw/engines/overlay/shaders/pointcloud_frag.glsl b/source/blender/draw/engines/overlay/shaders/pointcloud_frag.glsl deleted file mode 100644 index 36928d0c776..00000000000 --- a/source/blender/draw/engines/overlay/shaders/pointcloud_frag.glsl +++ /dev/null @@ -1,16 +0,0 @@ - -in vec4 finalColor; - -out vec4 fragColor; - -void main() -{ - float dist = length(gl_PointCoord - vec2(0.5)); - - if (dist > 0.5) { - discard; - } - /* Nice sphere falloff. */ - float intensity = sqrt(1.0 - dist * 2.0) * 0.5 + 0.5; - fragColor = finalColor * vec4(intensity, intensity, intensity, 1.0); -} diff --git a/source/blender/draw/engines/overlay/shaders/pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/pointcloud_vert.glsl deleted file mode 100644 index d71ccee5159..00000000000 --- a/source/blender/draw/engines/overlay/shaders/pointcloud_vert.glsl +++ /dev/null @@ -1,27 +0,0 @@ - -uniform vec4 color; - -/* ---- Per instance Attrs ---- */ -in vec3 pointcloud_pos; -in vec3 pointcloud_radius; - -out vec4 finalColor; - -void main() -{ - vec3 world_pos = point_object_to_world(pointcloud_pos); - - vec3 world_size = abs(mat3(ModelMatrix) * vec3(pointcloud_radius)); - float world_radius = (world_size.x + world_size.y + world_size.z) / 3.0; - - gl_Position = point_world_to_ndc(world_pos); - /* World sized points. */ - gl_PointSize = sizePixel * world_radius * ProjectionMatrix[1][1] * sizeViewport.y / - gl_Position.w; - - finalColor = color; - -#ifdef USE_WORLD_CLIP_PLANES - world_clip_planes_calc_clip_distance(world_pos); -#endif -} |