Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

added ambient rotate for other angles - theta, phi, gamma (take 2) (#660)

dor2727a595f8cb8da2
diff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.py
index 613d5b335..303210a46 100644
--- a/manim/scene/three_d_scene.py
+++ b/manim/scene/three_d_scene.py
@@ -69,7 +69,7 @@ class ThreeDScene(Scene):
if gamma is not None:
self.renderer.camera.set_gamma(gamma)
- def begin_ambient_camera_rotation(self, rate=0.02):
+ def begin_ambient_camera_rotation(self, rate=0.02, about="theta"):
"""
This method begins an ambient rotation of the camera about the Z_AXIS,
in the anticlockwise direction
@@ -79,20 +79,38 @@ class ThreeDScene(Scene):
rate : int or float, optional
The rate at which the camera should rotate about the Z_AXIS.
Negative rate means clockwise rotation.
+ about: (str)
+ one of 3 options: ["theta", "phi", "gamma"]. defaults to theta.
"""
# TODO, use a ValueTracker for rate, so that it
# can begin and end smoothly
- self.renderer.camera.theta_tracker.add_updater(
- lambda m, dt: m.increment_value(rate * dt)
- )
- self.add(self.renderer.camera.theta_tracker)
+ if about.lower() == "phi":
+ x = self.renderer.camera.phi_tracker
+ elif about.lower() == "gamma":
+ x = self.renderer.camera.gamma_tracker
+ elif about.lower() == "theta":
+ x = self.renderer.camera.theta_tracker
+ else:
+ raise ValueError("Invalid ambient rotation angle.")
+
+ x.add_updater(lambda m, dt: m.increment_value(rate * dt))
+ self.add(x)
- def stop_ambient_camera_rotation(self):
+ def stop_ambient_camera_rotation(self, about="theta"):
"""
This method stops all ambient camera rotation.
"""
- self.renderer.camera.theta_tracker.clear_updaters()
- self.remove(self.renderer.camera.theta_tracker)
+ if about.lower() == "phi":
+ x = self.renderer.camera.phi_tracker
+ elif about.lower() == "gamma":
+ x = self.renderer.camera.gamma_tracker
+ elif about.lower() == "theta":
+ x = self.renderer.camera.theta_tracker
+ else:
+ raise ValueError("Invalid ambient rotation angle.")
+
+ x.clear_updaters()
+ self.remove(x)
def begin_3dillusion_camera_rotation(
self, rate=1, origin_theta=-60 * DEGREES, origin_phi=75 * DEGREES