Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Moved topics/functions.py to mobject/, and moved topics/graph_scene.py to scene

Grant Sandersonb37f21234950
diff --git a/big_ol_pile_of_manim_imports.py b/big_ol_pile_of_manim_imports.py
index af2f7be60..5c7a0f75d 100644
--- a/big_ol_pile_of_manim_imports.py
+++ b/big_ol_pile_of_manim_imports.py
@@ -36,6 +36,7 @@ from continual_animation.numbers import *
from continual_animation.update import *
from mobject.frame import *
+from mobject.functions import *
from mobject.geometry import *
from mobject.mobject import *
from mobject.number_line import *
@@ -54,6 +55,7 @@ from for_3b1b_videos.pi_creature import *
from for_3b1b_videos.pi_creature_animations import *
from for_3b1b_videos.pi_creature_scene import *
+from scene.graph_scene import *
from scene.moving_camera_scene import *
from scene.reconfigurable_scene import *
from scene.scene import *
@@ -68,8 +70,6 @@ from once_useful_constructs.fractals import *
from once_useful_constructs.graph_theory import *
from once_useful_constructs.light import *
-from topics.functions import *
-from topics.graph_scene import *
from topics.matrix import *
from topics.probability import *
from topics.three_dimensions import *
diff --git a/mobject/coordinate_systems.py b/mobject/coordinate_systems.py
index 9a634ef81..ece9e3d45 100644
--- a/mobject/coordinate_systems.py
+++ b/mobject/coordinate_systems.py
@@ -4,13 +4,13 @@ import numpy as np
from constants import *
+from mobject.functions import ParametricFunction
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 utils.config_ops import digest_config
from utils.space_ops import R3_to_complex
from utils.space_ops import angle_of_vector
diff --git a/topics/functions.py b/mobject/functions.py
similarity index 97%
rename from topics/functions.py
rename to mobject/functions.py
index ddf94bf59..0d421e665 100644
--- a/topics/functions.py
+++ b/mobject/functions.py
@@ -1,9 +1,10 @@
-from scipy import integrate
+from __future__ import absolute_import
+
+from constants import *
from mobject.types.vectorized_mobject import VMobject
from utils.config_ops import digest_config
-from constants import *
class ParametricFunction(VMobject):
CONFIG = {
diff --git a/topics/graph_scene.py b/scene/graph_scene.py
similarity index 98%
rename from topics/graph_scene.py
rename to scene/graph_scene.py
index 403e96b6e..e7fe94f83 100644
--- a/topics/graph_scene.py
+++ b/scene/graph_scene.py
@@ -1,12 +1,12 @@
+from __future__ import absolute_import
+
from constants import *
from scene.scene import Scene
-# from mobject.geometry import
-from animation.creation import ShowCreation
from animation.creation import Write
from animation.transform import Transform
from animation.update import UpdateFromAlphaFunc
-from mobject.geometry import DashedLine
+from mobject.functions import ParametricFunction
from mobject.geometry import Line
from mobject.geometry import Rectangle
from mobject.number_line import NumberLine
@@ -14,7 +14,6 @@ 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 utils.bezier import interpolate
from utils.color import color_gradient
from utils.color import invert_color