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

Handled trickiness of removing mobjects from scenes

Browse source
This commit is contained in:
Grant Sanderson 2018-01-17 22:01:20 -08:00
parent 2ab57bda97
commit 8e747ddc14
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scene/scene.py
View file

@ -230,10 +230,11 @@ class Scene(object):
to_remove = self.camera.extract_mobject_family_members(mobjects) to_remove = self.camera.extract_mobject_family_members(mobjects)
self.mobjects = list_difference_update(self.mobjects, to_remove) self.mobjects = list_difference_update(self.mobjects, to_remove)
self.restructure_how_mobjects_containing_to_remove_are_stored(
self.mobjects, to_remove
)
self.remove_foreground_mobjects(*to_remove) self.remove_foreground_mobjects(*to_remove)
self.mobjects = self.get_restructured_mobject_list(self.mobjects, to_remove)
self.foreground_mobjects = self.get_restructured_mobject_list(
self.foreground_mobjects, to_remove
)
self.continual_animations = filter( self.continual_animations = filter(
lambda ca : ca not in continual_animations and \ lambda ca : ca not in continual_animations and \
@ -243,21 +244,25 @@ class Scene(object):
return self return self
def restructure_how_mobjects_containing_to_remove_are_stored(self, mobjects, to_remove): def get_restructured_mobject_list(self, mobjects, to_remove):
""" """
In cases where the scene contains a group, e.g. Group(m1, m2, m3), but one In cases where the scene contains a group, e.g. Group(m1, m2, m3), but one
of its submobjects is removed, e.g. scene.remove(m1), the list of mobjects of its submobjects is removed, e.g. scene.remove(m1), the list of mobjects
will be editing to contain other submobjts, but not m1, e.g. it will now will be editing to contain other submobjects, but not m1, e.g. it will now
insert m2 and m3 to where the group once was. insert m2 and m3 to where the group once was.
""" """
def should_keep(mobject): new_mobjects = []
return all([ def add_safe_mobjects_from_list(list_to_examine, set_to_remove):
submob in self.mobjects for mob in list_to_examine:
for submob in mobject.family_members_with_points() if mob in set_to_remove:
]) continue
intersect = set_to_remove.intersection(mob.submobject_family())
self.mobjects = filter(should_keep, self.mobjects) if intersect:
return self add_safe_mobjects_from_list(mob.submobjects, intersect)
else:
new_mobjects.append(mob)
add_safe_mobjects_from_list(mobjects, set(to_remove))
return new_mobjects
def add_foreground_mobjects(self, *mobjects): def add_foreground_mobjects(self, *mobjects):
self.foreground_mobjects = list_update( self.foreground_mobjects = list_update(