blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Fix #106929: adjust normalization of zero vector in nodelink shader #107636

Merged
Leon Schittek merged 2 commits from merotosc/blender:bugfix/missing_nodelink_segment into main 2023-05-12 20:35:30 +02:00
Conversation 3 Commits 2 Files Changed 1 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e9e68cb59 - Show all commits

12
source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
View File

@ -1,5 +1,5 @@
/**
* 2D Quadratic Bezier thick line drawing
* 2D Cubic Bezier thick line drawing
*/
#define MID_VERTEX 65
@ -84,8 +84,14 @@ void main(void)
vec2 tangent = ((P1 - P0) * one_minus_t2_3 + (P2 - P1) * 6.0 * (t - t2) + (P3 - P2) * t2_3);
/* tangent space at t */
tangent = normalize(tangent);
/* Tangent space at t. If the handle overlaps with the endpoint the vector between the two nodes
Leon Schittek commented 2023-05-05 21:12:12 +02:00
Outdated
Review
Copy Link

I think "nodes" should be "sockets".

I know this is super nitpicky but I'm not sure "endpoint" and "handle" are good word choices in this part of the code. What about this:

  /* Tangent space at t. If the inner and outer control points overlap, the tangent is invalid.
   * Use the vector between the sockets instead. */
I think "nodes" should be "sockets". I know this is super nitpicky but I'm not sure "endpoint" and "handle" are good word choices in this part of the code. What about this: ``` /* Tangent space at t. If the inner and outer control points overlap, the tangent is invalid. * Use the vector between the sockets instead. */ ```
👍 1
* is used as tangent. */
if (is_zero(tangent)) {
Leon Schittek commented 2023-05-05 21:14:28 +02:00
Outdated
Review
Copy Link

I think this is a good place to use the ternary operator:

 tangent = is_zero(tangent) ? normalize(P3 - P0) : normalize(tangent);
I think this is a good place to use the ternary operator: ``` tangent = is_zero(tangent) ? normalize(P3 - P0) : normalize(tangent); ```
Marino Toscano commented 2023-05-05 22:37:32 +02:00
Outdated
Review
Copy Link

Good idea, much more cleaner. I changed it.

Good idea, much more cleaner. I changed it.
tangent = normalize(P3 - P0);
}
else {
tangent = normalize(tangent);
}
vec2 normal = tangent.yx * vec2(-1.0, 1.0);
/* Position vertex on the curve tangent space */