public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-21 05:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Track field of view instead of focal_dist_to_height

Browse source
This commit is contained in:
Grant Sanderson 2023-01-30 15:02:33 -08:00
parent 71bd3edb09
commit af69cf9c7d
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
manimlib/camera/camera_frame.py
View file

@ -23,27 +23,21 @@ class CameraFrame(Mobject):
self, self,
frame_shape: tuple[float, float] = FRAME_SHAPE, frame_shape: tuple[float, float] = FRAME_SHAPE,
center_point: Vect3 = ORIGIN, center_point: Vect3 = ORIGIN,
focal_dist_to_height: float = 2.0, # Field of view in the y direction
fovy: float = 45 * DEGREES,
**kwargs, **kwargs,
): ):
self.frame_shape = frame_shape
self.center_point = center_point
self.focal_dist_to_height = focal_dist_to_height
self.view_matrix = np.identity(4)
self.default_orientation = Rotation.identity()
super().__init__(**kwargs) super().__init__(**kwargs)
def init_uniforms(self) -> None: self.view_matrix = np.identity(4)
super().init_uniforms() self.default_orientation = Rotation.identity()
# As a quaternion
self.uniforms["orientation"] = Rotation.identity().as_quat()
self.uniforms["focal_dist_to_height"] = self.focal_dist_to_height
def init_points(self) -> None: self.set_points(np.array([ORIGIN, LEFT, RIGHT, DOWN, UP]))
self.set_points([ORIGIN, LEFT, RIGHT, DOWN, UP]) self.set_width(frame_shape[0], stretch=True)
self.set_width(self.frame_shape[0], stretch=True) self.set_height(frame_shape[1], stretch=True)
self.set_height(self.frame_shape[1], stretch=True) self.move_to(center_point)
self.move_to(self.center_point) self.uniforms["orientation"] = Rotation.identity().as_quat()
self.uniforms["fovy"] = fovy
def set_orientation(self, rotation: Rotation): def set_orientation(self, rotation: Rotation):
self.uniforms["orientation"][:] = rotation.as_quat() self.uniforms["orientation"][:] = rotation.as_quat()
@ -155,11 +149,11 @@ class CameraFrame(Mobject):
return self return self
def set_focal_distance(self, focal_distance: float): def set_focal_distance(self, focal_distance: float):
self.uniforms["focal_dist_to_height"] = focal_distance / self.get_height() self.uniforms["fovy"] = 2 * math.atan(0.5 * self.get_height() / focal_distance)
return self return self
def set_field_of_view(self, field_of_view: float): def set_field_of_view(self, field_of_view: float):
self.uniforms["focal_dist_to_height"] = 2 * math.tan(field_of_view / 2) self.uniforms["fovy"] = field_of_view
return self return self
def get_shape(self): def get_shape(self):
@ -182,10 +176,10 @@ class CameraFrame(Mobject):
return points[4, 1] - points[3, 1] return points[4, 1] - points[3, 1]
def get_focal_distance(self) -> float: def get_focal_distance(self) -> float:
return self.uniforms["focal_dist_to_height"] * self.get_height() return 0.5 * self.get_height() / math.tan(0.5 * self.uniforms["fovy"])
def get_field_of_view(self) -> float: def get_field_of_view(self) -> float:
return 2 * math.atan(self.uniforms["focal_dist_to_height"] / 2) return self.uniforms["fovy"]
def get_implied_camera_location(self) -> np.ndarray: def get_implied_camera_location(self) -> np.ndarray:
to_camera = self.get_inverse_camera_rotation_matrix()[2] to_camera = self.get_inverse_camera_rotation_matrix()[2]