A community-maintained Python framework for creating mathematical animations.
Fix bugs in OpenGLMobject class and Fix ApplyMethod to support OpenGLMobject (#1115)
Mohammad Al-Fetyani4716331ab456
diff --git a/manim/animation/transform.py b/manim/animation/transform.pyindex 9fb99ca24..8030d97ee 100644--- a/manim/animation/transform.py+++ b/manim/animation/transform.py@@ -31,6 +31,7 @@ import numpy as npfrom ..animation.animation import Animationfrom ..constants import DEFAULT_POINTWISE_FUNCTION_RUN_TIME, DEGREES, OUTfrom ..mobject.mobject import Group, Mobject+from ..mobject.opengl_mobject import OpenGLMobjectfrom ..utils.paths import path_along_arc, straight_pathfrom ..utils.rate_functions import smooth, squish_rate_func@@ -217,7 +218,7 @@ class ApplyMethod(Transform):"Whoops, looks like you accidentally invoked ""the method you want to animate")- assert isinstance(method.__self__, Mobject)+ assert isinstance(method.__self__, (Mobject, OpenGLMobject))def create_target(self) -> Mobject:method = self.methoddiff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.pyindex 18ee1cfda..9679fc22f 100644--- a/manim/mobject/opengl_mobject.py+++ b/manim/mobject/opengl_mobject.py@@ -9,6 +9,7 @@ from ..utils.iterables import listifyimport numpy as np+from .. import configfrom ..constants import *from ..utils.color import color_gradient@@ -336,7 +337,7 @@ class OpenGLMobject:in the submobjects list."""mobject_attrs = [- x for x in list(self.__dict__.values()) if isinstance(x, Mobject)+ x for x in list(self.__dict__.values()) if isinstance(x, OpenGLMobject)]self.set_submobjects(list_update(self.submobjects, mobject_attrs))return self@@ -694,7 +695,11 @@ class OpenGLMobject:Direction just needs to be a vector pointing towards side orcorner in the 2d plane."""- target_point = np.sign(direction) * (FRAME_X_RADIUS, FRAME_Y_RADIUS, 0)+ target_point = np.sign(direction) * (+ config["frame_x_radius"],+ config["frame_y_radius"],+ 0,+ )point_to_align = self.get_bounding_box_point(direction)shift_val = target_point - point_to_align - buff * np.array(direction)shift_val = shift_val * abs(np.sign(direction))@@ -717,7 +722,7 @@ class OpenGLMobject:index_of_submobject_to_align=None,coor_mask=np.array([1, 1, 1]),):- if isinstance(mobject_or_point, Mobject):+ if isinstance(mobject_or_point, OpenGLMobject):mob = mobject_or_pointif index_of_submobject_to_align is not None:target_aligner = mob[index_of_submobject_to_align]@@ -739,7 +744,7 @@ class OpenGLMobject:return selfdef shift_onto_screen(self, **kwargs):- space_lengths = [FRAME_X_RADIUS, FRAME_Y_RADIUS]+ space_lengths = [config["frame_x_radius"], config["frame_y_radius"]]for vect in UP, DOWN, LEFT, RIGHT:dim = np.argmax(np.abs(vect))buff = kwargs.get("buff", DEFAULT_MOBJECT_TO_EDGE_BUFFER)@@ -750,13 +755,13 @@ class OpenGLMobject:return selfdef is_off_screen(self):- if self.get_left()[0] > FRAME_X_RADIUS:+ if self.get_left()[0] > config["frame_x_radius"]:return True- if self.get_right()[0] < -FRAME_X_RADIUS:+ if self.get_right()[0] < -config["frame_x_radius"]:return True- if self.get_bottom()[1] > FRAME_Y_RADIUS:+ if self.get_bottom()[1] > config["frame_y_radius"]:return True- if self.get_top()[1] < -FRAME_Y_RADIUS:+ if self.get_top()[1] < -config["frame_y_radius"]:return Truereturn False@@ -1086,7 +1091,7 @@ class OpenGLMobject:template = self.copy()template.set_submobjects([])alphas = np.linspace(0, 1, n_pieces + 1)- return Group(+ return OpenGLGroup(*[template.copy().pointwise_become_partial(self, a1, a2)for a1, a2 in zip(alphas[:-1], alphas[1:])@@ -1141,7 +1146,7 @@ class OpenGLMobject:horizontally so that it's center is directly above/belowthe center of mob2"""- if isinstance(mobject_or_point, Mobject):+ if isinstance(mobject_or_point, OpenGLMobject):point = mobject_or_point.get_bounding_box_point(direction)else:point = mobject_or_point