Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions manimlib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env python
import manimlib.config
import manimlib.constants
import manimlib.extract_scene
from . import config
from . import constants


def main():
args = manimlib.config.parse_cli()
config = manimlib.config.get_configuration(args)
manimlib.constants.initialize_directories(config)
manimlib.extract_scene.main(config)
args = config.parse_cli()
cfg = config.get_configuration(args)
constants.initialize_directories(cfg)
from . import extract_scene
extract_scene.main(cfg)
8 changes: 4 additions & 4 deletions manimlib/animation/animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import numpy as np

from manimlib.mobject.mobject import Mobject
from manimlib.utils.config_ops import digest_config
from manimlib.utils.rate_functions import smooth
from ..mobject.mobject import Mobject
from ..utils.config_ops import digest_config
from ..utils.rate_functions import smooth


DEFAULT_ANIMATION_RUN_TIME = 1.0
Expand Down Expand Up @@ -157,4 +157,4 @@ def set_name(self, name):
return self

def is_remover(self):
return self.remover
return self.remover
16 changes: 8 additions & 8 deletions manimlib/animation/composition.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import numpy as np

from manimlib.animation.animation import Animation
from manimlib.mobject.mobject import Group
from manimlib.utils.bezier import integer_interpolate
from manimlib.utils.bezier import interpolate
from manimlib.utils.config_ops import digest_config
from manimlib.utils.iterables import remove_list_redundancies
from manimlib.utils.rate_functions import linear
from ..animation.animation import Animation
from ..mobject.mobject import Group
from ..utils.bezier import integer_interpolate
from ..utils.bezier import interpolate
from ..utils.config_ops import digest_config
from ..utils.iterables import remove_list_redundancies
from ..utils.rate_functions import linear


DEFAULT_LAGGED_START_LAG_RATIO = 0.05
Expand Down Expand Up @@ -159,4 +159,4 @@ def __init__(self, AnimationClass, mobject, arg_creator=None, **kwargs):
AnimationClass(*args, **anim_kwargs)
for args in args_list
]
super().__init__(*animations, **kwargs)
super().__init__(*animations, **kwargs)
20 changes: 10 additions & 10 deletions manimlib/animation/creation.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from manimlib.animation.animation import Animation
from manimlib.animation.composition import Succession
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.mobject.mobject import Group
from manimlib.utils.bezier import integer_interpolate
from manimlib.utils.config_ops import digest_config
from manimlib.utils.rate_functions import linear
from manimlib.utils.rate_functions import double_smooth
from manimlib.utils.rate_functions import smooth
from ..animation.animation import Animation
from ..animation.composition import Succession
from ..mobject.types.vectorized_mobject import VMobject
from ..mobject.mobject import Group
from ..utils.bezier import integer_interpolate
from ..utils.config_ops import digest_config
from ..utils.rate_functions import linear
from ..utils.rate_functions import double_smooth
from ..utils.rate_functions import smooth

import numpy as np
import itertools as it
Expand Down Expand Up @@ -177,4 +177,4 @@ def __init__(self, text_mobject, **kwargs):
]
for word in text_mobject
])
super().__init__(*anims, **kwargs)
super().__init__(*anims, **kwargs)
16 changes: 8 additions & 8 deletions manimlib/animation/fading.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from manimlib.animation.animation import Animation
from manimlib.animation.animation import DEFAULT_ANIMATION_LAG_RATIO
from manimlib.animation.transform import Transform
from manimlib.constants import DOWN
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.utils.bezier import interpolate
from manimlib.utils.rate_functions import there_and_back
from ..animation.animation import Animation
from ..animation.animation import DEFAULT_ANIMATION_LAG_RATIO
from ..animation.transform import Transform
from ..constants import DOWN
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.bezier import interpolate
from ..utils.rate_functions import there_and_back


DEFAULT_FADE_LAG_RATIO = 0
Expand Down Expand Up @@ -156,4 +156,4 @@ class VFadeInThenOut(VFadeIn):
CONFIG = {
"rate_func": there_and_back,
"remover": True,
}
}
6 changes: 3 additions & 3 deletions manimlib/animation/growing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from manimlib.animation.transform import Transform
# from manimlib.utils.paths import counterclockwise_path
from manimlib.constants import PI
from ..animation.transform import Transform
# from ..utils.paths import counterclockwise_path
from ..constants import PI


class GrowFromPoint(Transform):
Expand Down
40 changes: 20 additions & 20 deletions manimlib/animation/indication.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import numpy as np

