Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Remove scene references from CairoRenderer

Devin Nealca618a6d1836
diff --git a/manim/renderer/cairo_renderer.py b/manim/renderer/cairo_renderer.py
index 7cd477a37..6da07022b 100644
--- a/manim/renderer/cairo_renderer.py
+++ b/manim/renderer/cairo_renderer.py
@@ -10,9 +10,9 @@ from ..utils.caching import handle_caching_play, handle_caching_wait
def manage_scene_reference(func):
def wrapper(self, scene, *args, **kwargs):
- setattr(self, "temp_scene_ref", scene)
+ setattr(self, "scene", scene)
func(self, *args, **kwargs)
- delattr(self, "temp_scene_ref")
+ delattr(self, "scene")
return wrapper
@@ -77,7 +77,6 @@ class CairoRenderer:
scene,
**file_writer_config,
)
- self.scene = scene
self.original_skipping_status = file_writer_config["skip_animations"]
self.animations_hashes = []
self.num_plays = 0
@@ -97,6 +96,7 @@ class CairoRenderer:
def update_frame( # TODO Description in Docstring
self,
+ scene,
mobjects=None,
background=None,
include_submobjects=True,
@@ -124,8 +124,8 @@ class CairoRenderer:
return
if mobjects is None:
mobjects = list_update(
- self.scene.mobjects,
- self.scene.foreground_mobjects,
+ scene.mobjects,
+ scene.foreground_mobjects,
)
if background is not None:
self.camera.set_frame_to_background(background)
@@ -209,4 +209,3 @@ class CairoRenderer:
self.file_writer.finish()
if file_writer_config["save_last_frame"]:
self.file_writer.save_final_image(self.camera.get_image())
- logger.info(f"Rendered {str(self.scene)}\nPlayed {self.num_plays} animations")
diff --git a/manim/scene/scene.py b/manim/scene/scene.py
index e75f748ad..c244c6ebf 100644
--- a/manim/scene/scene.py
+++ b/manim/scene/scene.py
@@ -86,6 +86,9 @@ class Scene(Container):
pass
self.tear_down()
self.renderer.finish()
+ logger.info(
+ f"Rendered {str(self)}\nPlayed {self.renderer.num_plays} animations"
+ )
def setup(self):
"""
@@ -718,7 +721,7 @@ class Scene(Container):
"""
for t in self.get_animation_time_progression(self.animations):
self.update_animation_to_time(t)
- self.renderer.update_frame(self.moving_mobjects, self.static_image)
+ self.renderer.update_frame(self, self.moving_mobjects, self.static_image)
self.renderer.add_frame(self.renderer.get_frame())
def update_animation_to_time(self, t):
@@ -786,7 +789,7 @@ class Scene(Container):
# Paint all non-moving objects onto the screen, so they don't
# have to be rendered every frame
self.moving_mobjects = self.get_moving_mobjects(*self.animations)
- self.renderer.update_frame(excluded_mobjects=self.moving_mobjects)
+ self.renderer.update_frame(self, excluded_mobjects=self.moving_mobjects)
self.static_image = self.renderer.get_frame()
self.last_t = 0
self.run_time = self.get_run_time(self.animations)
@@ -808,7 +811,7 @@ class Scene(Container):
# the same way Scene.play does
for t in time_progression:
self.update_animation_to_time(t)
- self.renderer.update_frame()
+ self.renderer.update_frame(self)
self.renderer.add_frame(self.renderer.get_frame())
if stop_condition is not None and stop_condition():
time_progression.close()
@@ -817,7 +820,7 @@ class Scene(Container):
# Do nothing
return self
else:
- self.renderer.update_frame()
+ self.renderer.update_frame(self)
dt = 1 / self.renderer.camera.frame_rate
self.renderer.add_frame(
self.renderer.get_frame(), num_frames=int(duration / dt)
diff --git a/tests/control_data/logs_data/BasicSceneLoggingTest.txt b/tests/control_data/logs_data/BasicSceneLoggingTest.txt
index 576252e49..edee71e9e 100644
--- a/tests/control_data/logs_data/BasicSceneLoggingTest.txt
+++ b/tests/control_data/logs_data/BasicSceneLoggingTest.txt
@@ -6,4 +6,4 @@
{"levelname": "INFO", "module": "scene_file_writer", "message": "Animation 0 : Partial movie file written in <>"}
{"levelname": "DEBUG", "module": "scene_file_writer", "message": "Partial movie files to combine (1 files): <>"}
{"levelname": "INFO", "module": "scene_file_writer", "message": "\nFile ready at <>\n"}
-{"levelname": "INFO", "module": "cairo_renderer", "message": "Rendered SquareToCircle\nPlayed 1 animations"}
+{"levelname": "INFO", "module": "scene", "message": "Rendered SquareToCircle\nPlayed 1 animations"}