Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Merge remote-tracking branch 'community/master' into relative-imports

Devin Neal1b81013fa29b
diff --cc manimlib/imports.py
index e33f89e22,92dddbe54..8da089fcf
--- a/manimlib/imports.py
+++ b/manimlib/imports.py
@@@ -14,81 -14,76 +14,76 @@@ as a convenience for scripts creating s
"""
-from manimlib.constants import *
+from .constants import *
-from manimlib.animation.animation import *
-from manimlib.animation.composition import *
-from manimlib.animation.creation import *
-from manimlib.animation.fading import *
-from manimlib.animation.growing import *
-from manimlib.animation.indication import *
-from manimlib.animation.movement import *
-from manimlib.animation.numbers import *
-from manimlib.animation.rotation import *
-from manimlib.animation.specialized import *
-from manimlib.animation.transform import *
-from manimlib.animation.update import *
+from .animation.animation import *
+from .animation.composition import *
+from .animation.creation import *
+from .animation.fading import *
+from .animation.growing import *
+from .animation.indication import *
+from .animation.movement import *
+from .animation.numbers import *
+from .animation.rotation import *
+from .animation.specialized import *
+from .animation.transform import *
+from .animation.update import *
-from manimlib.camera.camera import *
-from manimlib.camera.mapping_camera import *
-from manimlib.camera.moving_camera import *
-from manimlib.camera.three_d_camera import *
+from .camera.camera import *
+from .camera.mapping_camera import *
+from .camera.moving_camera import *
+from .camera.three_d_camera import *
-from manimlib.mobject.coordinate_systems import *
-from manimlib.mobject.changing import *
-from manimlib.mobject.frame import *
-from manimlib.mobject.functions import *
-from manimlib.mobject.geometry import *
-from manimlib.mobject.matrix import *
-from manimlib.mobject.mobject import *
-from manimlib.mobject.number_line import *
-from manimlib.mobject.numbers import *
-from manimlib.mobject.probability import *
-from manimlib.mobject.shape_matchers import *
-from manimlib.mobject.svg.brace import *
-from manimlib.mobject.svg.drawings import *
-from manimlib.mobject.svg.svg_mobject import *
-from manimlib.mobject.svg.tex_mobject import *
-from manimlib.mobject.svg.text_mobject import *
-from manimlib.mobject.svg.code_mobject import *
-from manimlib.mobject.three_d_utils import *
-from manimlib.mobject.three_dimensions import *
-from manimlib.mobject.types.image_mobject import *
-from manimlib.mobject.types.point_cloud_mobject import *
-from manimlib.mobject.types.vectorized_mobject import *
-from manimlib.mobject.mobject_update_utils import *
-from manimlib.mobject.value_tracker import *
-from manimlib.mobject.vector_field import *
+from .mobject.coordinate_systems import *
+from .mobject.changing import *
+from .mobject.frame import *
+from .mobject.functions import *
+from .mobject.geometry import *
+from .mobject.matrix import *
+from .mobject.mobject import *
+from .mobject.number_line import *
+from .mobject.numbers import *
+from .mobject.probability import *
+from .mobject.shape_matchers import *
+from .mobject.svg.brace import *
+from .mobject.svg.drawings import *
+from .mobject.svg.svg_mobject import *
+from .mobject.svg.tex_mobject import *
+from .mobject.svg.text_mobject import *
+from .mobject.svg.code_mobject import *
+from .mobject.three_d_utils import *
+from .mobject.three_dimensions import *
+from .mobject.types.image_mobject import *
+from .mobject.types.point_cloud_mobject import *
+from .mobject.types.vectorized_mobject import *
+from .mobject.mobject_update_utils import *
+from .mobject.value_tracker import *
+from .mobject.vector_field 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 manimlib.scene.graph_scene import *
-from manimlib.scene.moving_camera_scene import *
-from manimlib.scene.reconfigurable_scene import *
-from manimlib.scene.scene import *
-from manimlib.scene.sample_space_scene import *
-from manimlib.scene.graph_scene import *
-from manimlib.scene.scene_from_video import *
-from manimlib.scene.three_d_scene import *
-from manimlib.scene.vector_space_scene import *
-from manimlib.scene.zoomed_scene import *
+from .scene.graph_scene import *
+from .scene.moving_camera_scene import *
+from .scene.reconfigurable_scene import *
+from .scene.scene import *
+from .scene.sample_space_scene import *
+from .scene.graph_scene import *
+from .scene.scene_from_video import *
+from .scene.three_d_scene import *
+from .scene.vector_space_scene import *
+from .scene.zoomed_scene import *
-from manimlib.utils.bezier import *
-from manimlib.utils.color import *
-from manimlib.utils.config_ops import *
-from manimlib.utils.debug import *
-from manimlib.utils.images import *
-from manimlib.utils.iterables import *
-from manimlib.utils.file_ops import *
-from manimlib.utils.paths import *
-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.utils.strings import *
+from .utils.bezier import *
+from .utils.color import *
+from .utils.config_ops import *
+from .utils.debug import *
+from .utils.images import *
+from .utils.iterables import *
+from .utils.file_ops import *
+from .utils.paths import *
+from .utils.rate_functions import *
+from .utils.simple_functions import *
+from .utils.sounds import *
+from .utils.space_ops import *
+from .utils.strings import *
# Non manim libraries that are also nice to have without thinking
diff --cc manimlib/scene/scene_file_writer.py
index 74aa30587,f0dfbe63d..6ccfb8d80
--- a/manimlib/scene/scene_file_writer.py
+++ b/manimlib/scene/scene_file_writer.py
@@@ -6,18 -6,18 +6,19 @@@ import o
import _thread as thread
from time import sleep
import datetime
+ from PIL import Image
-import manimlib.constants as consts
-from manimlib.constants import FFMPEG_BIN
-from manimlib.constants import STREAMING_IP
-from manimlib.constants import STREAMING_PORT
-from manimlib.constants import STREAMING_PROTOCOL
-from manimlib.utils.config_ops import digest_config
-from manimlib.utils.file_ops import guarantee_existence
-from manimlib.utils.file_ops import add_extension_if_not_present
-from manimlib.utils.file_ops import get_sorted_integer_files
-from manimlib.utils.sounds import get_full_sound_file_path
+from ..constants import FFMPEG_BIN
+from ..constants import STREAMING_IP
+from ..constants import STREAMING_PORT
+from ..constants import STREAMING_PROTOCOL
+from ..constants import VIDEO_DIR
+from ..constants import VIDEO_OUTPUT_DIR
+from ..utils.config_ops import digest_config
+from ..utils.file_ops import guarantee_existence
+from ..utils.file_ops import add_extension_if_not_present
+from ..utils.file_ops import get_sorted_integer_files
+from ..utils.sounds import get_full_sound_file_path
class SceneFileWriter(object):
@@@ -67,10 -67,10 +68,10 @@@
"""
module_directory = self.output_directory or self.get_default_module_directory()
scene_name = self.file_name or self.get_default_scene_name()
- if self.save_last_frame:
- if VIDEO_DIR != "":
+ if self.save_last_frame or self.save_pngs:
+ if consts.VIDEO_DIR != "":
image_dir = guarantee_existence(os.path.join(
- consts.VIDEO_DIR,
+ VIDEO_DIR,
module_directory,
"images",
))