Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fixed using :class:`Animation`s without a child :class:`~.Mobject` in :class:`~.AnimationGroup` (#1193)

Abel Aebker1b198fe521ad
diff --git a/manim/animation/animation.py b/manim/animation/animation.py
index aeb16335a..a92e4fb47 100644
--- a/manim/animation/animation.py
+++ b/manim/animation/animation.py
@@ -196,6 +196,9 @@ class Animation:
def is_remover(self) -> bool:
return self.remover
+ def is_dummy(self) -> bool:
+ return self.mobject is None
+
def prepare_animation(
anim: Union["Animation", "mobject._AnimationBuilder"]
diff --git a/manim/animation/composition.py b/manim/animation/composition.py
index 1cffe3149..bfa357a1b 100644
--- a/manim/animation/composition.py
+++ b/manim/animation/composition.py
@@ -33,7 +33,9 @@ class AnimationGroup(Animation):
self.group = group
if self.group is None:
self.group = Group(
- *remove_list_redundancies([anim.mobject for anim in animations])
+ *remove_list_redundancies(
+ [anim.mobject for anim in self.animations if not anim.is_dummy()]
+ )
)
super().__init__(self.group, rate_func=rate_func, lag_ratio=lag_ratio, **kwargs)
self.run_time = run_time
diff --git a/tests/test_composition.py b/tests/test_composition.py
index 4b61f1175..0e6e7781e 100644
--- a/tests/test_composition.py
+++ b/tests/test_composition.py
@@ -1,4 +1,4 @@
-from manim.animation.animation import Animation
+from manim.animation.animation import Animation, Wait
from manim.animation.composition import AnimationGroup, Succession
from manim.animation.fading import FadeIn, FadeInFrom, FadeOutAndShift
from manim.constants import DOWN
@@ -85,3 +85,15 @@ def test_animationbuilder_in_group():
assert all(isinstance(anim, Animation) for anim in animation_group.animations)
succession = Succession(sqr.animate.shift(DOWN).scale(2), FadeIn(circ))
assert all(isinstance(anim, Animation) for anim in succession.animations)
+
+
+def test_animationgroup_with_wait():
+ sqr = Square()
+ sqr_anim = FadeIn(sqr)
+ wait = Wait()
+ animation_group = AnimationGroup(wait, sqr_anim, lag_ratio=1)
+
+ animation_group.begin()
+ timings = animation_group.anims_with_timings
+
+ assert timings == [(wait, 0.0, 1.0), (sqr_anim, 1.0, 2.0)]