A community-maintained Python framework for creating mathematical animations.
Add OpenGL support to IPython magic (#1868)
Eric Biedert748de4af7e01
diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex 56fd6c1d7..5d34fb639 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -24,7 +24,6 @@ from ..utils.space_ops import (rotation_matrix_transpose,rotation_matrix_transpose_from_quaternion,)-from .opengl_renderer_window import Windowfrom .shader import Mesh, Shaderfrom .vectorized_mobject_rendering import (render_opengl_vectorized_mobject_fill,@@ -244,12 +243,19 @@ class OpenGLRenderer:self.scene = sceneif not hasattr(self, "window"):if config["preview"]:+ from .opengl_renderer_window import Window+self.window = Window(self)self.context = self.window.ctxself.frame_buffer_object = self.context.detect_framebuffer()else:self.window = None- self.context = moderngl.create_standalone_context()+ try:+ self.context = moderngl.create_context(standalone=True)+ except Exception:+ self.context = moderngl.create_context(+ standalone=True, backend="egl"+ )self.frame_buffer_object = self.get_frame_buffer_object(self.context, 0)self.frame_buffer_object.use()self.context.enable(moderngl.BLEND)diff --git a/manim/utils/ipython_magic.py b/manim/utils/ipython_magic.pyindex e0862f0e5..73854d44f 100644--- a/manim/utils/ipython_magic.py+++ b/manim/utils/ipython_magic.py@@ -6,8 +6,9 @@ import shutilfrom datetime import datetimefrom pathlib import Path-from manim import config, tempconfig+from manim import Group, config, logger, tempconfigfrom manim.__main__ import main+from manim.renderer.shader import shader_program_cachetry:from IPython import get_ipython@@ -59,7 +60,7 @@ else:def construct(self):...- Run ``%manim -h`` and ``%manim render -h`` for possible command line interface options.+ Run ``%manim --help`` and ``%manim render --help`` for possible command line interface options... note::@@ -106,7 +107,38 @@ else:args = main(modified_args, standalone_mode=False, prog_name="manim")with tempconfig(local_ns.get("config", {})):config.digest_args(args)- exec(f"{config['scene_names'][0]}().render()", local_ns)++ renderer = None+ if config.renderer == "opengl":+ # Check if the imported mobjects extend the OpenGLMobject class+ # meaning ConvertToOpenGL did its job+ if "OpenGLMobject" in map(lambda cls: cls.__name__, Group.mro()):+ from manim.renderer.opengl_renderer import OpenGLRenderer++ renderer = OpenGLRenderer()+ else:+ logger.warning(+ "Renderer must be set to OpenGL in the configuration file "+ "before importing Manim! Using cairo renderer instead."+ )+ config.renderer = "cairo"++ SceneClass = local_ns[config["scene_names"][0]]+ scene = SceneClass(renderer)+ scene.render()++ # Shader cache becomes invalid as the context is destroyed+ shader_program_cache.clear()++ # Close OpenGL window here instead of waiting for the main thread to+ # finish causing the window to stay open and freeze+ if renderer is not None and renderer.window is not None:+ renderer.window.close()++ if config["output_file"] is None:+ logger.info("No output file produced")+ return+local_path = Path(config["output_file"]).relative_to(Path.cwd())tmpfile = (Path(config["media_dir"])