A community-maintained Python framework for creating mathematical animations.
constants.py overhaul
XorUnison92f6eb4ed92c
diff --git a/manim/__init__.py b/manim/__init__.pyindex 1185c9c3b..08c5844bd 100644--- a/manim/__init__.py+++ b/manim/__init__.py@@ -6,6 +6,6 @@ from . import constantsdef main():args = config.parse_cli()cfg = config.get_configuration(args)- constants.initialize_directories(cfg)+ config.initialize_directories(cfg)from . import extract_sceneextract_scene.main(cfg)diff --git a/manim/config.py b/manim/config.pyindex 1fb2e11ce..0b2a64d8c 100644--- a/manim/config.py+++ b/manim/config.py@@ -4,8 +4,9 @@ import osimport sysimport types-from . import constants+from . import constants+from . import dirsdef parse_cli():try:@@ -37,22 +38,22 @@ def parse_cli():parser.add_argument("-l", "--low_quality",action="store_true",- help="Render at a low quality (for faster rendering)",+ help="Render at low quality (for fastest rendering)",),parser.add_argument("-m", "--medium_quality",action="store_true",- help="Render at a medium quality",+ help="Render at medium quality (for much faster rendering)",),parser.add_argument(- "--high_quality",+ "-e", "--high_quality",action="store_true",- help="Render at a high quality",+ help="Render at high quality (for slightly faster rendering)",),parser.add_argument("-k", "--four_k",action="store_true",- help="Render at a 4K quality",+ help="Render at 4K quality (slower rendering)",),parser.add_argument("-g", "--save_pngs",@@ -123,14 +124,14 @@ def parse_cli():"--video_dir",help="directory to write file tree for video",)- video_group.add_argument(- "--video_output_dir",- help="directory to write video",- )parser.add_argument("--tex_dir",help="directory to write tex",)+ parser.add_argument(+ "--text_dir",+ help="directory to write text",+ )return parser.parse_args()except argparse.ArgumentError as err:print(str(err))@@ -165,8 +166,8 @@ def get_configuration(args):"leave_progress_bars": args.leave_progress_bars,"media_dir": args.media_dir,"video_dir": args.video_dir,- "video_output_dir": args.video_output_dir,"tex_dir": args.tex_dir,+ "text_dir": args.text_dir,}# Camera configuration@@ -239,3 +240,47 @@ def get_camera_configuration(args):camera_config["background_opacity"] = 0return camera_config+++def initialize_directories(cfgargs):+ dir_config = {}+ dir_config["media_dir"] = cfgargs["media_dir"] or dirs.MEDIA_DIR+ dir_config["video_dir"] = cfgargs["video_dir"] or dirs.VIDEO_DIR+ print(not(cfgargs["video_dir"] or dirs.VIDEO_DIR))++ if not (cfgargs["video_dir"] and cfgargs["tex_dir"]):+ if cfgargs["media_dir"]:+ if not os.path.isdir(dir_config["media_dir"]):+ os.makedirs(dir_config["media_dir"])+ if not os.path.isdir(dir_config["media_dir"]):+ dir_config["media_dir"] = "./media"+ else:+ print(+ f"Media will be written to {dir_config['media_dir'] + os.sep}. You can change "+ "this behavior with the --media_dir flag, or by adjusting dirs.py.,"+ )+ else:+ if cfgargs["media_dir"]:+ print(+ "Ignoring --media_dir, since both --tex_dir and --video_dir were passed."+ )++ dir_config["tex_dir"] = (cfgargs["tex_dir"]+ or dirs.TEX_DIR+ or os.path.join(dir_config["media_dir"], "Tex"))+ dir_config["text_dir"] = (cfgargs["text_dir"]+ or dirs.TEXT_DIR+ or os.path.join(dir_config["media_dir"], "texts"))++ if not cfgargs["video_dir"] or dirs.VIDEO_DIR:+ dir_config["video_dir"] = os.path.join(dir_config["media_dir"], "videos")++ for folder in [dir_config["video_dir"], dir_config["tex_dir"], dir_config["text_dir"]]:+ if folder != "" and not os.path.exists(folder):+ os.makedirs(folder)++ dirs.MEDIA_DIR = dir_config["media_dir"]+ dirs.VIDEO_DIR = dir_config["video_dir"]+ dirs.TEX_DIR = dir_config["tex_dir"]+ dirs.TEXT_DIR = dir_config["text_dir"]+ print(dirs.MEDIA_DIR)diff --git a/manim/constants.py b/manim/constants.pyindex 9ae2163af..ed3e5405e 100644--- a/manim/constants.py+++ b/manim/constants.py@@ -1,62 +1,11 @@import numpy as npimport os-MEDIA_DIR = ""-VIDEO_DIR = ""-VIDEO_OUTPUT_DIR = ""-TEX_DIR = ""-TEXT_DIR = ""---def initialize_directories(config):- global MEDIA_DIR- global VIDEO_DIR- global VIDEO_OUTPUT_DIR- global TEX_DIR- global TEXT_DIR-- video_path_specified = config["video_dir"] or config["video_output_dir"]-- if not (video_path_specified and config["tex_dir"]):- if config["media_dir"]:- MEDIA_DIR = config["media_dir"]- else:- MEDIA_DIR = os.path.join(- os.path.expanduser('~'),- "Dropbox (3Blue1Brown)/3Blue1Brown Team Folder"- )- if not os.path.isdir(MEDIA_DIR):- MEDIA_DIR = "./media"- print(- f"Media will be written to {MEDIA_DIR + os.sep}. You can change "- "this behavior with the --media_dir flag."- )- else:- if config["media_dir"]:- print(- "Ignoring --media_dir, since both --tex_dir and a video "- "directory were both passed"- )-- TEX_DIR = config["tex_dir"] or os.path.join(MEDIA_DIR, "Tex")- TEXT_DIR = os.path.join(MEDIA_DIR, "texts")- if not video_path_specified:- VIDEO_DIR = os.path.join(MEDIA_DIR, "videos")- VIDEO_OUTPUT_DIR = os.path.join(MEDIA_DIR, "videos")- elif config["video_output_dir"]:- VIDEO_OUTPUT_DIR = config["video_output_dir"]- else:- VIDEO_DIR = config["video_dir"]-- for folder in [VIDEO_DIR, VIDEO_OUTPUT_DIR, TEX_DIR, TEXT_DIR]:- if folder != "" and not os.path.exists(folder):- os.makedirs(folder)-NOT_SETTING_FONT_MSG='''Warning:-You haven't set font.-If you are not using English, this may cause text rendering problem.-You set font like:+You haven't set a font.+If you are not using English, this may cause text rendering problems.+You set fonts like:text = Text('your text', font='your font')or:class MyText(Text):@@ -87,12 +36,14 @@ with open(TEMPLATE_TEX_FILE, "r") as infile:HELP_MESSAGE = """Usage:python extract_scene.py <module> [<scene name>]- -p preview in low quality+ -p preview (opens file in OS assigned program after finishing)-s show and save picture of last frame-w write result to file [this is default if nothing else is stated]-o <file_name> write to a different file_name-l use low quality-m use medium quality+ -e use high quality+ -k use 4K quality-a run and save every scene in the script, or all args for the given scene-q don't print progress-f when writing to a movie file, export the frames in png sequencediff --git a/manim/dirs.py b/manim/dirs.pynew file mode 100644index 000000000..9d9d5cf3d--- /dev/null+++ b/manim/dirs.py@@ -0,0 +1,4 @@+MEDIA_DIR = r""+VIDEO_DIR = r""+TEX_DIR = r""+TEXT_DIR = r""diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex 12d06de4b..ff3e8ba97 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -10,6 +10,7 @@ from colour import Colorimport numpy as npfrom ..constants import *+from ..dirs import VIDEO_DIRfrom ..container.container import Containerfrom ..utils.color import color_gradientfrom ..utils.color import interpolate_colordiff --git a/manim/mobject/svg/text_mobject.py b/manim/mobject/svg/text_mobject.pyindex 9736c2d00..c68ff2912 100644--- a/manim/mobject/svg/text_mobject.py+++ b/manim/mobject/svg/text_mobject.py@@ -3,7 +3,9 @@ import osimport copyimport hashlibimport cairo+from ...constants import *+from ...dirs import TEXT_DIRfrom ...container.container import Containerfrom ...mobject.geometry import Dot, Rectanglefrom ...mobject.svg.svg_mobject import SVGMobjectdiff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.pyindex d68dc33cb..a2eaa378b 100644--- a/manim/scene/scene_file_writer.py+++ b/manim/scene/scene_file_writer.py@@ -12,8 +12,8 @@ from ..constants import FFMPEG_BINfrom ..constants import STREAMING_IPfrom ..constants import STREAMING_PORTfrom ..constants import STREAMING_PROTOCOL-from ..constants import VIDEO_DIR-from ..constants import VIDEO_OUTPUT_DIR+from ..dirs import MEDIA_DIR+from ..dirs import VIDEO_DIRfrom ..utils.config_ops import digest_configfrom ..utils.file_ops import guarantee_existencefrom ..utils.file_ops import add_extension_if_not_present@@ -72,8 +72,8 @@ class SceneFileWriter(object):if VIDEO_DIR != "":image_dir = guarantee_existence(os.path.join(VIDEO_DIR,- module_directory,"images",+ module_directory,))else:image_dir = guarantee_existence(os.path.join(@@ -91,8 +91,6 @@ class SceneFileWriter(object):module_directory,self.get_resolution_directory(),))- else:- movie_dir = guarantee_existence(VIDEO_OUTPUT_DIR)self.movie_file_path = os.path.join(movie_dir,add_extension_if_not_present(diff --git a/manim/utils/tex_file_writing.py b/manim/utils/tex_file_writing.pyindex 4e166b74a..d401d25e0 100644--- a/manim/utils/tex_file_writing.py+++ b/manim/utils/tex_file_writing.py@@ -5,8 +5,7 @@ from pathlib import Pathfrom ..constants import TEX_TEXT_TO_REPLACEfrom ..constants import TEX_USE_CTEX-from ..constants import TEX_DIR-+from ..dirs import TEX_DIRdef tex_hash(expression, template_tex_file_body):id_str = str(expression + template_tex_file_body)