[Bf-blender-cvs] [73e4c6e1f39] temp-T95933-object-mode-curve-selection: Try to push radius.

Jeroen Bakker noreply at git.blender.org
Tue Jun 28 15:35:04 CEST 2022


Commit: 73e4c6e1f391cf325246831e519944e7ad72fcd9
Author: Jeroen Bakker
Date:   Tue Jun 28 15:34:34 2022 +0200
Branches: temp-T95933-object-mode-curve-selection
https://developer.blender.org/rB73e4c6e1f391cf325246831e519944e7ad72fcd9

Try to push radius.

===================================================================

M	source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl

===================================================================

diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
index 04f69fe82cd..179b89dd5c3 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
@@ -45,20 +45,22 @@ void main()
 
   vec4 pos_ndc = point_world_to_ndc(world_pos);
 
+#if 1
   if (hairThicknessRes > 1) {
     vec3 orig_pos;
     orig_pos = world_pos + binor * -thick_time;
     vec4 orig_pos_ndc = point_world_to_ndc(orig_pos);
+    vec3 pos_view = point_world_to_view(world_pos);
     vec3 orig_pos_view = point_world_to_view(orig_pos);
-    gl_Position.xyz = orig_pos_view;
-    return;
-    vec4 d = pos_ndc - orig_pos_ndc;
+    vec3 d = pos_view - orig_pos_view;
     float distance = length(d.xy);
-    /*if (distance < 0.01) {
-      distance = 0.01;
-    }*/
-    pos_ndc = orig_pos_ndc + d * distance;
+    if (distance < 0.0001) {
+      distance = 0.0001;
+    }
+    pos_view = orig_pos_view + distance * normalize(d);
+    pos_ndc = point_view_to_ndc(pos_view);
   }
+#endif
 
   gl_Position = pos_ndc;



More information about the Bf-blender-cvs mailing list