public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-11-14 14:47:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some bugs with VMobject.align_points

Browse source
This commit is contained in:
Grant Sanderson 2019-02-11 20:52:54 -08:00
parent 8877a256f2
commit 9f76063271
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
manimlib/mobject/types/vectorized_mobject.py
View file

@ -650,33 +650,36 @@ class VMobject(Mobject):
nppcc = self.n_points_per_cubic_curve
for mob in self, vmobject:
# If there are no points, add one to
# whereever the "center" is
if mob.has_no_points():
mob.start_new_path(mob.get_center())
# If there's only one point, turn it into
# a null curve
if mob.has_new_path_started():
mob.add_line_to(mob.get_last_point())
# Figure out what the subpaths are, and align
subpaths1 = self.get_subpaths()
subpaths2 = vmobject.get_subpaths()
n_subpaths = max(len(subpaths1), len(subpaths2))
# Start building new ones
new_path1 = np.zeros((0, self.dim))
new_path2 = np.zeros((0, self.dim))
n_subpaths = max(len(subpaths1), len(subpaths2))
def get_nth_subpath(path_list, n):
if n < len(path_list):
return path_list[n]
last_path = path_list[n - 1]
return [last_path[-1]] * nppcc
if n >= len(path_list):
# Create a null path at the very end
return [path_list[-1][-1]] * nppcc
return path_list[n]
for n in range(n_subpaths):
sp1 = get_nth_subpath(subpaths1, n)
sp2 = get_nth_subpath(subpaths2, n)
diff = len(sp2) - len(sp1)
if diff < 0:
sp2 = self.insert_n_curves_to_point_list(
-diff // nppcc, sp2
)
elif diff > 0:
sp1 = self.insert_n_curves_to_point_list(
diff // nppcc, sp1
)
diff1 = max(0, (len(sp2) - len(sp1)) // nppcc)
diff2 = max(0, (len(sp1) - len(sp2)) // nppcc)
sp1 = self.insert_n_curves_to_point_list(diff1, sp1)
sp2 = self.insert_n_curves_to_point_list(diff2, sp2)
new_path1 = np.append(new_path1, sp1, axis=0)
new_path2 = np.append(new_path2, sp2, axis=0)
self.set_points(new_path1)
@ -749,7 +752,9 @@ class VMobject(Mobject):
def get_point_mobject(self, center=None):
if center is None:
center = self.get_center()
return VectorizedPoint(center)
point = VectorizedPoint(center)
point.match_style(self)
return point
def interpolate_color(self, mobject1, mobject2, alpha):
attrs = [