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

Small setup for possible shift to general camera implementation

Browse source
This commit is contained in:
Grant Sanderson 2018-06-11 10:41:04 -07:00
parent 2beb1d1220
commit 2eebaccde2
3 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
camera/moving_camera.py
View file

@ -1,13 +1,29 @@
from __future__ import absolute_import from __future__ import absolute_import
from constants import FRAME_HEIGHT from constants import FRAME_HEIGHT
from constants import FRAME_WIDTH
from constants import ORIGIN
from constants import WHITE from constants import WHITE
from camera.camera import Camera from camera.camera import Camera
from mobject.frame import ScreenRectangle from mobject.frame import ScreenRectangle
from mobject.types.vectorized_mobject import VGroup
from mobject.types.vectorized_mobject import VectorizedPoint
from utils.config_ops import digest_config from utils.config_ops import digest_config
# TODO, think about how to incorporate perspective
class CameraFrame(VGroup):
CONFIG = {
"width": FRAME_WIDTH,
"height": FRAME_HEIGHT,
"center": ORIGIN,
}
def __init__(self, **kwargs):
pass
class MovingCamera(Camera): class MovingCamera(Camera):
""" """
Stays in line with the height, width and position of it's 'frame', which is a Rectangle Stays in line with the height, width and position of it's 'frame', which is a Rectangle

43
camera/three_d_camera.py
View file

@ -4,7 +4,7 @@ import numpy as np
from constants import * from constants import *
from camera.camera import Camera from camera.moving_camera import MovingCamera
from mobject.types.vectorized_mobject import VectorizedPoint from mobject.types.vectorized_mobject import VectorizedPoint
from mobject.three_dimensions import should_shade_in_3d from mobject.three_dimensions import should_shade_in_3d
@ -15,41 +15,40 @@ from utils.space_ops import rotation_matrix
# TODO: Make sure this plays well with latest camera updates # TODO: Make sure this plays well with latest camera updates
class CameraWithPerspective(Camera): # class CameraWithPerspective(Camera):
CONFIG = { # CONFIG = {
"camera_distance": 20, # "camera_distance": 20,
} # }
def points_to_pixel_coords(self, points): # def points_to_pixel_coords(self, points):
distance_ratios = np.divide( # distance_ratios = np.divide(
self.camera_distance, # self.camera_distance,
self.camera_distance - points[:, 2] # self.camera_distance - points[:, 2]
) # )
scale_factors = interpolate(0, 1, distance_ratios) # scale_factors = interpolate(0, 1, distance_ratios)
adjusted_points = np.array(points) # adjusted_points = np.array(points)
for i in 0, 1: # for i in 0, 1:
adjusted_points[:, i] *= scale_factors # adjusted_points[:, i] *= scale_factors
return Camera.points_to_pixel_coords(self, adjusted_points) # return Camera.points_to_pixel_coords(self, adjusted_points)
class ThreeDCamera(CameraWithPerspective): class ThreeDCamera(MovingCamera):
CONFIG = { CONFIG = {
"sun_vect": 5 * UP + LEFT, "sun_vect": 5 * UP + LEFT,
"shading_factor": 0.2, "shading_factor": 0.2,
"distance": 5., "distance": 5.,
"default_distance": 5.,
"phi": 0, # Angle off z axis "phi": 0, # Angle off z axis
"theta": -TAU / 4, # Rotation about z axis "theta": -TAU / 4, # Rotation about z axis
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Camera.__init__(self, *args, **kwargs) MovingCamera.__init__(self, *args, **kwargs)
self.unit_sun_vect = self.sun_vect / np.linalg.norm(self.sun_vect) self.unit_sun_vect = self.sun_vect / np.linalg.norm(self.sun_vect)
# rotation_mobject lives in the phi-theta-distance space # rotation_mobject lives in the phi-theta-distance space
# TODO, use ValueTracker for this instead # TODO, use ValueTracker for this instead
self.rotation_mobject = VectorizedPoint() self.rotation_mobject = VectorizedPoint()
# moving_center lives in the x-y-z space # Moving_center lives in the x-y-z space
# It representes the center of rotation # It representes the center of rotation
self.moving_center = VectorizedPoint(self.frame_center) self.moving_center = VectorizedPoint(self.frame_center)
self.set_position(self.phi, self.theta, self.distance) self.set_position(self.phi, self.theta, self.distance)
@ -88,9 +87,9 @@ class ThreeDCamera(CameraWithPerspective):
return normal / length return normal / length
def display_multiple_vectorized_mobjects(self, vmobjects): def display_multiple_vectorized_mobjects(self, vmobjects):
camera_point = self.spherical_coords_to_point( # camera_point = self.spherical_coords_to_point(
*self.get_spherical_coords() # *self.get_spherical_coords()
) # )
def z_cmp(*vmobs): def z_cmp(*vmobs):
# Compare to three dimensional mobjects based on # Compare to three dimensional mobjects based on

6
scene/three_d_scene.py
View file

@ -18,8 +18,10 @@ class ThreeDScene(Scene):
def set_camera_position(self, phi=None, theta=None, distance=None, def set_camera_position(self, phi=None, theta=None, distance=None,
center_x=None, center_y=None, center_z=None): center_x=None, center_y=None, center_z=None):
self.camera.set_position(phi, theta, distance, self.camera.set_position(
center_x, center_y, center_z) phi, theta, distance,
center_x, center_y, center_z
)
def begin_ambient_camera_rotation(self, rate=0.01): def begin_ambient_camera_rotation(self, rate=0.01):
self.ambient_camera_rotation = ContinualMovement( self.ambient_camera_rotation = ContinualMovement(