From ae2a253fb11928f91a7f84893d869c8103d09101 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Sun, 8 Jan 2023 21:56:38 -0500 Subject: [PATCH] Just pass one bevel parameter rather than two --- manimlib/shaders/quadratic_bezier_stroke/frag.glsl | 7 +++---- manimlib/shaders/quadratic_bezier_stroke/geom.glsl | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/manimlib/shaders/quadratic_bezier_stroke/frag.glsl b/manimlib/shaders/quadratic_bezier_stroke/frag.glsl index bd7c281f..f795a487 100644 --- a/manimlib/shaders/quadratic_bezier_stroke/frag.glsl +++ b/manimlib/shaders/quadratic_bezier_stroke/frag.glsl @@ -11,8 +11,7 @@ in float uv_anti_alias_width; in float has_prev; in float has_next; -in float bevel_start; -in float bevel_end; +in float bevel; in float angle_from_prev; in float angle_to_next; @@ -33,7 +32,7 @@ float modify_distance_for_endpoints(vec2 p, float dist, float t){ // Clip the start if(has_prev == 0) return max(dist, -p.x + buff); // Bevel start - if(bevel_start == 1){ + if(bevel == 1){ float a = angle_from_prev; mat2 rot = mat2( cos(a), sin(a), @@ -60,7 +59,7 @@ float modify_distance_for_endpoints(vec2 p, float dist, float t){ float perp_dist = dot(p - uv_b2, v21) / len_v21; if(has_next == 0) return max(dist, -perp_dist + buff); // Bevel end - if(bevel_end == 1){ + if(bevel == 1){ float a = -angle_to_next; mat2 rot = mat2( cos(a), sin(a), diff --git a/manimlib/shaders/quadratic_bezier_stroke/geom.glsl b/manimlib/shaders/quadratic_bezier_stroke/geom.glsl index afeb92e8..5e4bdf3c 100644 --- a/manimlib/shaders/quadratic_bezier_stroke/geom.glsl +++ b/manimlib/shaders/quadratic_bezier_stroke/geom.glsl @@ -32,8 +32,7 @@ out float uv_anti_alias_width; out float has_prev; out float has_next; -out float bevel_start; -out float bevel_end; +out float bevel; out float angle_from_prev; out float angle_to_next; @@ -159,8 +158,7 @@ void find_joint_info(){ (joint_type == AUTO_JOINT && bezier_degree == 1.0) || joint_type == BEVEL_JOINT ); - bevel_start = float(should_bevel); - bevel_end = float(should_bevel); + bevel = float(should_bevel); }