from manimlib.constants import *
from manimlib.animation.animation import Animation
from manimlib.animation.movement import Homotopy
from manimlib.animation.composition import AnimationGroup
from manimlib.animation.composition import Succession
from manimlib.animation.creation import ShowCreation
from manimlib.animation.creation import ShowPartial
from manimlib.animation.fading import FadeOut
from manimlib.animation.transform import Transform
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.mobject.geometry import Circle
from manimlib.mobject.geometry import Dot
from manimlib.mobject.shape_matchers import SurroundingRectangle
from manimlib.mobject.types.vectorized_mobject import VGroup
from manimlib.mobject.geometry import Line
from manimlib.utils.bezier import interpolate
from manimlib.utils.config_ops import digest_config
from manimlib.utils.rate_functions import there_and_back
from manimlib.utils.rate_functions import wiggle
from ..constants import *
from ..animation.animation import Animation
from ..animation.movement import Homotopy
from ..animation.composition import AnimationGroup
from ..animation.composition import Succession
from ..animation.creation import ShowCreation
from ..animation.creation import ShowPartial
from ..animation.fading import FadeOut
from ..animation.transform import Transform
from ..mobject.types.vectorized_mobject import VMobject
from ..mobject.geometry import Circle
from ..mobject.geometry import Dot
from ..mobject.shape_matchers import SurroundingRectangle
from ..mobject.types.vectorized_mobject import VGroup
from ..mobject.geometry import Line
from ..utils.bezier import interpolate
from ..utils.config_ops import digest_config
from ..utils.rate_functions import there_and_back
from ..utils.rate_functions import wiggle


class FocusOn(Transform):
Expand Down Expand Up @@ -275,4 +275,4 @@ class TurnInsideOut(Transform):
}

def create_target(self):
return self.mobject.copy().reverse_points()
return self.mobject.copy().reverse_points()
6 changes: 3 additions & 3 deletions manimlib/animation/movement.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from manimlib.animation.animation import Animation
from manimlib.utils.rate_functions import linear
from ..animation.animation import Animation
from ..utils.rate_functions import linear


class Homotopy(Animation):
Expand Down Expand Up @@ -75,4 +75,4 @@ def __init__(self, mobject, path, **kwargs):

def interpolate_mobject(self, alpha):
point = self.path.point_from_proportion(alpha)
self.mobject.move_to(point)
self.mobject.move_to(point)
8 changes: 4 additions & 4 deletions manimlib/animation/numbers.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import warnings

from manimlib.animation.animation import Animation
from manimlib.mobject.numbers import DecimalNumber
from manimlib.utils.bezier import interpolate
from ..animation.animation import Animation
from ..mobject.numbers import DecimalNumber
from ..utils.bezier import interpolate


class ChangingDecimal(Animation):
Expand Down Expand Up @@ -49,4 +49,4 @@ def __init__(self, decimal_mob, target_number, **kwargs):
decimal_mob,
lambda a: interpolate(start_number, target_number, a),
**kwargs
)
)
14 changes: 7 additions & 7 deletions manimlib/animation/rotation.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from manimlib.animation.animation import Animation
from manimlib.animation.transform import Transform
from manimlib.constants import OUT
from manimlib.constants import PI
from manimlib.constants import TAU
from manimlib.utils.rate_functions import linear
from ..animation.animation import Animation
from ..animation.transform import Transform
from ..constants import OUT
from ..constants import PI
from ..constants import TAU
from ..utils.rate_functions import linear


class Rotating(Animation):
Expand Down Expand Up @@ -49,4 +49,4 @@ def create_target(self):
about_point=self.about_point,
about_edge=self.about_edge,
)
return target
return target
22 changes: 11 additions & 11 deletions manimlib/animation/specialized.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import operator as op

from manimlib.animation.composition import LaggedStart
from manimlib.animation.transform import ApplyMethod
from manimlib.animation.transform import Restore
from manimlib.constants import WHITE
from manimlib.constants import BLACK
from manimlib.mobject.geometry import Circle
from manimlib.mobject.svg.drawings import Car
from manimlib.mobject.types.vectorized_mobject import VGroup
from manimlib.utils.config_ops import digest_config
from manimlib.utils.space_ops import get_norm
from ..animation.composition import LaggedStart
from ..animation.transform import ApplyMethod
from ..animation.transform import Restore
from ..constants import WHITE
from ..constants import BLACK
from ..mobject.geometry import Circle
from ..mobject.svg.drawings import Car
from ..mobject.types.vectorized_mobject import VGroup
from ..utils.config_ops import digest_config
from ..utils.space_ops import get_norm


