Skip to content

fix(lib): use optional instead of mutable defaults #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2023
Merged

fix(lib): use optional instead of mutable defaults #291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd1ab3e
fix(lib): use optional instead of mutable defaults
jeertmans Oct 19, 2023
fa45efa
fix: add missing check for none
jeertmans Oct 19, 2023
b8f25ef
Merge branch 'main' into optional
jeertmans Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 33 additions & 17 deletions manim_slides/slide/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

__all__ = ["Wipe", "Zoom"]

from typing import Any, Mapping, Sequence
from typing import Any, Mapping, Optional, Sequence

import numpy as np

Expand Down Expand Up @@ -62,20 +62,28 @@ def construct(self):

def __init__(
self,
current: Sequence[Mobject] = [],
future: Sequence[Mobject] = [],
current: Optional[Sequence[Mobject]] = None,
future: Optional[Sequence[Mobject]] = None,
shift: np.ndarray = LEFT,
fade_in_kwargs: Mapping[str, Any] = {},
fade_out_kwargs: Mapping[str, Any] = {},
fade_in_kwargs: Optional[Mapping[str, Any]] = None,
fade_out_kwargs: Optional[Mapping[str, Any]] = None,
**kwargs: Any,
):
animations = []

for mobject in future:
animations.append(FadeIn(mobject, shift=shift, **fade_in_kwargs))
if future:
if fade_in_kwargs is None:
fade_in_kwargs = {}

for mobject in current:
animations.append(FadeOut(mobject, shift=shift, **fade_out_kwargs))
for mobject in future:
animations.append(FadeIn(mobject, shift=shift, **fade_in_kwargs))

if current:
if fade_out_kwargs is None:
fade_out_kwargs = {}

for mobject in current:
animations.append(FadeOut(mobject, shift=shift, **fade_out_kwargs))

super().__init__(*animations, **kwargs)

Expand Down Expand Up @@ -118,12 +126,12 @@ def construct(self):

def __init__(
self,
current: Sequence[Mobject] = [],
future: Sequence[Mobject] = [],
current: Optional[Sequence[Mobject]] = None,
future: Optional[Sequence[Mobject]] = None,
scale: float = 4.0,
out: bool = False,
fade_in_kwargs: Mapping[str, Any] = {},
fade_out_kwargs: Mapping[str, Any] = {},
fade_in_kwargs: Optional[Mapping[str, Any]] = None,
fade_out_kwargs: Optional[Mapping[str, Any]] = None,
**kwargs: Any,
) -> None:
scale_in = 1.0 / scale
Expand All @@ -134,10 +142,18 @@ def __init__(

animations = []

for mobject in future:
animations.append(FadeIn(mobject, scale=scale_in, **fade_in_kwargs))
if future:
if fade_in_kwargs is None:
fade_in_kwargs = {}

for mobject in future:
animations.append(FadeIn(mobject, scale=scale_in, **fade_in_kwargs))

if current:
if fade_out_kwargs is None:
fade_out_kwargs = {}

for mobject in current:
animations.append(FadeOut(mobject, scale=scale_out, **fade_out_kwargs))
for mobject in current:
animations.append(FadeOut(mobject, scale=scale_out, **fade_out_kwargs))

super().__init__(*animations, **kwargs)