Merge branch 'experimental' of github.com:ManimCommunity/manim into experimental

This commit is contained in:
Benjamin Hackl 2023-01-03 17:26:15 +01:00
commit 5569c9f3d2
4 changed files with 13 additions and 7 deletions

View file

@ -20,9 +20,10 @@ __all__ = [
"FadeIn",
]
import numpy as np
from typing import TYPE_CHECKING
import numpy as np
from manim.mobject.opengl.opengl_mobject import OpenGLMobject
from ..animation.transform import Transform

View file

@ -2812,7 +2812,7 @@ class Point(Mobject):
location: np.ndarray = ORIGIN,
artificial_width: float = 1e-6,
artificial_height: float = 1e-6,
**kwargs
**kwargs,
):
self.artificial_width = artificial_width
self.artificial_height = artificial_height

View file

@ -17,8 +17,6 @@ from tqdm import tqdm as ProgressDisplay
from manim._config import logger as log
from manim.animation.animation import prepare_animation
from manim.camera.camera import Camera
from manim.utils.color import RED
from manim.utils.module_ops import get_module
from manim.constants import DEFAULT_WAIT_TIME
from manim.event_handler import EVENT_DISPATCHER
from manim.event_handler.event_type import EventType
@ -26,10 +24,12 @@ from manim.mobject.frame import FullScreenRectangle
from manim.mobject.mobject import Group, Mobject, Point, _AnimationBuilder
from manim.mobject.types.vectorized_mobject import VGroup, VMobject
from manim.scene.scene_file_writer import SceneFileWriter
from manim.utils.color import RED
from manim.utils.family_ops import (
extract_mobject_family_members,
recursive_mobject_remove,
)
from manim.utils.module_ops import get_module
if TYPE_CHECKING:
from typing import Callable, Iterable
@ -259,7 +259,10 @@ class Scene:
from manim.animation.fading import FadeIn
from manim.utils.rate_functions import there_and_back
self.play(FadeIn(rect, run_time=0.5, rate_func=there_and_back, remover=True))
self.play(
FadeIn(rect, run_time=0.5, rate_func=there_and_back, remover=True)
)
shell.set_custom_exc((Exception,), custom_exc)

View file

@ -37,7 +37,9 @@ def restructure_list_to_exclude_certain_family_members(mobject_list, to_remove):
return new_list
def recursive_mobject_remove(mobjects: List[Mobject], to_remove: Set[Mobject]) -> Tuple[List[Mobject], bool]:
def recursive_mobject_remove(
mobjects: List[Mobject], to_remove: Set[Mobject]
) -> Tuple[List[Mobject], bool]:
"""
Takes in a list of mobjects, together with a set of mobjects to remove.
The first component of what's removed is a new list such that any mobject
@ -60,4 +62,4 @@ def recursive_mobject_remove(mobjects: List[Mobject], to_remove: Set[Mobject]) -
found_in_list = True
else:
result.append(mob)
return result, found_in_list
return result, found_in_list