Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Move Scene.file_writer

Devin Neald9eee5382cd8
diff --git a/manim/__main__.py b/manim/__main__.py
index 2450229bc..1d6fd193a 100644
--- a/manim/__main__.py
+++ b/manim/__main__.py
@@ -79,7 +79,7 @@ def main():
else:
scene = SceneClass()
scene.render()
- open_file_if_needed(scene.file_writer)
+ open_file_if_needed(scene.renderer.file_writer)
except Exception:
print("\n\n")
traceback.print_exc()
diff --git a/manim/renderer/cairo_renderer.py b/manim/renderer/cairo_renderer.py
index 97a42931c..1d3c2d38c 100644
--- a/manim/renderer/cairo_renderer.py
+++ b/manim/renderer/cairo_renderer.py
@@ -4,6 +4,7 @@ from ..utils.iterables import list_update
from ..utils.exceptions import EndSceneEarlyException
from ..utils.hashing import get_hash_from_play_call, get_hash_from_wait_call
from ..constants import DEFAULT_WAIT_TIME
+from ..scene.scene_file_writer import SceneFileWriter
def handle_caching_play(func):
@@ -85,9 +86,12 @@ class CairoRenderer:
time: time elapsed since initialisation of scene.
"""
- def __init__(self, scene, camera, file_writer):
+ def __init__(self, scene, camera):
self.camera = camera
- self.file_writer = file_writer
+ self.file_writer = SceneFileWriter(
+ scene,
+ **file_writer_config,
+ )
self.scene = scene
self.original_skipping_status = file_writer_config["skip_animations"]
self.play_hashes_list = []
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 458dd2cd2..f302daf61 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -66,11 +66,7 @@ class Scene(Container):
def __init__(self, **kwargs):
Container.__init__(self, **kwargs)
self.camera = self.camera_class(**camera_config)
- self.file_writer = SceneFileWriter(
- self,
- **file_writer_config,
- )
- self.renderer = CairoRenderer(self, self.camera, self.file_writer)
+ self.renderer = CairoRenderer(self, self.camera)
self.mobjects = []
# TODO, remove need for foreground mobjects
@@ -920,4 +916,4 @@ class Scene(Container):
if file_writer_config["skip_animations"]:
return
time = self.time + time_offset
- self.file_writer.add_sound(sound_file, time, gain, **kwargs)
+ self.renderer.file_writer.add_sound(sound_file, time, gain, **kwargs)