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

Small fixes to make sure storing the bounding box works

Browse source
This commit is contained in:
Grant Sanderson 2021-01-14 01:38:40 -10:00
parent f90e4147b6
commit 281b38b860
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
manimlib/mobject/mobject.py
View file

@ -170,6 +170,7 @@ class Mobject(object):
sub_families = [sm.get_family() for sm in self.submobjects] sub_families = [sm.get_family() for sm in self.submobjects]
self.family = [self, *it.chain(*sub_families)] self.family = [self, *it.chain(*sub_families)]
self.refresh_has_updater_status() self.refresh_has_updater_status()
self.refresh_bounding_box()
for parent in self.parents: for parent in self.parents:
parent.assemble_family() parent.assemble_family()
return self return self
@ -215,7 +216,6 @@ class Mobject(object):
def set_submobjects(self, submobject_list): def set_submobjects(self, submobject_list):
self.remove(*self.submobjects) self.remove(*self.submobjects)
self.add(*submobject_list) self.add(*submobject_list)
self.refresh_bounding_box()
return self return self
def digest_mobject_attrs(self): def digest_mobject_attrs(self):
@ -241,12 +241,15 @@ class Mobject(object):
for key in self.data: for key in self.data:
copy_mobject.data[key] = self.data[key].copy() copy_mobject.data[key] = self.data[key].copy()
# TODO, are uniforms ever numpy arrays?
copy_mobject.uniforms = dict(self.uniforms) copy_mobject.uniforms = dict(self.uniforms)
copy_mobject.submobjects = [] copy_mobject.submobjects = []
copy_mobject.add(*[sm.copy() for sm in self.submobjects]) copy_mobject.add(*[sm.copy() for sm in self.submobjects])
copy_mobject.match_updaters(self) copy_mobject.match_updaters(self)
copy_mobject.needs_new_bounding_box = self.needs_new_bounding_box
# Make sure any mobject or numpy array attributes are copied # Make sure any mobject or numpy array attributes are copied
family = self.get_family() family = self.get_family()
for attr, value in list(self.__dict__.items()): for attr, value in list(self.__dict__.items()):
@ -360,7 +363,7 @@ class Mobject(object):
return self return self
def refresh_has_updater_status(self): def refresh_has_updater_status(self):
self.has_updaters = len(self.get_family_updaters()) > 0 self.has_updaters = any(mob.get_updaters() for mob in self.get_family())
return self return self
# Transforming operations # Transforming operations
@ -825,7 +828,15 @@ class Mobject(object):
if not self.needs_new_bounding_box: if not self.needs_new_bounding_box:
return self.data["bounding_box"] return self.data["bounding_box"]
all_points = self.get_all_points() # all_points = self.get_all_points()
all_points = np.vstack([
self.get_points(),
*(
mob.get_bounding_box()
for mob in self.get_family()[1:]
if mob.has_points()
)
])
if len(all_points) == 0: if len(all_points) == 0:
self.data["bounding_box"] = np.zeros((3, self.dim)) self.data["bounding_box"] = np.zeros((3, self.dim))
else: else: