A community-maintained Python framework for creating mathematical animations.
Add OpenGL to isinstance (#1586)
Mohammad Al-Fetyanid87833238d0d
diff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex d58320edb..43867651d 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -149,9 +149,7 @@ class Animation:def _typecheck_input(self, mobject: Union[Mobject, None]) -> None:if mobject is None:logger.debug("Animation with empty mobject")- elif not isinstance(mobject, Mobject) and not isinstance(- mobject, OpenGLMobject- ):+ elif not isinstance(mobject, (Mobject, OpenGLMobject)):raise TypeError("Animation only works on Mobjects")def __str__(self) -> str:diff --git a/manim/animation/fading.py b/manim/animation/fading.pyindex 2a4b99f15..f57f3df39 100644--- a/manim/animation/fading.py+++ b/manim/animation/fading.py@@ -30,6 +30,8 @@ from typing import Callable, Optional, Unionimport numpy as np+from manim.mobject.opengl_mobject import OpenGLMobject+from ..animation.transform import Transformfrom ..constants import DOWN, ORIGINfrom ..mobject.mobject import Group, Mobject@@ -74,7 +76,7 @@ class _Fade(Transform):self.point_target = Falseif shift is None:if target_position is not None:- if isinstance(target_position, Mobject):+ if isinstance(target_position, (Mobject, OpenGLMobject)):target_position = target_position.get_center()shift = target_position - mobject.get_center()self.point_target = Truediff --git a/manim/animation/transform.py b/manim/animation/transform.pyindex 6fb9680b8..00d85b1e0 100644--- a/manim/animation/transform.py+++ b/manim/animation/transform.py@@ -308,9 +308,8 @@ class ApplyFunction(Transform):super().__init__(mobject, **kwargs)def create_target(self) -> Any:- assert isinstance(self.mobject, Mobject)target = self.function(self.mobject.copy())- if not isinstance(target, Mobject):+ if not isinstance(target, (Mobject, OpenGLMobject)):raise TypeError("Functions passed to ApplyFunction must return object of type Mobject")diff --git a/manim/mobject/geometry.py b/manim/mobject/geometry.pyindex 4ccfded4d..669ecbd19 100644--- a/manim/mobject/geometry.py+++ b/manim/mobject/geometry.py@@ -68,6 +68,8 @@ from typing import Iterable, Optional, Sequenceimport numpy as npfrom colour import Color+from manim.mobject.opengl_mobject import OpenGLMobject+from .. import config, loggerfrom ..constants import *from ..mobject.mobject import Mobject@@ -850,7 +852,7 @@ class Line(TipableVMobject):self.end = self.pointify(end, -vect)def pointify(self, mob_or_point, direction=None):- if isinstance(mob_or_point, Mobject):+ if isinstance(mob_or_point, (Mobject, OpenGLMobject)):mob = mob_or_pointif direction is None:return mob.get_center()diff --git a/manim/mobject/graph.py b/manim/mobject/graph.pyindex c3b60beb3..7dba2f236 100644--- a/manim/mobject/graph.py+++ b/manim/mobject/graph.py@@ -10,6 +10,8 @@ from typing import Hashable, List, Optional, Tuple, Type, Unionimport networkx as nximport numpy as np+from manim.mobject.opengl_mobject import OpenGLMobject+from ..animation.composition import AnimationGroupfrom ..animation.creation import Create, Uncreatefrom ..utils.color import BLACK@@ -512,7 +514,7 @@ class Graph(VMobject, metaclass=ConvertToOpenGL):self._graph.add_node(vertex)self._layout[vertex] = position- if isinstance(label, Mobject):+ if isinstance(label, (Mobject, OpenGLMobject)):self._labels[vertex] = labelelif label is True:self._labels[vertex] = MathTex(vertex, fill_color=label_fill_color)diff --git a/manim/mobject/probability.py b/manim/mobject/probability.pyindex e3322dfeb..6917df650 100644--- a/manim/mobject/probability.py+++ b/manim/mobject/probability.py@@ -6,6 +6,7 @@ __all__ = ["SampleSpace", "BarChart"]from ..constants import *from ..mobject.geometry import Line, Rectanglefrom ..mobject.mobject import Mobject+from ..mobject.opengl_mobject import OpenGLMobjectfrom ..mobject.svg.brace import Bracefrom ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroup@@ -102,7 +103,7 @@ class SampleSpace(Rectangle):braces = VGroup()for label, part in zip(labels, parts):brace = Brace(part, direction, min_num_quads=min_num_quads, buff=buff)- if isinstance(label, Mobject):+ if isinstance(label, (Mobject, OpenGLMobject)):label_mob = labelelse:label_mob = MathTex(label)diff --git a/manim/mobject/three_dimensions.py b/manim/mobject/three_dimensions.pyindex d00f3cc6a..4c7227ca4 100644--- a/manim/mobject/three_dimensions.py+++ b/manim/mobject/three_dimensions.py@@ -19,6 +19,7 @@ import numpy as npfrom ..constants import *from ..mobject.geometry import Circle, Squarefrom ..mobject.mobject import *+from ..mobject.opengl_mobject import OpenGLMobjectfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.color import *from ..utils.iterables import tuplify@@ -566,7 +567,7 @@ class Line3D(Cylinder):self.shift((self.start + self.end) / 2)def pointify(self, mob_or_point, direction=None):- if isinstance(mob_or_point, Mobject):+ if isinstance(mob_or_point, (Mobject, OpenGLMobject)):mob = mob_or_pointif direction is None:return mob.get_center()diff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex c041743f0..d226c043a 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -21,6 +21,7 @@ from ..mobject.coordinate_systems import Axes, NumberPlanefrom ..mobject.geometry import Arrow, Dot, Line, Rectangle, Vectorfrom ..mobject.matrix import Matrixfrom ..mobject.mobject import Mobject+from ..mobject.opengl_mobject import OpenGLMobjectfrom ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..scene.scene import Scene@@ -884,7 +885,7 @@ class LinearTransformationScene(VectorScene):LinearTransformationSceneThe scene with the title added to it."""- if not isinstance(title, Mobject):+ if not isinstance(title, (Mobject, OpenGLMobject)):title = Tex(title).scale(scale_factor)title.to_edge(UP)title.add_background_rectangle()