A community-maintained Python framework for creating mathematical animations.
Update ThreeDScene, move Scene.camera
Devin Nealf8a55aa8cc8b
diff --git a/manim/renderer/cairo_renderer.py b/manim/renderer/cairo_renderer.pyindex a7b8c278f..6c811c7b0 100644--- a/manim/renderer/cairo_renderer.py+++ b/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 ofdiff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex f302daf61..563066649 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -65,8 +65,7 @@ class Scene(Container):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 @@ class Scene(Container):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_ratetimes = np.arange(0, run_time, step)time_progression = ProgressDisplay(times,@@ -819,7 +818,7 @@ class Scene(Container):return selfelse:self.renderer.update_frame()- dt = 1 / self.camera.frame_rate+ dt = 1 / self.renderer.camera.frame_rateself.renderer.add_frame(self.renderer.get_frame(), num_frames=int(duration / dt))diff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.pyindex 26dbf5ed2..5065899f5 100644--- a/manim/scene/three_d_scene.py+++ b/manim/scene/three_d_scene.py@@ -53,13 +53,13 @@ class ThreeDScene(Scene):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 @@ class ThreeDScene(Scene):"""# 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 @@ class ThreeDScene(Scene):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 @@ class ThreeDScene(Scene):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 @@ class ThreeDScene(Scene):"""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 @@ class ThreeDScene(Scene):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.mobjectsreturn moving_mobjects@@ -203,7 +205,7 @@ class ThreeDScene(Scene):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 @@ class ThreeDScene(Scene):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 @@ class ThreeDScene(Scene):*mobjects : MobjectsThe 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 @@ class ThreeDScene(Scene):*mobjects : MobjectsThe 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