Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Refactored helpers.py into a folder of various util files, take 2

Grant Sanderson9560b0b07785
diff --git a/animation/compositions.py b/animation/compositions.py
index 559f13f64..8b26b566a 100644
--- a/animation/compositions.py
+++ b/animation/compositions.py
@@ -7,7 +7,7 @@ import warnings
from mobject.mobject import Mobject, Group
from mobject.vectorized_mobject import VMobject
from mobject.tex_mobject import TextMobject
-from animation import Animation
+from .animation import Animation
from transform import Transform
from utils.bezier import inverse_interpolate
from utils.config_ops import digest_config
diff --git a/animation/playground.py b/animation/playground.py
index 7116fb817..f876ba5d2 100644
--- a/animation/playground.py
+++ b/animation/playground.py
@@ -1,9 +1,10 @@
import numpy as np
import operator as op
-from animation import Animation
+from .animation import Animation
from transform import Transform
-from mobject.mobject import Mobject1D, Mobject
+from mobject.mobject import Mobject
+from mobject.point_cloud_mobject import Mobject1D
from topics.geometry import Line
from utils.paths import path_along_arc
diff --git a/animation/simple_animations.py b/animation/simple_animations.py
index fd242e183..61f9ad0c4 100644
--- a/animation/simple_animations.py
+++ b/animation/simple_animations.py
@@ -7,7 +7,7 @@ import warnings
from mobject.mobject import Mobject, Group
from mobject.vectorized_mobject import VMobject
from mobject.tex_mobject import TextMobject
-from animation import Animation
+from .animation import Animation
from transform import Transform
from utils.bezier import interpolate
from utils.config_ops import digest_config
diff --git a/animation/transform.py b/animation/transform.py
index 9094f6f7b..89d299c8b 100644
--- a/animation/transform.py
+++ b/animation/transform.py
@@ -6,8 +6,9 @@ import warnings
from constants import *
-from animation import Animation
-from mobject.mobject import Mobject, Point, VMobject, Group
+from .animation import Animation
+from mobject.mobject import Mobject, Group
+from mobject.vectorized_mobject import VMobject, VectorizedPoint
from topics.geometry import Dot, Circle
from utils.config_ops import digest_config
from utils.iterables import adjacent_pairs
@@ -112,7 +113,7 @@ class GrowFromPoint(Transform):
def __init__(self, mobject, point, **kwargs):
digest_config(self, kwargs)
target = mobject.copy()
- point_mob = Point(point)
+ point_mob = VectorizedPoint(point)
if self.point_color:
point_mob.set_color(self.point_color)
mobject.replace(point_mob)
diff --git a/big_ol_pile_of_manim_imports.py b/big_ol_pile_of_manim_imports.py
index 5a57bbfc2..bd0a9c1bd 100644
--- a/big_ol_pile_of_manim_imports.py
+++ b/big_ol_pile_of_manim_imports.py
@@ -63,7 +63,6 @@ from utils.color import *
from utils.config_ops import *
from utils.images import *
from utils.iterables import *
-from utils.linear_algebra import *
from utils.paths import *
from utils.rate_functions import *
from utils.simple_functions import *
diff --git a/extract_scene.py b/extract_scene.py
index 7a492872e..5f82c8854 100644
--- a/extract_scene.py
+++ b/extract_scene.py
@@ -14,7 +14,7 @@ import subprocess as sp
from constants import *
from scene.scene import Scene
from camera.camera import Camera
-from utils.sound import play_error_sound, play_finish_sound
+from utils.sounds import play_error_sound, play_finish_sound
HELP_MESSAGE = """
Usage:
diff --git a/mobject/__init__.py b/mobject/__init__.py
index 3b2d4a245..e69de29bb 100644
--- a/mobject/__init__.py
+++ b/mobject/__init__.py
@@ -1,5 +0,0 @@
-__all__ = [
- "mobject",
- "image_mobject",
- "tex_mobject",
-]
diff --git a/mobject/image_mobject.py b/mobject/image_mobject.py
index b85339070..4c7daeb4c 100644
--- a/mobject/image_mobject.py
+++ b/mobject/image_mobject.py
@@ -5,7 +5,7 @@ from PIL import Image
from random import random
from constants import *
-from mobject.mobject import Mobject
+from .mobject import Mobject
from point_cloud_mobject import PMobject
from utils.bezier import interpolate
from utils.color import color_to_int_rgb
diff --git a/mobject/mobject.py b/mobject/mobject.py
index 5a9f28a84..167319501 100644
--- a/mobject/mobject.py
+++ b/mobject/mobject.py
@@ -1,5 +1,6 @@
import numpy as np
import operator as op
+import itertools as it
import os
import copy
from PIL import Image
diff --git a/mobject/point_cloud_mobject.py b/mobject/point_cloud_mobject.py
index 5c649f29c..5380b8f1d 100644
--- a/mobject/point_cloud_mobject.py
+++ b/mobject/point_cloud_mobject.py
@@ -1,7 +1,7 @@
from constants import *
-from mobject.mobject import Mobject
+from .mobject import Mobject
from utils.bezier import interpolate
-from utils.color import color_to_rgb, color_to_rgba, rgba_to_color,
+from utils.color import color_to_rgb, color_to_rgba, rgba_to_color
from utils.color import color_gradient
from utils.color import interpolate_color
from utils.config_ops import digest_config
diff --git a/mobject/svg_mobject.py b/mobject/svg_mobject.py
index faf986b95..c1ee7b8dc 100644
--- a/mobject/svg_mobject.py
+++ b/mobject/svg_mobject.py
@@ -1,4 +1,6 @@
from xml.dom import minidom
+import itertools as it
+import re
import warnings
from constants import *
diff --git a/mobject/tex_mobject.py b/mobject/tex_mobject.py
index bb632e484..cf4056973 100644
--- a/mobject/tex_mobject.py
+++ b/mobject/tex_mobject.py
@@ -7,6 +7,7 @@ from utils.config_ops import digest_config
import collections
import sys
+import operator as op
TEX_MOB_SCALE_FACTOR = 0.05
diff --git a/mobject/vectorized_mobject.py b/mobject/vectorized_mobject.py
index 98bfcf899..44d058f92 100644
--- a/mobject/vectorized_mobject.py
+++ b/mobject/vectorized_mobject.py
@@ -1,8 +1,9 @@
import re
+from colour import Color
from constants import *
-from mobject.mobject import Mobject
-from utils.bezier import bezier, partial_bezier_points,
+from .mobject import Mobject
+from utils.bezier import bezier, partial_bezier_points
from utils.bezier import interpolate, get_smooth_handle_points, is_closed
from utils.color import color_to_rgb
from utils.color import interpolate_color
diff --git a/old_projects/uncertainty.py b/old_projects/uncertainty.py
index c61b6e223..2c69cd3f9 100644
--- a/old_projects/uncertainty.py
+++ b/old_projects/uncertainty.py
@@ -2,7 +2,7 @@
import scipy
from big_ol_pile_of_manim_imports import *
-
+from old_projects.fourier import *
FREQUENCY_COLOR = RED
USE_ALMOST_FOURIER_BY_DEFAULT = False
diff --git a/scene/moving_camera_scene.py b/scene/moving_camera_scene.py
index a9e7a2b30..d3e13776f 100644
--- a/scene/moving_camera_scene.py
+++ b/scene/moving_camera_scene.py
@@ -1,7 +1,7 @@
from constants import *
-from camera import MovingCamera
-from scene.scene import Scene
+from camera.camera import MovingCamera
+from .scene import Scene
from topics.geometry import ScreenRectangle
class MovingCameraScene(Scene):
diff --git a/scene/reconfigurable_scene.py b/scene/reconfigurable_scene.py
index 000ecbd4b..a747e5b8b 100644
--- a/scene/reconfigurable_scene.py
+++ b/scene/reconfigurable_scene.py
@@ -1,6 +1,6 @@
import numpy as np
-from scene.scene import Scene
+from .scene import Scene
from animation.transform import Transform
from mobject.mobject import Mobject
diff --git a/scene/scene.py b/scene/scene.py
index 6645dddea..601265eb0 100644
--- a/scene/scene.py
+++ b/scene/scene.py
@@ -10,13 +10,15 @@ import copy
from tqdm import tqdm as ProgressDisplay
import inspect
import subprocess as sp
+import random
from constants import *
from camera.camera import Camera
from tk_scene import TkSceneRoot
-from mobject.mobject import Mobject, VMobject
-from animation import Animation
+from mobject.mobject import Mobject
+from mobject.vectorized_mobject import VMobject
+from animation.animation import Animation
from animation.transform import MoveToTarget
from animation.continual_animation import ContinualAnimation
from utils.iterables import list_update
diff --git a/scene/scene_from_video.py b/scene/scene_from_video.py
index b9f11dbc7..9eff530a8 100644
--- a/scene/scene_from_video.py
+++ b/scene/scene_from_video.py
@@ -3,7 +3,7 @@ import cv2
import itertools as it
from tqdm import tqdm as show_progress
-from scene.scene import Scene
+from .scene import Scene
class SceneFromVideo(Scene):
diff --git a/scene/zoomed_scene.py b/scene/zoomed_scene.py
index 32077dad5..974e330f2 100644
--- a/scene/zoomed_scene.py
+++ b/scene/zoomed_scene.py
@@ -1,10 +1,11 @@
import numpy as np
-from scene.scene import Scene
+from .scene import Scene
from animation.transform import FadeIn
from mobject.mobject import Mobject
from topics.geometry import Rectangle
-from camera import MovingCamera, Camera
+from camera.camera import Camera
+from camera.camera import MovingCamera
from constants import *
diff --git a/topics/arithmetic.py b/topics/arithmetic.py
index 409ab7e22..6656621ea 100644
--- a/topics/arithmetic.py
+++ b/topics/arithmetic.py
@@ -3,7 +3,7 @@ import itertools as it
from constants import *
from scene.scene import Scene
-from animation import Animation
+from animation.animation import Animation
from mobject.tex_mobject import TexMobject
class RearrangeEquation(Scene):
diff --git a/topics/characters.py b/topics/characters.py
index 99cd3ccd8..bca6b509d 100644
--- a/topics/characters.py
+++ b/topics/characters.py
@@ -1,6 +1,10 @@
+import random
+import numpy as np
+import itertools as it
+
from constants import *
-from mobject.mobject import Mobject
+from mobject.mobject import Mobject, Group
from mobject.svg_mobject import SVGMobject
from mobject.vectorized_mobject import VMobject, VGroup
from mobject.tex_mobject import TextMobject, TexMobject
@@ -8,8 +12,9 @@ from mobject.tex_mobject import TextMobject, TexMobject
from topics.objects import Bubble, ThoughtBubble, SpeechBubble
from topics.geometry import ScreenRectangle
-from animation import Animation
-from animation.transform import *
+from animation.animation import Animation
+from animation.transform import Transform, ApplyMethod, MoveToTarget
+from animation.transform import ReplacementTransform, FadeOut, FadeIn
from animation.simple_animations import Write, ShowCreation
from animation.compositions import AnimationGroup
from scene.scene import Scene
diff --git a/topics/common_scenes.py b/topics/common_scenes.py
index c8c979c0c..b72b75e97 100644
--- a/topics/common_scenes.py
+++ b/topics/common_scenes.py
@@ -2,7 +2,7 @@
from constants import *
from scene.scene import Scene
-from animation import Animation
+from animation.animation import Animation
from animation.simple_animations import Write, DrawBorderThenFill
from animation.compositions import LaggedStart
from animation.transform import FadeIn, FadeOut, ApplyMethod
diff --git a/topics/complex_numbers.py b/topics/complex_numbers.py
index d6b4443d6..3f026703e 100644
--- a/topics/complex_numbers.py
+++ b/topics/complex_numbers.py
@@ -1,10 +1,10 @@
from constants import *
-from mobject import VGroup
+from mobject.vectorized_mobject import VGroup
from mobject.tex_mobject import TexMobject, TextMobject
from number_line import NumberPlane
-from animation import Animation
+from animation.animation import Animation
from animation.transform import ApplyPointwiseFunction, MoveToTarget
from animation.simple_animations import Homotopy, ShowCreation, \
SmoothedVectorizedHomotopy
diff --git a/topics/geometry.py b/topics/geometry.py
index 018fd7c6e..fe98bb11e 100644
--- a/topics/geometry.py
+++ b/topics/geometry.py
@@ -1,5 +1,8 @@
from constants import *
+import itertools as it
+import numpy as np
+
from mobject.mobject import Mobject
from mobject.vectorized_mobject import VMobject, VGroup
from utils.bezier import interpolate
diff --git a/topics/number_line.py b/topics/number_line.py
index da99fe1bd..3a67ef859 100644
--- a/topics/number_line.py
+++ b/topics/number_line.py
@@ -1,6 +1,5 @@
from constants import *
-from mobject.mobject import Mobject1D
from mobject.vectorized_mobject import VMobject, VGroup
from mobject.tex_mobject import TexMobject
from topics.geometry import Line, Arrow
diff --git a/topics/numerals.py b/topics/numerals.py
index 174108ebf..f91cda5c1 100644
--- a/topics/numerals.py
+++ b/topics/numerals.py
@@ -1,7 +1,7 @@
from mobject.vectorized_mobject import VMobject, VGroup, VectorizedPoint
from mobject.tex_mobject import TexMobject
-from animation import Animation
+from animation.animation import Animation
from animation.continual_animation import ContinualAnimation
from topics.geometry import BackgroundRectangle
from scene.scene import Scene
diff --git a/topics/objects.py b/topics/objects.py
index 1e7a2b74e..f46f11e41 100644
--- a/topics/objects.py
+++ b/topics/objects.py
@@ -5,7 +5,7 @@ from mobject.vectorized_mobject import VGroup, VMobject, VectorizedPoint
from mobject.svg_mobject import SVGMobject
from mobject.tex_mobject import TextMobject, TexMobject, Brace
-from animation import Animation
+from animation.animation import Animation
from animation.simple_animations import Rotating
from animation.compositions import LaggedStart, AnimationGroup
from animation.transform import ApplyMethod, FadeIn, GrowFromCenter
diff --git a/topics/vector_space_scene.py b/topics/vector_space_scene.py
index d0ad238a0..081575e2b 100644
--- a/topics/vector_space_scene.py
+++ b/topics/vector_space_scene.py
@@ -4,7 +4,7 @@ from scene.scene import Scene
from mobject.mobject import Mobject
from mobject.vectorized_mobject import VMobject, VGroup
from mobject.tex_mobject import TexMobject, TextMobject
-from animation import Animation
+from animation.animation import Animation
from animation.transform import ApplyPointwiseFunction, Transform, \
ApplyMethod, FadeOut, ApplyFunction
from animation.simple_animations import ShowCreation, Write
diff --git a/utils/bezier.py b/utils/bezier.py
index 18844740a..9bbecab8c 100644
--- a/utils/bezier.py
+++ b/utils/bezier.py
@@ -2,7 +2,7 @@ import numpy as np
from scipy import linalg
from utils.simple_functions import choose
-CLOSED_THRESHOLD = 0.01
+CLOSED_THRESHOLD = 0.0
def bezier(points):
n = len(points) - 1
@@ -123,4 +123,4 @@ def diag_to_matrix(l_and_u, diag):
return matrix
def is_closed(points):
- return np.linalg.norm(points[0] - points[-1]) < CLOSED_THRESHOLDp
\ No newline at end of file
+ return np.linalg.norm(points[0] - points[-1]) < CLOSED_THRESHOLD
\ No newline at end of file
diff --git a/utils/color.py b/utils/color.py
index 1275ca189..183c36f06 100644
--- a/utils/color.py
+++ b/utils/color.py
@@ -1,5 +1,5 @@
from colour import Color
-from numpy import np
+import numpy as np
import random
from utils.bezier import interpolate
diff --git a/utils/paths.py b/utils/paths.py
index 126c06b35..bf542c46d 100644
--- a/utils/paths.py
+++ b/utils/paths.py
@@ -1,7 +1,9 @@
import numpy as np
from utils.bezier import interpolate
from utils.space_ops import rotation_matrix
+from constants import OUT
+STRAIGHT_PATH_THRESHOLD = 0.01
def straight_path(start_points, end_points, alpha):
"""
diff --git a/utils/rate_functions.py b/utils/rate_functions.py
index fbd9ee3c8..bce06815b 100644
--- a/utils/rate_functions.py
+++ b/utils/rate_functions.py
@@ -1,5 +1,6 @@
import numpy as np
from utils.simple_functions import sigmoid
+from utils.bezier import bezier
def smooth(t, inflection = 10.0):
error = sigmoid(-inflection / 2)