Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Move Scene.freeze_background() and Camera.extract_mobject_family_members()

Devin Nealb1f8f6bab09d
diff --git a/manim/camera/camera.py b/manim/camera/camera.py
index ef2aa55ea..e2aa8948e 100644
--- a/manim/camera/camera.py
+++ b/manim/camera/camera.py
@@ -28,6 +28,7 @@ from ..utils.iterables import remove_list_redundancies
from ..utils.simple_functions import fdiv
from ..utils.space_ops import angle_of_vector
from ..utils.space_ops import get_norm
+from ..utils.family import extract_mobject_family_members
class Camera(object):
@@ -363,33 +364,6 @@ class Camera(object):
####
- # TODO, it's weird that this is part of camera.
- # Clearly it should live elsewhere.
- def extract_mobject_family_members(self, mobjects, only_those_with_points=False):
- """Returns a list of the types of mobjects and
- their family members present.
-
- Parameters
- ----------
- mobjects : Mobject
- The Mobjects currently in the Scene
- only_those_with_points : bool, optional
- Whether or not to only do this for
- those mobjects that have points. By default False
-
- Returns
- -------
- list
- list of the mobjects and family members.
- """
- if only_those_with_points:
- method = Mobject.family_members_with_points
- else:
- method = Mobject.get_family
- if self.use_z_index:
- mobjects = sorted(mobjects, key=lambda m: m.z_index)
- return remove_list_redundancies(list(it.chain(*[method(m) for m in mobjects])))
-
def get_mobjects_to_display(
self, mobjects, include_submobjects=True, excluded_mobjects=None
):
@@ -411,11 +385,13 @@ class Camera(object):
list of mobjects
"""
if include_submobjects:
- mobjects = self.extract_mobject_family_members(
- mobjects, only_those_with_points=True
+ mobjects = extract_mobject_family_members(
+ mobjects, use_z_index=self.use_z_index, only_those_with_points=True
)
if excluded_mobjects:
- all_excluded = self.extract_mobject_family_members(excluded_mobjects)
+ all_excluded = extract_mobject_family_members(
+ excluded_mobjects, use_z_index=self.use_z_index
+ )
mobjects = list_difference_update(mobjects, all_excluded)
return mobjects
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 6f4733ff2..cf612d848 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -23,6 +23,7 @@ from ..mobject.mobject import Mobject
from ..scene.scene_file_writer import SceneFileWriter
from ..utils.iterables import list_update
from ..utils.hashing import get_hash_from_play_call, get_hash_from_wait_call
+from ..utils.family import extract_mobject_family_members
from ..renderer.cairo_renderer import CairoRenderer
@@ -168,11 +169,6 @@ class Scene(Container):
"""
return [getattr(self, key) for key in keys]
- def freeze_background(self):
- self.renderer.update_frame()
- self.camera = Camera(self.renderer.get_frame())
- self.clear()
-
###
def update_mobjects(self, dt):
@@ -248,7 +244,9 @@ class Scene(Container):
list
List of mobject family members.
"""
- return self.camera.extract_mobject_family_members(self.mobjects)
+ return extract_mobject_family_members(
+ self.mobjects, use_z_index=self.renderer.camera.use_z_index
+ )
def add(self, *mobjects):
"""
@@ -337,7 +335,9 @@ class Scene(Container):
The Scene mobject with restructured Mobjects.
"""
if extract_families:
- to_remove = self.camera.extract_mobject_family_members(to_remove)
+ to_remove = extract_mobject_family_members(
+ to_remove, use_z_index=self.renderer.camera.use_z_index
+ )
_list = getattr(self, mobject_list_name)
new_list = self.get_restructured_mobject_list(_list, to_remove)
setattr(self, mobject_list_name, new_list)
diff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.py
index 5d0f18720..c7b02491b 100644
--- a/manim/scene/vector_space_scene.py
+++ b/manim/scene/vector_space_scene.py
@@ -109,7 +109,10 @@ class VectorScene(Scene):
axes.set_color(WHITE)
axes.fade(axes_dimness)
self.add(axes)
- self.freeze_background()
+
+ self.renderer.update_frame()
+ self.renderer.camera = Camera(self.renderer.get_frame())
+ self.clear()
def get_vector(self, numerical_vector, **kwargs):
"""
diff --git a/manim/utils/family.py b/manim/utils/family.py
new file mode 100644
index 000000000..b7f8498b9
--- /dev/null
+++ b/manim/utils/family.py
@@ -0,0 +1,32 @@
+import itertools as it
+
+from ..mobject.mobject import Mobject
+from ..utils.iterables import remove_list_redundancies
+
+
+def extract_mobject_family_members(
+ mobjects, use_z_index=False, only_those_with_points=False
+):
+ """Returns a list of the types of mobjects and
+ their family members present.
+
+ Parameters
+ ----------
+ mobjects : Mobject
+ The Mobjects currently in the Scene
+ only_those_with_points : bool, optional
+ Whether or not to only do this for
+ those mobjects that have points. By default False
+
+ Returns
+ -------
+ list
+ list of the mobjects and family members.
+ """
+ if only_those_with_points:
+ method = Mobject.family_members_with_points
+ else:
+ method = Mobject.get_family
+ if use_z_index:
+ mobjects = sorted(mobjects, key=lambda m: m.z_index)
+ return remove_list_redundancies(list(it.chain(*[method(m) for m in mobjects])))