Add CairoRenderer, move Scene.get_frame()

Author: eulertour

manim/grpc/impl/frame_server_impl.py

@@ -98,7 +98,7 @@ def GetFrameAtTime(self, request, context):
                 selected_scene.static_image,
             )
             serialized_mobject_list, duration = selected_scene.add_frame(
-                selected_scene.get_frame()
+                selected_scene.renderer.get_frame()
             )
             resp = list_to_frame_response(
                 selected_scene, duration, serialized_mobject_list

manim/renderer/cairo_renderer.py

@@ -0,0 +1,20 @@
+import numpy as np
+
+
+class CairoRenderer:
+    def __init__(self, scene, camera, file_writer):
+        self.scene = scene
+        self.camera = camera
+        self.file_writer = file_writer
+
+    def get_frame(self):
+        """
+        Gets the current frame as NumPy array.
+
+        Returns
+        -------
+        np.array
+            NumPy array of pixel values of each pixel in screen.
+            The shape of the array is height x width x 3
+        """
+        return np.array(self.camera.pixel_array)

manim/scene/scene.py

@@ -23,6 +23,7 @@
 from ..scene.scene_file_writer import SceneFileWriter
 from ..utils.iterables import list_update
 from ..utils.hashing import get_hash_from_play_call, get_hash_from_wait_call
+from ..renderer.cairo_renderer import CairoRenderer
 
 
 class Scene(Container):
@@ -65,11 +66,11 @@ def construct(self):
     def __init__(self, **kwargs):
         Container.__init__(self, **kwargs)
         self.camera = self.camera_class(**camera_config)
-        if not self.camera.use_js_renderer:
-            self.file_writer = SceneFileWriter(
-                self,
-                **file_writer_config,
-            )
+        self.file_writer = SceneFileWriter(
+            self,
+            **file_writer_config,
+        )
+        self.renderer = CairoRenderer(self, self.camera, self.file_writer)
         self.play_hashes_list = []
 
         self.mobjects = []
@@ -167,18 +168,6 @@ def get_attrs(self, *keys):
         """
         return [getattr(self, key) for key in keys]
 
-    def get_frame(self):
-        """
-        Gets the current frame as NumPy array.
-
-        Returns
-        -------
-        np.array
-            NumPy array of pixel values of each pixel in screen.
-            The shape of the array is height x width x 3
-        """
-        return np.array(self.camera.pixel_array)
-
     def update_frame(  # TODO Description in Docstring
         self,
         mobjects=None,
@@ -221,7 +210,7 @@ def update_frame(  # TODO Description in Docstring
 
     def freeze_background(self):
         self.update_frame()
-        self.camera = Camera(self.get_frame())
+        self.camera = Camera(self.renderer.get_frame())
         self.clear()
 
     ###
@@ -823,7 +812,7 @@ def progress_through_animations(self):
         for t in self.get_animation_time_progression(self.animations):
             self.update_animation_to_time(t)
             self.update_frame(self.moving_mobjects, self.static_image)
-            self.add_frame(self.get_frame())
+            self.add_frame(self.renderer.get_frame())
 
     def update_animation_to_time(self, t):
         """
@@ -931,7 +920,7 @@ def play_internal(self, *args, **kwargs):
         # have to be rendered every frame
         self.moving_mobjects = self.get_moving_mobjects(*self.animations)
         self.update_frame(excluded_mobjects=self.moving_mobjects)
-        self.static_image = self.get_frame()
+        self.static_image = self.renderer.get_frame()
         self.last_t = 0
         self.run_time = self.get_run_time(self.animations)
 
@@ -953,7 +942,7 @@ def wait_internal(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
             for t in time_progression:
                 self.update_animation_to_time(t)
                 self.update_frame()
-                self.add_frame(self.get_frame())
+                self.add_frame(self.renderer.get_frame())
                 if stop_condition is not None and stop_condition():
                     time_progression.close()
                     break
@@ -963,7 +952,7 @@ def wait_internal(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
         else:
             self.update_frame()
             dt = 1 / self.camera.frame_rate
-            self.add_frame(self.get_frame(), num_frames=int(duration / dt))
+            self.add_frame(self.renderer.get_frame(), num_frames=int(duration / dt))
         return self
 
     def clean_up_animations(self, *animations):

tests/helpers/graphical_units.py

@@ -40,7 +40,7 @@ def set_test_scene(scene_object, module_name):
         file_writer_config["text_dir"] = os.path.join(tmpdir, "text")
         file_writer_config["tex_dir"] = os.path.join(tmpdir, "tex")
         scene = scene_object()
-        data = scene.get_frame()
+        data = scene.renderer.get_frame()
 
     tests_directory = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     path_control_data = os.path.join(

tests/utils/GraphicalUnitTester.py

@@ -128,7 +128,7 @@ def _show_diff_helper(self, frame_data, expected_frame_data):
 
     def test(self, show_diff=False):
         """Compare pre-rendered frame to the frame rendered during the test."""
-        frame_data = self.scene.get_frame()
+        frame_data = self.scene.renderer.get_frame()
         expected_frame_data = self._load_data()
 
         assert frame_data.shape == expected_frame_data.shape, (