diff --git a/manimlib/config.py b/manimlib/config.py index 89326a76..b14b834f 100644 --- a/manimlib/config.py +++ b/manimlib/config.py @@ -288,8 +288,8 @@ def update_scene_config(config: dict, args: Namespace): scene_config = config["scene"] start, end = get_animations_numbers(args) scene_config.update( - # Note, Scene.__init__ makes use of both get_camera_config() and - # get_file_writer_config() below, so the arguments here are just for + # Note, Scene.__init__ makes use of both manimlib.camera and + # manimlib.file_writer below, so the arguments here are just for # any future specifications beyond what the global configuration holds camera_config=dict(), file_writer_config=dict(), @@ -382,34 +382,4 @@ def get_output_directory(args: Namespace, config: dict) -> str: # Create global configuration - - manim_config: Dict = initialize_manim_config() - - -# Shortcuts for retrieving portions of global configuration - - -def get_window_config() -> dict: - """ Key word arguments for Window """ - return manim_config.window - - -def get_camera_config() -> dict: - """ Key word arguments for Camera """ - return manim_config.camera - - -def get_file_writer_config() -> dict: - """ Key word arguments for SceneFileWriter """ - return manim_config.file_writer - - -def get_scene_config() -> dict: - """ Key word arguments for Scene """ - return manim_config.scene - - -def get_run_config(): - return manim_config.run - diff --git a/manimlib/scene/scene.py b/manimlib/scene/scene.py index 2ff3d3e6..7b8e4104 100644 --- a/manimlib/scene/scene.py +++ b/manimlib/scene/scene.py @@ -15,8 +15,7 @@ from tqdm.auto import tqdm as ProgressDisplay from manimlib.animation.animation import prepare_animation from manimlib.camera.camera import Camera from manimlib.camera.camera_frame import CameraFrame -from manimlib.config import get_camera_config -from manimlib.config import get_file_writer_config +from manimlib.config import manim_config from manimlib.event_handler import EVENT_DISPATCHER from manimlib.event_handler.event_type import EventType from manimlib.logger import log @@ -90,12 +89,12 @@ class Scene(object): self.default_wait_time = default_wait_time self.camera_config = merge_dicts_recursively( - get_camera_config(), # Global default + manim_config.camera, # Global default self.default_camera_config, # Updated configuration that subclasses may specify camera_config, # Updated configuration from instantiation ) self.file_writer_config = merge_dicts_recursively( - get_file_writer_config(), + manim_config.file_writer, self.default_file_writer_config, file_writer_config, ) diff --git a/manimlib/shader_wrapper.py b/manimlib/shader_wrapper.py index ec138b89..f9f1ce17 100644 --- a/manimlib/shader_wrapper.py +++ b/manimlib/shader_wrapper.py @@ -10,7 +10,7 @@ import numpy as np from functools import lru_cache from manimlib.config import parse_cli -from manimlib.config import get_camera_config +from manimlib.config import manim_config from manimlib.utils.shaders import get_shader_code_from_file from manimlib.utils.shaders import get_shader_program from manimlib.utils.shaders import image_path_to_texture @@ -410,8 +410,7 @@ class VShaderWrapper(ShaderWrapper): which can display that texture as a simple quad onto a screen, along with the rgb value which is meant to be discarded. """ - cam_config = get_camera_config() - size = cam_config["resolution"] + size = manim_config.camera.resolution double_size = (2 * size[0], 2 * size[1]) # Important to make sure dtype is floating point (not fixed point)