class MoveCar(ApplyMethod):
Expand Down Expand Up @@ -81,4 +81,4 @@ def __init__(self, focal_point, **kwargs):
Restore(circle)
for circle in circles
]
super().__init__(*animations, **kwargs)
super().__init__(*animations, **kwargs)
24 changes: 12 additions & 12 deletions manimlib/animation/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

import numpy as np

from manimlib.animation.animation import Animation
from manimlib.constants import DEFAULT_POINTWISE_FUNCTION_RUN_TIME
from manimlib.constants import OUT
from manimlib.constants import DEGREES
from manimlib.mobject.mobject import Group
from manimlib.mobject.mobject import Mobject
from manimlib.utils.config_ops import digest_config
from manimlib.utils.paths import path_along_arc
from manimlib.utils.paths import straight_path
from manimlib.utils.rate_functions import smooth
from manimlib.utils.rate_functions import squish_rate_func
from ..animation.animation import Animation
from ..constants import DEFAULT_POINTWISE_FUNCTION_RUN_TIME
from ..constants import OUT
from ..constants import DEGREES
from ..mobject.mobject import Group
from ..mobject.mobject import Mobject
from ..utils.config_ops import digest_config
from ..utils.paths import path_along_arc
from ..utils.paths import straight_path
from ..utils.rate_functions import smooth
from ..utils.rate_functions import squish_rate_func


class Transform(Animation):
Expand Down Expand Up @@ -321,4 +321,4 @@ def __init__(self, start_anim, end_anim, **kwargs):
def interpolate(self, alpha):
self.start_anim.interpolate(alpha)
self.end_anim.interpolate(alpha)
Transform.interpolate(self, alpha)
Transform.interpolate(self, alpha)
4 changes: 2 additions & 2 deletions manimlib/animation/update.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import operator as op

from manimlib.animation.animation import Animation
from ..animation.animation import Animation


class UpdateFromFunc(Animation):
Expand Down Expand Up @@ -38,4 +38,4 @@ def __init__(self, mobject, tracked_mobject, **kwargs):
def interpolate_mobject(self, alpha):
target = self.tracked_mobject.get_center()
location = self.mobject.get_center()
self.mobject.shift(target - location + self.diff)
self.mobject.shift(target - location + self.diff)
30 changes: 15 additions & 15 deletions manimlib/camera/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
import cairo
import numpy as np

from manimlib.constants import *
from manimlib.mobject.types.image_mobject import AbstractImageMobject
from manimlib.mobject.mobject import Mobject
from manimlib.mobject.types.point_cloud_mobject import PMobject
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.utils.color import color_to_int_rgba
from manimlib.utils.config_ops import digest_config
from manimlib.utils.images import get_full_raster_image_path
from manimlib.utils.iterables import batch_by_property
from manimlib.utils.iterables import list_difference_update
from manimlib.utils.iterables import remove_list_redundancies
from manimlib.utils.simple_functions import fdiv
from manimlib.utils.space_ops import angle_of_vector
from manimlib.utils.space_ops import get_norm
from ..constants import *
from ..mobject.types.image_mobject import AbstractImageMobject
from ..mobject.mobject import Mobject
from ..mobject.types.point_cloud_mobject import PMobject
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.color import color_to_int_rgba
from ..utils.config_ops import digest_config
from ..utils.images import get_full_raster_image_path
from ..utils.iterables import batch_by_property
from ..utils.iterables import list_difference_update
from ..utils.iterables import remove_list_redundancies
from ..utils.simple_functions import fdiv
from ..utils.space_ops import angle_of_vector
from ..utils.space_ops import get_norm


class Camera(object):
Expand Down Expand Up @@ -709,4 +709,4 @@ def display(self, *cvmobjects):
else:
curr_array = np.maximum(curr_array, new_array)
self.reset_pixel_array()
return curr_array
return curr_array
10 changes: 5 additions & 5 deletions manimlib/camera/mapping_camera.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import numpy as np

from manimlib.camera.camera import Camera
from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.utils.config_ops import DictAsObject
from manimlib.utils.config_ops import digest_config
from ..camera.camera import Camera
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.config_ops import DictAsObject
from ..utils.config_ops import digest_config

# TODO: Add an attribute to mobjects under which they can specify that they should just
# map their centers but remain otherwise undistorted (useful for labels, etc.)
Expand Down Expand Up @@ -110,4 +110,4 @@ def __init__(self, left_camera, right_camera, **kwargs):
self,
(left_camera, (0, 0)),
(right_camera, (0, half_width)),
)
)
Loading