Update ThreeDScene, move Scene.camera

Author: eulertour

manim/renderer/cairo_renderer.py

@@ -86,8 +86,8 @@ class CairoRenderer:
     time: time elapsed since initialisation of scene.
     """
 
-    def __init__(self, scene, camera):
-        self.camera = camera
+    def __init__(self, scene, camera_class):
+        self.camera = camera_class(**camera_config)
 
         # All of the following are set to EITHER the value passed via kwargs,
         # OR the value stored in the global config dict at the time of

manim/scene/scene.py

@@ -65,8 +65,7 @@ def construct(self):
 
     def __init__(self, **kwargs):
         Container.__init__(self, **kwargs)
-        self.camera = self.camera_class(**camera_config)
-        self.renderer = CairoRenderer(self, self.camera)
+        self.renderer = CairoRenderer(self, self.camera_class)
 
         self.mobjects = []
         # TODO, remove need for foreground mobjects
@@ -556,7 +555,7 @@ def get_time_progression(
         if file_writer_config["skip_animations"] and not override_skip_animations:
             times = [run_time]
         else:
-            step = 1 / self.camera.frame_rate
+            step = 1 / self.renderer.camera.frame_rate
             times = np.arange(0, run_time, step)
         time_progression = ProgressDisplay(
             times,
@@ -819,7 +818,7 @@ def wait_internal(self, duration=DEFAULT_WAIT_TIME, stop_condition=None):
             return self
         else:
             self.renderer.update_frame()
-            dt = 1 / self.camera.frame_rate
+            dt = 1 / self.renderer.camera.frame_rate
             self.renderer.add_frame(
                 self.renderer.get_frame(), num_frames=int(duration / dt)
             )

manim/scene/three_d_scene.py

@@ -53,13 +53,13 @@ def set_camera_orientation(self, phi=None, theta=None, distance=None, gamma=None
             The rotation of the camera about the vector from the ORIGIN to the Camera.
         """
         if phi is not None:
-            self.camera.set_phi(phi)
+            self.renderer.camera.set_phi(phi)
         if theta is not None:
-            self.camera.set_theta(theta)
+            self.renderer.camera.set_theta(theta)
         if distance is not None:
-            self.camera.set_distance(distance)
+            self.renderer.camera.set_distance(distance)
         if gamma is not None:
-            self.camera.set_gamma(gamma)
+            self.renderer.camera.set_gamma(gamma)
 
     def begin_ambient_camera_rotation(self, rate=0.02):
         """
@@ -74,17 +74,17 @@ def begin_ambient_camera_rotation(self, rate=0.02):
         """
         # TODO, use a ValueTracker for rate, so that it
         # can begin and end smoothly
