diff --git a/manimlib/__init__.py b/manimlib/__init__.py index 1688de0a..2043738c 100644 --- a/manimlib/__init__.py +++ b/manimlib/__init__.py @@ -4,6 +4,8 @@ __version__ = pkg_resources.get_distribution("manimgl").version from manimlib.constants import * +from manimlib.window import * + from manimlib.animation.animation import * from manimlib.animation.composition import * from manimlib.animation.creation import * @@ -50,8 +52,8 @@ from manimlib.mobject.types.vectorized_mobject import * from manimlib.mobject.value_tracker import * from manimlib.mobject.vector_field import * -from manimlib.scene.scene import * from manimlib.scene.interactive_scene import * +from manimlib.scene.scene import * from manimlib.scene.three_d_scene import * from manimlib.utils.bezier import * @@ -68,5 +70,3 @@ from manimlib.utils.rate_functions import * from manimlib.utils.simple_functions import * from manimlib.utils.sounds import * from manimlib.utils.space_ops import * - -from manimlib.window import * diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py index 9dffc83c..3b628970 100644 --- a/manimlib/mobject/mobject.py +++ b/manimlib/mobject/mobject.py @@ -1,12 +1,12 @@ from __future__ import annotations import copy -import sys -import random -import itertools as it from functools import wraps -import pickle +import itertools as it import os +import pickle +import random +import sys import moderngl import numbers @@ -1224,7 +1224,7 @@ class Mobject(object): bb = self.get_bounding_box() return np.array([ [bb[indices[-i + 1]][i] for i in range(3)] - for indices in it.product(*3 * [[0, 2]]) + for indices in it.product([0, 2], repeat=3) ]) def get_center(self) -> np.ndarray: diff --git a/manimlib/mobject/three_dimensions.py b/manimlib/mobject/three_dimensions.py index a42aa7ba..3a1a8010 100644 --- a/manimlib/mobject/three_dimensions.py +++ b/manimlib/mobject/three_dimensions.py @@ -2,6 +2,8 @@ from __future__ import annotations import math +import numpy as np + from manimlib.constants import BLUE, BLUE_D, BLUE_E from manimlib.constants import IN, ORIGIN, OUT, RIGHT from manimlib.constants import PI, TAU diff --git a/manimlib/scene/interactive_scene.py b/manimlib/scene/interactive_scene.py index d1cc6d1f..82b06c82 100644 --- a/manimlib/scene/interactive_scene.py +++ b/manimlib/scene/interactive_scene.py @@ -1,29 +1,29 @@ -import numpy as np import itertools as it -import pyperclip +import numpy as np import os import platform +import pyperclip from manimlib.animation.fading import FadeIn -from manimlib.constants import MANIM_COLORS, WHITE, YELLOW -from manimlib.constants import ORIGIN, UP, DOWN, LEFT, RIGHT, DL, UL, UR, DR +from manimlib.constants import ARROW_SYMBOLS, DELETE_SYMBOL, SHIFT_SYMBOL +from manimlib.constants import COMMAND_MODIFIER, SHIFT_MODIFIER +from manimlib.constants import DL, DOWN, DR, LEFT, ORIGIN, RIGHT, UL, UP, UR from manimlib.constants import FRAME_WIDTH, SMALL_BUFF -from manimlib.constants import SHIFT_SYMBOL, DELETE_SYMBOL, ARROW_SYMBOLS -from manimlib.constants import SHIFT_MODIFIER, COMMAND_MODIFIER -from manimlib.mobject.mobject import Mobject +from manimlib.constants import MANIM_COLORS, WHITE, YELLOW +from manimlib.logger import log from manimlib.mobject.geometry import Rectangle from manimlib.mobject.geometry import Square from manimlib.mobject.mobject import Group +from manimlib.mobject.mobject import Mobject from manimlib.mobject.svg.tex_mobject import Tex from manimlib.mobject.svg.text_mobject import Text -from manimlib.mobject.types.vectorized_mobject import VMobject -from manimlib.mobject.types.vectorized_mobject import VGroup from manimlib.mobject.types.dot_cloud import DotCloud +from manimlib.mobject.types.vectorized_mobject import VGroup +from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.scene.scene import Scene -from manimlib.utils.tex_file_writing import LatexError from manimlib.utils.family_ops import extract_mobject_family_members from manimlib.utils.space_ops import get_norm -from manimlib.logger import log +from manimlib.utils.tex_file_writing import LatexError SELECT_KEY = 's' diff --git a/manimlib/scene/scene.py b/manimlib/scene/scene.py index ec3b097d..6b86de14 100644 --- a/manimlib/scene/scene.py +++ b/manimlib/scene/scene.py @@ -3,12 +3,10 @@ from __future__ import annotations from functools import wraps import inspect import itertools as it +import os import platform import random import time -import platform -from functools import wraps -import os import numpy as np from tqdm import tqdm as ProgressDisplay @@ -18,16 +16,16 @@ from manimlib.animation.transform import MoveToTarget from manimlib.camera.camera import Camera from manimlib.config import get_custom_config from manimlib.constants import ARROW_SYMBOLS -from manimlib.constants import SHIFT_MODIFIER, CTRL_MODIFIER, COMMAND_MODIFIER from manimlib.constants import DEFAULT_WAIT_TIME +from manimlib.constants import COMMAND_MODIFIER, CTRL_MODIFIER, SHIFT_MODIFIER from manimlib.event_handler import EVENT_DISPATCHER from manimlib.event_handler.event_type import EventType from manimlib.logger import log +from manimlib.mobject.mobject import Group from manimlib.mobject.mobject import Mobject from manimlib.mobject.mobject import Point -from manimlib.mobject.mobject import Group -from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.mobject.types.vectorized_mobject import VGroup +from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.scene.scene_file_writer import SceneFileWriter from manimlib.utils.config_ops import digest_config from manimlib.utils.family_ops import extract_mobject_family_members diff --git a/requirements.txt b/requirements.txt index a5225a8b..5c6ae599 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,23 @@ colour -numpy -Pillow -scipy -sympy -tqdm +ipython +isosurfaces +manimpango>=0.4.0.post0,<0.5.0 mapbox-earcut matplotlib moderngl moderngl_window -skia-pathops +numpy +Pillow pydub pygments +PyOpenGL pyperclip pyyaml rich +scipy screeninfo -validators -ipython -PyOpenGL -manimpango>=0.4.0.post0,<0.5.0 -isosurfaces +skia-pathops svgelements +sympy +tqdm +validators diff --git a/setup.cfg b/setup.cfg index 934f051c..82c033f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,27 +30,28 @@ packages = find: include_package_data = True install_requires = colour - numpy - Pillow - scipy - sympy - tqdm + ipython + isosurfaces + manimpango>=0.4.0.post0,<0.5.0 mapbox-earcut matplotlib moderngl moderngl_window - skia-pathops + numpy + Pillow pydub pygments + PyOpenGL + pyperclip pyyaml rich + scipy screeninfo - validators - ipython - PyOpenGL - manimpango>=0.4.0.post0,<0.5.0 - isosurfaces + skia-pathops svgelements + sympy + tqdm + validators [options.entry_points] console_scripts =