public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-05 16:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Polygon.round_corners

Browse source
This commit is contained in:
Grant Sanderson 2023-01-11 20:47:04 -08:00
parent ed26fdfab8
commit 1f04ba92fb
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
manimlib/mobject/geometry.py
View file

@ -19,6 +19,7 @@ from manimlib.utils.simple_functions import clip
from manimlib.utils.simple_functions import fdiv from manimlib.utils.simple_functions import fdiv
from manimlib.utils.space_ops import angle_between_vectors from manimlib.utils.space_ops import angle_between_vectors
from manimlib.utils.space_ops import angle_of_vector from manimlib.utils.space_ops import angle_of_vector
from manimlib.utils.space_ops import cross2d
from manimlib.utils.space_ops import compass_directions from manimlib.utils.space_ops import compass_directions
from manimlib.utils.space_ops import find_intersection from manimlib.utils.space_ops import find_intersection
from manimlib.utils.space_ops import get_norm from manimlib.utils.space_ops import get_norm
@ -935,20 +936,16 @@ class Polygon(VMobject):
vertices = self.get_vertices() vertices = self.get_vertices()
arcs = [] arcs = []
for v1, v2, v3 in adjacent_n_tuples(vertices, 3): for v1, v2, v3 in adjacent_n_tuples(vertices, 3):
vect1 = v2 - v1 vect1 = normalize(v2 - v1)
vect2 = v3 - v2 vect2 = normalize(v3 - v2)
unit_vect1 = normalize(vect1)
unit_vect2 = normalize(vect2)
angle = angle_between_vectors(vect1, vect2) angle = angle_between_vectors(vect1, vect2)
# Negative radius gives concave curves
angle *= np.sign(radius)
# Distance between vertex and start of the arc # Distance between vertex and start of the arc
cut_off_length = radius * np.tan(angle / 2) cut_off_length = radius * np.tan(angle / 2)
# Determines counterclockwise vs. clockwise # Negative radius gives concave curves
sign = np.sign(np.cross(vect1, vect2)[2]) sign = float(np.sign(radius * cross2d(vect1, vect2)))
arc = ArcBetweenPoints( arc = ArcBetweenPoints(
v2 - unit_vect1 * cut_off_length, v2 - vect1 * cut_off_length,
v2 + unit_vect2 * cut_off_length, v2 + vect2 * cut_off_length,
angle=sign * angle, angle=sign * angle,
n_components=2, n_components=2,
) )
@ -958,14 +955,8 @@ class Polygon(VMobject):
# To ensure that we loop through starting with last # To ensure that we loop through starting with last
arcs = [arcs[-1], *arcs[:-1]] arcs = [arcs[-1], *arcs[:-1]]
for arc1, arc2 in adjacent_pairs(arcs): for arc1, arc2 in adjacent_pairs(arcs):
self.append_points(arc1.get_points()) self.add_subpath(arc1.get_points())
line = Line(arc1.get_end(), arc2.get_start()) self.add_line_to(arc2.get_start())
# Make sure anchors are evenly distributed
len_ratio = line.get_length() / arc1.get_arc_length()
line.insert_n_curves(
int(arc1.get_num_curves() * len_ratio)
)
self.append_points(line.get_points())
return self return self