opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-28 20:43:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanups to arrow

Browse Source
This commit is contained in:
Grant Sanderson
2020-06-29 11:04:23 -07:00
parent 0b58572f41
commit f11cb5a498
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manimlib/mobject/geometry.py
View File

@ -392,13 +392,13 @@ class Line(TipableVMobject):
CONFIG = { CONFIG = {
"buff": 0, "buff": 0,
# Angle of arc specified here # Angle of arc specified here
"path_arc": None, "path_arc": 0,
} }
def __init__(self, start=LEFT, end=RIGHT, **kwargs): def __init__(self, start=LEFT, end=RIGHT, **kwargs):
digest_config(self, kwargs) digest_config(self, kwargs)
self.set_start_and_end_attrs(start, end) self.set_start_and_end_attrs(start, end)
VMobject.__init__(self, **kwargs) super().__init__(**kwargs)
def init_points(self): def init_points(self):
self.set_points_by_ends(self.start, self.end, self.buff, self.path_arc) self.set_points_by_ends(self.start, self.end, self.buff, self.path_arc)
@ -568,21 +568,21 @@ class Arrow(Line):
"tip_width_ratio": 5, "tip_width_ratio": 5,
"tip_angle": PI / 3, "tip_angle": PI / 3,
"max_tip_length_to_length_ratio": 0.5, "max_tip_length_to_length_ratio": 0.5,
"max_width_to_length_ratio": 0.25, "max_width_to_length_ratio": 0.1,
} }
def set_points_by_ends(self, start, end, buff=0, path_arc=0): def set_points_by_ends(self, start, end, buff=0, path_arc=0):
# Find the right tip length and width # Find the right tip length and width
vect = end - start vect = end - start
length = get_norm(vect) length = max(get_norm(vect), 1e-8)
width = self.width width = self.width
w_ratio = self.max_width_to_length_ratio / (width / length) w_ratio = fdiv(self.max_width_to_length_ratio, fdiv(width, length))
if w_ratio < 1: if w_ratio < 1:
width *= w_ratio width *= w_ratio
tip_width = self.tip_width_ratio * width tip_width = self.tip_width_ratio * width
tip_length = tip_width / (2 * np.tan(self.tip_angle / 2)) tip_length = tip_width / (2 * np.tan(self.tip_angle / 2))
t_ratio = self.max_tip_length_to_length_ratio / (tip_length / length) t_ratio = fdiv(self.max_tip_length_to_length_ratio, fdiv(tip_length, length))
if t_ratio < 1: if t_ratio < 1:
tip_length *= t_ratio tip_length *= t_ratio
tip_width *= t_ratio tip_width *= t_ratio
@ -666,7 +666,7 @@ class Vector(Arrow):
def __init__(self, direction=RIGHT, **kwargs): def __init__(self, direction=RIGHT, **kwargs):
if len(direction) == 2: if len(direction) == 2:
direction = np.hstack([direction, 0]) direction = np.hstack([direction, 0])
Arrow.__init__(self, ORIGIN, direction, **kwargs) super().__init__(ORIGIN, direction, **kwargs)
class DoubleArrow(Arrow): class DoubleArrow(Arrow):