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

Fix get_perspective_transform to shift before rotation

Browse source
This commit is contained in:
Grant Sanderson 2023-01-18 13:59:50 -08:00
parent 6c2544098b
commit cd3c5031fa
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
manimlib/camera/camera.py
View file

@ -84,9 +84,17 @@ class CameraFrame(Mobject):
return self.get_orientation().as_matrix().T return self.get_orientation().as_matrix().T
def get_perspective_transform(self): def get_perspective_transform(self):
self.perspective_transform[:3, :3] = self.get_inverse_camera_rotation_matrix() """
self.perspective_transform[:3, 3] = -self.get_center() Returns a 4x4 for the affine transformation mapping a point
return self.perspective_transform into the camera's internal coordinate system
"""
result = self.perspective_transform
result[:] = np.identity(4)
result[:3, 3] = -self.get_center()
rotation = np.identity(4)
rotation[:3, :3] = self.get_inverse_camera_rotation_matrix()
result[:] = np.dot(rotation, result)
return result
def rotate(self, angle: float, axis: np.ndarray = OUT, **kwargs): def rotate(self, angle: float, axis: np.ndarray = OUT, **kwargs):
rot = Rotation.from_rotvec(angle * normalize(axis)) rot = Rotation.from_rotvec(angle * normalize(axis))
@ -215,6 +223,7 @@ class Camera(object):
self.background_rgba: list[float] = list(color_to_rgba( self.background_rgba: list[float] = list(color_to_rgba(
background_color, background_opacity background_color, background_opacity
)) ))
self.perspective_uniforms = dict()
self.init_frame(**frame_config) self.init_frame(**frame_config)
self.init_context(ctx) self.init_context(ctx)
self.init_shaders() self.init_shaders()
@ -499,14 +508,14 @@ class Camera(object):
cam_pos = self.frame.get_implied_camera_location() cam_pos = self.frame.get_implied_camera_location()
frame_shape = frame.get_shape() frame_shape = frame.get_shape()
self.perspective_uniforms = { self.perspective_uniforms.update(
"frame_shape": frame_shape, frame_shape=frame_shape,
"pixel_size": frame_shape[0] / self.get_pixel_shape()[0], pixel_size=frame_shape[0] / self.get_pixel_shape()[0],
"perspective": tuple(perspective_transform.T.flatten()), perspective=tuple(perspective_transform.T.flatten()),
"camera_position": tuple(cam_pos), camera_position=tuple(cam_pos),
"light_position": tuple(light_pos), light_position=tuple(light_pos),
"focal_distance": frame.get_focal_distance(), focal_distance=frame.get_focal_distance(),
} )
def init_textures(self) -> None: def init_textures(self) -> None:
self.n_textures: int = 0 self.n_textures: int = 0