diff --git a/big_ol_pile_of_manim_imports.py b/big_ol_pile_of_manim_imports.py index 88420935..af2f7be6 100644 --- a/big_ol_pile_of_manim_imports.py +++ b/big_ol_pile_of_manim_imports.py @@ -35,23 +35,24 @@ from continual_animation.from_animation import * from continual_animation.numbers import * from continual_animation.update import * -from mobject.mobject import * from mobject.frame import * from mobject.geometry import * +from mobject.mobject import * +from mobject.number_line import * from mobject.numbers import * from mobject.shape_matchers import * -from mobject.value_tracker import * from mobject.svg.brace import * from mobject.svg.svg_mobject import * from mobject.svg.tex_mobject import * from mobject.types.image_mobject import * from mobject.types.point_cloud_mobject import * from mobject.types.vectorized_mobject import * +from mobject.value_tracker import * +from for_3b1b_videos.common_scenes import * from for_3b1b_videos.pi_creature import * from for_3b1b_videos.pi_creature_animations import * from for_3b1b_videos.pi_creature_scene import * -from for_3b1b_videos.common_scenes import * from scene.moving_camera_scene import * from scene.reconfigurable_scene import * @@ -70,7 +71,6 @@ from once_useful_constructs.light import * from topics.functions import * from topics.graph_scene import * from topics.matrix import * -from topics.number_line import * from topics.probability import * from topics.three_dimensions import * from topics.vector_space_scene import * @@ -101,4 +101,3 @@ import sys from PIL import Image from colour import Color - diff --git a/mobject/coordinate_systems.py b/mobject/coordinate_systems.py index 0b92a04c..9a634ef8 100644 --- a/mobject/coordinate_systems.py +++ b/mobject/coordinate_systems.py @@ -6,14 +6,14 @@ from constants import * from mobject.geometry import Arrow from mobject.geometry import Line +from mobject.number_line import NumberLine from mobject.svg.tex_mobject import TexMobject from mobject.types.vectorized_mobject import VGroup from mobject.types.vectorized_mobject import VMobject from topics.functions import ParametricFunction -from topics.number_line import NumberLine from utils.config_ops import digest_config -from utils.space_ops import angle_of_vector from utils.space_ops import R3_to_complex +from utils.space_ops import angle_of_vector from utils.space_ops import complex_to_R3 #TODO: There should be much more code reuse between Axes, NumberPlane and GraphScene diff --git a/topics/number_line.py b/mobject/number_line.py similarity index 99% rename from topics/number_line.py rename to mobject/number_line.py index fc47d440..5022df21 100644 --- a/topics/number_line.py +++ b/mobject/number_line.py @@ -150,12 +150,3 @@ class UnitInterval(NumberLine): "number_at_center" : 0.5, } - - - - - - - - - diff --git a/topics/graph_scene.py b/topics/graph_scene.py index 7dbe5eca..403e96b6 100644 --- a/topics/graph_scene.py +++ b/topics/graph_scene.py @@ -3,18 +3,18 @@ from constants import * from scene.scene import Scene # from mobject.geometry import from animation.creation import ShowCreation -from animation.update import UpdateFromAlphaFunc from animation.creation import Write from animation.transform import Transform +from animation.update import UpdateFromAlphaFunc +from mobject.geometry import DashedLine +from mobject.geometry import Line +from mobject.geometry import Rectangle +from mobject.number_line import NumberLine from mobject.svg.tex_mobject import TexMobject from mobject.svg.tex_mobject import TextMobject from mobject.types.vectorized_mobject import VGroup from mobject.types.vectorized_mobject import VectorizedPoint from topics.functions import ParametricFunction -from mobject.geometry import DashedLine -from mobject.geometry import Line -from mobject.geometry import Rectangle -from topics.number_line import NumberLine from utils.bezier import interpolate from utils.color import color_gradient from utils.color import invert_color