-        self.camera.theta_tracker.add_updater(
+        self.renderer.camera.theta_tracker.add_updater(
             lambda m, dt: m.increment_value(rate * dt)
         )
-        self.add(self.camera.theta_tracker)
+        self.add(self.renderer.camera.theta_tracker)
 
     def stop_ambient_camera_rotation(self):
         """
         This method stops all ambient camera rotation.
         """
-        self.camera.theta_tracker.clear_updaters()
-        self.remove(self.camera.theta_tracker)
+        self.renderer.camera.theta_tracker.clear_updaters()
+        self.remove(self.renderer.camera.theta_tracker)
 
     def begin_3dillusion_camera_rotation(
         self, rate=1, origin_theta=-60 * DEGREES, origin_phi=75 * DEGREES
@@ -96,8 +96,8 @@ def uptate_theta(m, dt):
             val_for_left_right = 0.2 * np.sin(val_tracker_theta.get_value())
             return m.set_value(origin_theta + val_for_left_right)
 
-        self.camera.theta_tracker.add_updater(uptate_theta)
-        self.add(self.camera.theta_tracker)
+        self.renderer.camera.theta_tracker.add_updater(uptate_theta)
+        self.add(self.renderer.camera.theta_tracker)
 
         val_tracker_phi = ValueTracker(0)
 
@@ -106,17 +106,17 @@ def update_phi(m, dt):
             val_for_up_down = 0.1 * np.cos(val_tracker_phi.get_value())
             return m.set_value(origin_phi + val_for_up_down)
 
-        self.camera.phi_tracker.add_updater(update_phi)
-        self.add(self.camera.phi_tracker)
+        self.renderer.camera.phi_tracker.add_updater(update_phi)
+        self.add(self.renderer.camera.phi_tracker)
 
     def stop_3dillusion_camera_rotation(self):
         """
         This method stops all illusion camera rotations.
         """
-        self.camera.theta_tracker.clear_updaters()
-        self.remove(self.camera.theta_tracker)
-        self.camera.phi_tracker.clear_updaters()
-        self.remove(self.camera.phi_tracker)
+        self.renderer.camera.theta_tracker.clear_updaters()
+        self.remove(self.renderer.camera.theta_tracker)
+        self.renderer.camera.phi_tracker.clear_updaters()
+        self.remove(self.renderer.camera.phi_tracker)
 
     def move_camera(
         self,
@@ -155,16 +155,18 @@ def move_camera(
         """
         anims = []
         value_tracker_pairs = [
-            (phi, self.camera.phi_tracker),
-            (theta, self.camera.theta_tracker),
-            (distance, self.camera.distance_tracker),
-            (gamma, self.camera.gamma_tracker),
+            (phi, self.renderer.camera.phi_tracker),
+            (theta, self.renderer.camera.theta_tracker),
+            (distance, self.renderer.camera.distance_tracker),
+            (gamma, self.renderer.camera.gamma_tracker),
         ]
         for value, tracker in value_tracker_pairs:
             if value is not None:
                 anims.append(ApplyMethod(tracker.set_value, value, **kwargs))
         if frame_center is not None:
-            anims.append(ApplyMethod(self.camera.frame_center.move_to, frame_center))
+            anims.append(
+                ApplyMethod(self.renderer.camera.frame_center.move_to, frame_center)
+            )
 
         self.play(*anims + added_anims)
 
@@ -179,7 +181,7 @@ def get_moving_mobjects(self, *animations):
             The animations whose mobjects will be checked.
         """
         moving_mobjects = Scene.get_moving_mobjects(self, *animations)
-        camera_mobjects = self.camera.get_value_trackers()
+        camera_mobjects = self.renderer.camera.get_value_trackers()
         if any([cm in moving_mobjects for cm in camera_mobjects]):
             return self.mobjects
         return moving_mobjects
@@ -203,7 +205,7 @@ def add_fixed_orientation_mobjects(self, *mobjects, **kwargs):
                 center_func : function
         """
         self.add(*mobjects)
-        self.camera.add_fixed_orientation_mobjects(*mobjects, **kwargs)
+        self.renderer.camera.add_fixed_orientation_mobjects(*mobjects, **kwargs)
 
     def add_fixed_in_frame_mobjects(self, *mobjects):
         """
@@ -218,7 +220,7 @@ def add_fixed_in_frame_mobjects(self, *mobjects):
             The Mobjects whose orientation must be fixed.
         """
         self.add(*mobjects)
-        self.camera.add_fixed_in_frame_mobjects(*mobjects)
+        self.renderer.camera.add_fixed_in_frame_mobjects(*mobjects)
 
     def remove_fixed_orientation_mobjects(self, *mobjects):
         """
@@ -232,7 +234,7 @@ def remove_fixed_orientation_mobjects(self, *mobjects):
         *mobjects : Mobjects
             The Mobjects whose orientation must be unfixed.
         """
-        self.camera.remove_fixed_orientation_mobjects(*mobjects)
+        self.renderer.camera.remove_fixed_orientation_mobjects(*mobjects)
 
     def remove_fixed_in_frame_mobjects(self, *mobjects):
         """
@@ -245,7 +247,7 @@ def remove_fixed_in_frame_mobjects(self, *mobjects):
         *mobjects : Mobjects
             The Mobjects whose position and orientation must be unfixed.
         """
-        self.camera.remove_fixed_in_frame_mobjects(*mobjects)
+        self.renderer.camera.remove_fixed_in_frame_mobjects(*mobjects)
 
     ##
     def set_to_default_angled_camera_orientation(self, **kwargs):
@@ -305,7 +307,7 @@ class SpecialThreeDScene(ThreeDScene):
 
     def __init__(self, **kwargs):
         digest_config(self, kwargs)
-        if self.camera_config["pixel_width"] == config["pixel_width"]:
+        if self.renderer.camera_config["pixel_width"] == config["pixel_width"]:
             config = {}
         else:
             config = self.low_quality_config