public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-04-13 09:47:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to change Euler axes

Browse source
This commit is contained in:
Grant Sanderson 2024-02-13 14:48:56 -06:00
parent 4ce8a3ba9d
commit ed3ac74d67
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
manimlib/camera/camera_frame.py
View file

@ -25,6 +25,7 @@ class CameraFrame(Mobject):
center_point: Vect3 = ORIGIN, center_point: Vect3 = ORIGIN,
# Field of view in the y direction # Field of view in the y direction
fovy: float = 45 * DEGREES, fovy: float = 45 * DEGREES,
euler_axes: str = "zxz",
**kwargs, **kwargs,
): ):
super().__init__(**kwargs) super().__init__(**kwargs)
@ -35,6 +36,7 @@ class CameraFrame(Mobject):
self.default_orientation = Rotation.identity() self.default_orientation = Rotation.identity()
self.view_matrix = np.identity(4) self.view_matrix = np.identity(4)
self.camera_location = OUT # This will be updated by set_points self.camera_location = OUT # This will be updated by set_points
self.euler_axes = euler_axes
self.set_points(np.array([ORIGIN, LEFT, RIGHT, DOWN, UP])) self.set_points(np.array([ORIGIN, LEFT, RIGHT, DOWN, UP]))
self.set_width(frame_shape[0], stretch=True) self.set_width(frame_shape[0], stretch=True)
@ -62,7 +64,7 @@ class CameraFrame(Mobject):
orientation = self.get_orientation() orientation = self.get_orientation()
if all(orientation.as_quat() == [0, 0, 0, 1]): if all(orientation.as_quat() == [0, 0, 0, 1]):
return np.zeros(3) return np.zeros(3)
return orientation.as_euler("zxz")[::-1] return orientation.as_euler(self.euler_axes)[::-1]
def get_theta(self): def get_theta(self):
return self.get_euler_angles()[0] return self.get_euler_angles()[0]
@ -126,10 +128,27 @@ class CameraFrame(Mobject):
if all(eulers == 0): if all(eulers == 0):
rot = Rotation.identity() rot = Rotation.identity()
else: else:
rot = Rotation.from_euler("zxz", eulers[::-1]) rot = Rotation.from_euler(self.euler_axes, eulers[::-1])
self.set_orientation(rot) self.set_orientation(rot)
return self return self
def increment_euler_angles(
self,
dtheta: float | None = None,
dphi: float | None = None,
dgamma: float | None = None,
units: float = RADIANS
):
angles = self.get_euler_angles()
for i, value in enumerate([dtheta, dphi, dgamma]):
if value is not None:
angles[i] += value * units
self.set_euler_angles(*angles)
return self
def set_euler_axes(self, seq: str):
self.euler_axes = seq
def reorient( def reorient(
self, self,
theta_degrees: float | None = None, theta_degrees: float | None = None,
@ -158,16 +177,16 @@ class CameraFrame(Mobject):
def set_gamma(self, gamma: float): def set_gamma(self, gamma: float):
return self.set_euler_angles(gamma=gamma) return self.set_euler_angles(gamma=gamma)
def increment_theta(self, dtheta: float): def increment_theta(self, dtheta: float, units=RADIANS):
self.rotate(dtheta, OUT) self.increment_euler_angles(dtheta=dtheta, units=units)
return self return self
def increment_phi(self, dphi: float): def increment_phi(self, dphi: float, units=RADIANS):
self.rotate(dphi, self.get_inverse_camera_rotation_matrix()[0]) self.increment_euler_angles(dphi=dphi, units=units)
return self return self
def increment_gamma(self, dgamma: float): def increment_gamma(self, dgamma: float, units=RADIANS):
self.rotate(dgamma, self.get_inverse_camera_rotation_matrix()[2]) self.increment_euler_angles(dgamma=dgamma, units=units)
return self return self
def add_ambient_rotation(self, angular_speed=1 * DEGREES): def add_ambient_rotation(self, angular_speed=1 * DEGREES):