A community-maintained Python framework for creating mathematical animations.
Simple animations for OpenGL geometry
Devin Neal67cb418fdef7
diff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 6d8e63ccc..8b6c43e07 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -14,7 +14,9 @@ if typing.TYPE_CHECKING:from manim.scene.scene import Scenefrom .. import logger-from ..mobject.mobject import Mobject, _AnimationBuilder+from ..mobject import mobject+from ..mobject import opengl_mobject+from ..mobject.mobject import Mobjectfrom ..utils.rate_functions import smoothfrom ..mobject.opengl_mobject import OpenGLMobject@@ -198,7 +200,9 @@ class Animation:return self.remover-def prepare_animation(anim: Union["Animation", "_AnimationBuilder"]) -> "Animation":+def prepare_animation(+ anim: Union["Animation", "mobject._AnimationBuilder"]+) -> "Animation":r"""Returns either an unchanged animation, or the animation builtfrom a passed animation factory.@@ -225,7 +229,10 @@ def prepare_animation(anim: Union["Animation", "_AnimationBuilder"]) -> "AnimatiTypeError: Object 42 cannot be converted to an animation"""- if isinstance(anim, _AnimationBuilder):+ if isinstance(anim, mobject._AnimationBuilder):+ return anim.build()++ if isinstance(anim, opengl_mobject._AnimationBuilder):return anim.build()if isinstance(anim, Animation):diff --git a/manim/animation/creation.py b/manim/animation/creation.pyindex 5b601a10f..3a2709ad2 100644--- a/manim/animation/creation.py+++ b/manim/animation/creation.py@@ -82,6 +82,7 @@ from ..animation.animation import Animationfrom ..animation.composition import Successionfrom ..mobject.mobject import Group, Mobjectfrom ..mobject.types.vectorized_mobject import VMobject+from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobjectfrom ..utils.bezier import integer_interpolatefrom ..utils.rate_functions import double_smooth, linear, smooth@@ -101,7 +102,9 @@ class ShowPartial(Animation):"""def __init__(self, mobject: VMobject, **kwargs):- if not isinstance(mobject, VMobject):+ if not isinstance(mobject, VMobject) and not isinstance(+ mobject, OpenGLVMobject+ ):raise TypeError("This Animation only works on vectorized mobjects")super().__init__(mobject, **kwargs)diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.pyindex d22e240eb..16f82f22f 100644--- a/manim/mobject/opengl_mobject.py+++ b/manim/mobject/opengl_mobject.py@@ -1617,7 +1617,7 @@ class _AnimationBuilder:return update_targetdef build(self):- from manimlib.animation.transform import _MethodAnimation+ from ..animation.transform import _MethodAnimationif self.overridden_animation:return self.overridden_animationdiff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex adfd96992..321a67502 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -54,14 +54,15 @@ class OpenGLRenderer:else:self.context.disable(moderngl.DEPTH_TEST)- def render_mobject(self, mob):+ def render_mobject(self, mobs):# shader_wrapper_list = self.get_shader_wrapper_list(mob)- shader_wrapper_list = mob.get_shader_wrapper_list()- render_group_list = map(- lambda x: self.get_render_group(self.context, x), shader_wrapper_list- )- for render_group in render_group_list:- self.render_render_group(render_group)+ for mob in mobs:+ shader_wrapper_list = mob.get_shader_wrapper_list()+ render_group_list = map(+ lambda x: self.get_render_group(self.context, x), shader_wrapper_list+ )+ for render_group in render_group_list:+ self.render_render_group(render_group)def render_render_group(self, render_group):shader_wrapper = render_group["shader_wrapper"]@@ -318,7 +319,7 @@ class OpenGLRenderer:def render(self, scene, frame_offset, moving_mobjects):def update_frame():self.frame_buffer_object.clear(*window_background_color)- self.render_mobject(scene.mobjects[0])+ self.render_mobject(scene.mobjects)self.window.swap_buffers()self.animation_elapsed_time = time.time() - self.animation_start_timediff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex aab744f3c..4fd076133 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -301,9 +301,15 @@ class Scene(Container):listList of mobject family members."""- return extract_mobject_family_members(- self.mobjects, use_z_index=self.renderer.camera.use_z_index- )+ if config["use_opengl_renderer"]:+ family_members = []+ for mob in self.mobjects:+ family_members.extend(mob.get_family())+ return family_members+ else:+ return extract_mobject_family_members(+ self.mobjects, use_z_index=self.renderer.camera.use_z_index+ )def add(self, *mobjects):"""