Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Render to mp4

Devin Neal9d2c0a7c543d
diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.py
index e1846cfd0..21a98ab32 100644
--- a/manim/renderer/opengl_renderer.py
+++ b/manim/renderer/opengl_renderer.py
@@ -186,7 +186,7 @@ class OpenGLRenderer:
self.num_plays = 0
self.skip_animations = False
- self.window = Window(size=(1280, 720))
+ self.window = Window()
self.camera = OpenGLCamera()
@@ -207,6 +207,8 @@ class OpenGLRenderer:
# Initialize texture map.
self.path_to_texture_id = {}
+ self.partial_movie_files = []
+
def update_depth_test(self, context, shader_wrapper):
if shader_wrapper.depth_test:
self.context.enable(moderngl.DEPTH_TEST)
@@ -354,6 +356,7 @@ class OpenGLRenderer:
self.animation_elapsed_time = 0
temp_name = f"media/temp_{self.num_plays}.mp4"
+ self.partial_movie_files.append(temp_name)
self.file_writer.begin_animation(
not self.skip_animations, file_path=temp_name
)
@@ -379,7 +382,7 @@ class OpenGLRenderer:
update_frame()
def scene_finished(self, scene):
- pass
+ self.file_writer.finish(self.partial_movie_files)
def save_static_frame_data(self, scene, static_mobjects):
pass
diff --git a/manim/renderer/opengl_renderer_window.py b/manim/renderer/opengl_renderer_window.py
index 10ff6d8e2..172b8e09b 100644
--- a/manim/renderer/opengl_renderer_window.py
+++ b/manim/renderer/opengl_renderer_window.py
@@ -11,8 +11,10 @@ class Window(PygletWindow):
vsync = True
cursor = True
- def __init__(self, size=(config["pixel_width"], config["pixel_height"]), **kwargs):
- super().__init__()
+ def __init__(self, size=None, **kwargs):
+ if size is None:
+ size = (config["pixel_width"], config["pixel_height"])
+ super().__init__(size=size)
self.pressed_keys = set()
@@ -23,3 +25,5 @@ class Window(PygletWindow):
self.timer = Timer()
self.config = mglw.WindowConfig(ctx=self.ctx, wnd=self, timer=self.timer)
self.timer.start()
+
+ self.swap_buffers()
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index 4fd076133..720d6212a 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -741,7 +741,7 @@ class Scene(Container):
if self.renderer.skip_animations and not override_skip_animations:
times = [run_time]
else:
- step = 1 / self.renderer.camera.frame_rate
+ step = 1 / config["frame_rate"]
times = np.arange(0, run_time, step)
time_progression = tqdm(
times,
diff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.py
index 20fe1717e..f10d0c049 100644
--- a/manim/scene/scene_file_writer.py
+++ b/manim/scene/scene_file_writer.py
@@ -323,7 +323,7 @@ class SceneFileWriter(object):
if time_diff < frame_duration:
sleep(frame_duration - time_diff)
- def finish(self):
+ def finish(self, partial_movie_files=None):
"""
Finishes writing to the FFMPEG buffer.
Combines the partial movie files into the
@@ -334,7 +334,7 @@ class SceneFileWriter(object):
if config["write_to_movie"]:
if hasattr(self, "writing_process"):
self.writing_process.terminate()
- self.combine_movie_files()
+ self.combine_movie_files(partial_movie_files=partial_movie_files)
if config["flush_cache"]:
self.flush_cache_directory()
else:
@@ -376,6 +376,8 @@ class SceneFileWriter(object):
"-metadata",
f"comment=Rendered with Manim Community v{__version__}",
]
+ if config["use_opengl_renderer"]:
+ command += ["-vf", "vflip"]
if config["transparent"]:
command += ["-vcodec", "qtrle"]
else:
@@ -416,7 +418,7 @@ class SceneFileWriter(object):
)
return os.path.exists(path)
- def combine_movie_files(self):
+ def combine_movie_files(self, partial_movie_files=None):
"""
Used internally by Manim to combine the separate
partial movie files that make up a Scene into a single
@@ -428,7 +430,10 @@ class SceneFileWriter(object):
# which effectively has cuts at all the places you might want. But for
# viewing the scene as a whole, one of course wants to see it as a
# single piece.
- partial_movie_files = [el for el in self.partial_movie_files if el is not None]
+ if not config["use_opengl_renderer"]:
+ partial_movie_files = [
+ el for el in self.partial_movie_files if el is not None
+ ]
# NOTE : Here we should do a check and raise an exception if partial
# movie file is empty. We can't, as a lot of stuff (in particular, in
# tests) use scene initialization, and this error would be raised as