opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-30 13:34:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Just pass one bevel parameter rather than two

Browse Source
This commit is contained in:
Grant Sanderson
2023-01-08 21:56:38 -05:00
parent 0136cef1d9
commit ae2a253fb1
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manimlib/shaders/quadratic_bezier_stroke/frag.glsl
View File

@ -11,8 +11,7 @@ in float uv_anti_alias_width;
in float has_prev; in float has_prev;
in float has_next; in float has_next;
in float bevel_start; in float bevel;
in float bevel_end;
in float angle_from_prev; in float angle_from_prev;
in float angle_to_next; in float angle_to_next;
@ -33,7 +32,7 @@ float modify_distance_for_endpoints(vec2 p, float dist, float t){
// Clip the start // Clip the start
if(has_prev == 0) return max(dist, -p.x + buff); if(has_prev == 0) return max(dist, -p.x + buff);
// Bevel start // Bevel start
if(bevel_start == 1){ if(bevel == 1){
float a = angle_from_prev; float a = angle_from_prev;
mat2 rot = mat2( mat2 rot = mat2(
cos(a), sin(a), 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; float perp_dist = dot(p - uv_b2, v21) / len_v21;
if(has_next == 0) return max(dist, -perp_dist + buff); if(has_next == 0) return max(dist, -perp_dist + buff);
// Bevel end // Bevel end
if(bevel_end == 1){ if(bevel == 1){
float a = -angle_to_next; float a = -angle_to_next;
mat2 rot = mat2( mat2 rot = mat2(
cos(a), sin(a), cos(a), sin(a),

6
manimlib/shaders/quadratic_bezier_stroke/geom.glsl
View File

@ -32,8 +32,7 @@ out float uv_anti_alias_width;
out float has_prev; out float has_prev;
out float has_next; out float has_next;
out float bevel_start; out float bevel;
out float bevel_end;
out float angle_from_prev; out float angle_from_prev;
out float angle_to_next; out float angle_to_next;
@ -159,8 +158,7 @@ void find_joint_info(){
(joint_type == AUTO_JOINT && bezier_degree == 1.0) || (joint_type == AUTO_JOINT && bezier_degree == 1.0) ||
joint_type == BEVEL_JOINT joint_type == BEVEL_JOINT
); );
bevel_start = float(should_bevel); bevel = float(should_bevel);
bevel_end = float(should_bevel);
} }