A community-maintained Python framework for creating mathematical animations.
Properly respect submobjects when sorting by z_index (#872)
Benjamin Hackl2c975c200b26
diff --git a/manim/mobject/svg/tex_mobject.py b/manim/mobject/svg/tex_mobject.pyindex 50b05b4ed..451cbd42d 100644--- a/manim/mobject/svg/tex_mobject.py+++ b/manim/mobject/svg/tex_mobject.py@@ -329,7 +329,7 @@ class SingleStringMathTex(SVGMobject):def path_string_to_mobject(self, path_string):# Overwrite superclass default to use# specialized path_string mobject- return TexSymbol(path_string)+ return TexSymbol(path_string, z_index=self.z_index)def organize_submobjects_left_to_right(self):self.sort(lambda p: p[0])@@ -417,6 +417,7 @@ class MathTex(SingleStringMathTex):tex_string,tex_environment=self.tex_environment,tex_template=self.tex_template,+ z_index=self.z_index,)num_submobs = len(sub_tex_mob.submobjects)new_index = curr_index + num_submobsdiff --git a/manim/utils/family.py b/manim/utils/family.pyindex 428f2c816..3c01fb52f 100644--- a/manim/utils/family.py+++ b/manim/utils/family.py@@ -28,6 +28,9 @@ def extract_mobject_family_members(method = Mobject.family_members_with_pointselse:method = Mobject.get_family+ extracted_mobjects = remove_list_redundancies(+ list(it.chain(*[method(m) for m in mobjects]))+ )if use_z_index:- mobjects = sorted(mobjects, key=lambda m: m.z_index)- return remove_list_redundancies(list(it.chain(*[method(m) for m in mobjects])))+ return sorted(extracted_mobjects, key=lambda m: m.z_index)+ return extracted_mobjectsdiff --git a/tests/control_data/graphical_units_data/geometry/ZIndexTest.npz b/tests/control_data/graphical_units_data/geometry/ZIndexTest.npznew file mode 100644index 000000000..381e43b5bBinary files /dev/null and b/tests/control_data/graphical_units_data/geometry/ZIndexTest.npz differdiff --git a/tests/test_graphical_units/test_geometry.py b/tests/test_graphical_units/test_geometry.pyindex cee3eef72..3bd59e1c8 100644--- a/tests/test_graphical_units/test_geometry.py+++ b/tests/test_graphical_units/test_geometry.py@@ -135,6 +135,21 @@ class ArrangeTest(Scene):self.wait()+class ZIndexTest(Scene):+ def construct(self):+ circle = Circle().set_fill(RED, opacity=1)+ square = Square(side_length=1.7).set_fill(BLUE, opacity=1)+ triangle = Triangle().set_fill(GREEN, opacity=1)+ square.z_index = 0+ triangle.z_index = 1+ circle.z_index = 2++ self.play(FadeIn(VGroup(circle, square, triangle)))+ self.play(ApplyMethod(circle.shift, UP))+ self.play(ApplyMethod(triangle.shift, 2 * UP))+ self.wait(1)++MODULE_NAME = "geometry"