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

Better ambient camera movements for ThreeDScenes

Browse source
This commit is contained in:
Grant Sanderson 2017-08-24 23:12:06 -07:00
parent 06996a7adb
commit 5071d8c872
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
topics/three_dimensions.py
View file

@ -30,7 +30,7 @@ class ThreeDCamera(CameraWithPerspective):
"shading_factor" : 0.5, "shading_factor" : 0.5,
"distance" : 5, "distance" : 5,
"phi" : 0, #Angle off z axis "phi" : 0, #Angle off z axis
"theta" : 0, #Rotation about z axis "theta" : -np.pi/2, #Rotation about z axis
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Camera.__init__(self, *args, **kwargs) Camera.__init__(self, *args, **kwargs)
@ -41,7 +41,7 @@ class ThreeDCamera(CameraWithPerspective):
def get_color(self, method): def get_color(self, method):
color = method() color = method()
vmobject = method.im_self vmobject = method.im_self
if is_3d(vmobject): if should_shade_in_3d(vmobject):
return Color(rgb = self.get_shaded_rgb( return Color(rgb = self.get_shaded_rgb(
color_to_rgb(color), color_to_rgb(color),
normal_vect = self.get_unit_normal_vect(vmobject) normal_vect = self.get_unit_normal_vect(vmobject)
@ -80,7 +80,7 @@ class ThreeDCamera(CameraWithPerspective):
def z_cmp(*vmobs): def z_cmp(*vmobs):
#Compare to three dimensional mobjects based on their #Compare to three dimensional mobjects based on their
#z value, otherwise don't compare. #z value, otherwise don't compare.
three_d_status = map(is_3d, vmobs) three_d_status = map(should_shade_in_3d, vmobs)
has_points = [vm.get_num_points() > 0 for vm in vmobs] has_points = [vm.get_num_points() > 0 for vm in vmobs]
if all(three_d_status) and all(has_points): if all(three_d_status) and all(has_points):
cmp_vect = self.get_unit_normal_vect(vmobs[1]) cmp_vect = self.get_unit_normal_vect(vmobs[1])
@ -128,7 +128,7 @@ class ThreeDCamera(CameraWithPerspective):
def get_view_transformation_matrix(self): def get_view_transformation_matrix(self):
return np.dot( return np.dot(
rotation_matrix(self.get_phi(), LEFT), rotation_matrix(self.get_phi(), LEFT),
rotation_about_z(self.get_theta()), rotation_about_z(-self.get_theta() - np.pi/2),
) )
def points_to_pixel_coords(self, points): def points_to_pixel_coords(self, points):
@ -144,7 +144,7 @@ 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):
self.camera.set_position(phi, theta, distance) self.camera.set_position(phi, theta, distance)
def begin_ambient_camera_rotation(self, rate = -0.02*np.pi): def begin_ambient_camera_rotation(self, rate = -0.01*np.pi):
self.ambient_camera_rotation = AmbientRotation( self.ambient_camera_rotation = AmbientRotation(
self.camera.position_mobject, self.camera.position_mobject,
axis = OUT, axis = OUT,
@ -159,7 +159,6 @@ class ThreeDScene(Scene):
**kwargs **kwargs
): ):
target_point = self.camera.spherical_coords_to_point(phi, theta, distance) target_point = self.camera.spherical_coords_to_point(phi, theta, distance)
print phi, theta, distance
movement = ApplyMethod( movement = ApplyMethod(
self.camera.position_mobject.move_to, self.camera.position_mobject.move_to,
target_point, target_point,
@ -177,23 +176,19 @@ class ThreeDScene(Scene):
return moving + static, [] return moving + static, []
return moving, static return moving, static
############## ##############
def is_3d(mobject): def should_shade_in_3d(mobject):
return hasattr(mobject, "part_of_3d_mobject") return hasattr(mobject, "shade_in_3d")
def make_3d(mobject): def shade_in_3d(mobject):
for submob in mobject.submobject_family(): for submob in mobject.submobject_family():
submob.part_of_3d_mobject = True submob.shade_in_3d = True
class ThreeDMobject(VMobject): class ThreeDMobject(VMobject):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
VMobject.__init__(self, *args, **kwargs) VMobject.__init__(self, *args, **kwargs)
for submobject in self.submobject_family(): shade_in_3d(self)
submobject.part_of_3d_mobject = True
class Cube(ThreeDMobject): class Cube(ThreeDMobject):
CONFIG = { CONFIG = {