Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

OpenGL compatibility via metaclass: graph (#1512)

Benjamin Hackle95aaa8e77b6
diff --git a/manim/mobject/graph.py b/manim/mobject/graph.py
index c1f13103a..1c0c4c4e9 100644
--- a/manim/mobject/graph.py
+++ b/manim/mobject/graph.py
@@ -16,7 +16,7 @@ from ..utils.color import BLACK
from .geometry import Dot, LabeledDot, Line
from .mobject import Group, Mobject, override_animate
from .svg.tex_mobject import MathTex
-from .types.vectorized_mobject import VMobject
+from .types.vectorized_mobject import MetaVMobject
def _determine_graph_layout(
@@ -152,7 +152,7 @@ def _tree_layout(
}
-class Graph(VMobject):
+class Graph(metaclass=MetaVMobject):
"""An undirected graph (that is, a collection of vertices connected with edges).
Graphs can be instantiated by passing both a list of (distinct, hashable)
@@ -663,7 +663,7 @@ class Graph(VMobject):
to_remove.append(self.vertices.pop(vertex))
self.remove(*to_remove)
- return Group(*to_remove)
+ return self.get_group_class()(*to_remove)
def remove_vertices(self, *vertices):
"""Remove several vertices from the graph.
@@ -680,9 +680,7 @@ class Graph(VMobject):
>>> G = Graph([1, 2, 3], [(1, 2), (2, 3)])
>>> removed = G.remove_vertices(2, 3); removed
- Group
- >>> removed.submobjects
- [Line, Line, Dot, Dot]
+ VGroup(Line, Line, Dot, Dot)
>>> G
Graph on 1 vertices and 0 edges
@@ -690,7 +688,7 @@ class Graph(VMobject):
mobjects = []
for v in vertices:
mobjects.extend(self._remove_vertex(v).submobjects)
- return Group(*mobjects)
+ return self.get_group_class()(*mobjects)
@override_animate(remove_vertices)
def _remove_vertices_animation(self, *vertices, anim_args=None):
@@ -751,7 +749,7 @@ class Graph(VMobject):
self.add(edge_mobject)
added_mobjects.append(edge_mobject)
- return Group(*added_mobjects)
+ return self.get_group_class()(*added_mobjects)
def add_edges(
self,
@@ -802,7 +800,7 @@ class Graph(VMobject):
],
[],
)
- return Group(*added_mobjects)
+ return self.get_group_class()(*added_mobjects)
@override_animate(add_edges)
def _add_edges_animation(self, *args, anim_args=None, **kwargs):
@@ -857,7 +855,7 @@ class Graph(VMobject):
"""
edge_mobjects = [self._remove_edge(edge) for edge in edges]
- return Group(*edge_mobjects)
+ return self.get_group_class()(*edge_mobjects)
@override_animate(remove_edges)
def _remove_edges_animation(self, *edges, anim_args=None):