Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Allow to switch the renderer to opengl at runtime (#1899)

Benjamin Hackl49010b8e3d98
diff --git a/manim/_config/utils.py b/manim/_config/utils.py
index b5c193730..fdbc5e3f0 100644
--- a/manim/_config/utils.py
+++ b/manim/_config/utils.py
@@ -1136,6 +1136,36 @@ class ManimConfig(MutableMapping):
@renderer.setter
def renderer(self, val: str) -> None:
"""Renderer for animations."""
+ try:
+ from ..mobject.mobject import Mobject
+ from ..mobject.opengl_compatibility import ConvertToOpenGL
+ from ..mobject.opengl_mobject import OpenGLMobject
+ from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject
+ from ..mobject.types.vectorized_mobject import VMobject
+
+ for cls in ConvertToOpenGL._converted_classes:
+ if val == "opengl":
+ conversion_dict = {
+ Mobject: OpenGLMobject,
+ VMobject: OpenGLVMobject,
+ }
+ else:
+ conversion_dict = {
+ OpenGLMobject: Mobject,
+ OpenGLVMobject: VMobject,
+ }
+
+ cls.__bases__ = tuple(
+ conversion_dict.get(base, base) for base in cls.__bases__
+ )
+ except ImportError:
+ # The renderer is set during the initial import of the
+ # library for the first time. The imports above cause an
+ # ImportError due to circular imports. However, the
+ # metaclass sets stuff up correctly in this case, so we
+ # can just do nothing.
+ pass
+
self._set_from_list(
"renderer",
val,
diff --git a/manim/mobject/opengl_compatibility.py b/manim/mobject/opengl_compatibility.py
index 9cd713754..5b290fe49 100644
--- a/manim/mobject/opengl_compatibility.py
+++ b/manim/mobject/opengl_compatibility.py
@@ -15,7 +15,9 @@ class ConvertToOpenGL(ABCMeta):
spurious errors.
"""
- def __new__(cls, name, bases, namespace):
+ _converted_classes = []
+
+ def __new__(mcls, name, bases, namespace):
if config.renderer == "opengl":
# Must check class names to prevent
# cyclic importing.
@@ -28,4 +30,8 @@ class ConvertToOpenGL(ABCMeta):
base_names_to_opengl.get(base.__name__, base) for base in bases
)
- return super().__new__(cls, name, bases, namespace)
+ return super().__new__(mcls, name, bases, namespace)
+
+ def __init__(cls, name, bases, namespace):
+ super().__init__(name, bases, namespace)
+ cls._converted_classes.append(cls)
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 873543de1..b1e40c89f 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -31,6 +31,7 @@ from ..constants import *
from ..gui.gui import configure_pygui
from ..mobject.opengl_mobject import OpenGLPoint
from ..renderer.cairo_renderer import CairoRenderer
+from ..renderer.opengl_renderer import OpenGLRenderer
from ..renderer.shader import Object3D
from ..utils import opengl, space_ops
from ..utils.exceptions import EndSceneEarlyException, RerunSceneException
@@ -119,6 +120,8 @@ class Scene:
# Items associated with interaction
self.mouse_point = OpenGLPoint()
self.mouse_drag_point = OpenGLPoint()
+ if renderer is None:
+ renderer = OpenGLRenderer()
if renderer is None:
self.renderer = CairoRenderer(
diff --git a/tests/test_opengl_metaclass.py b/tests/test_opengl_metaclass.py
new file mode 100644
index 000000000..ba30338fd
--- /dev/null
+++ b/tests/test_opengl_metaclass.py
@@ -0,0 +1,18 @@
+from manim import Mobject, config, tempconfig
+from manim.mobject.opengl_compatibility import ConvertToOpenGL
+from manim.mobject.opengl_mobject import OpenGLMobject
+
+
+def test_metaclass_registry():
+ class SomeTestMobject(Mobject, metaclass=ConvertToOpenGL):
+ pass
+
+ assert SomeTestMobject in ConvertToOpenGL._converted_classes
+
+ with tempconfig({"renderer": "opengl"}):
+ assert OpenGLMobject in SomeTestMobject.__bases__
+ assert Mobject not in SomeTestMobject.__bases__
+
+ config.renderer = "cairo"
+ assert Mobject in SomeTestMobject.__bases__
+ assert OpenGLMobject not in SomeTestMobject.__bases__