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

cleanup in ScreenShapingScene, in prep for 3D scene

Browse source
This commit is contained in:
Ben Hambrecht 2018-02-16 17:53:55 +01:00
parent c2468865e2
commit 79fe27a16e
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
active_projects/basel.py
View file

@ -1001,7 +1001,6 @@ class ScreenShapingScene(ThreeDScene):
def construct(self): def construct(self):
self.force_skipping()
self.setup_elements() self.setup_elements()
self.deform_screen() self.deform_screen()
self.create_brightness_rect() self.create_brightness_rect()
@ -1011,7 +1010,6 @@ class ScreenShapingScene(ThreeDScene):
self.add_distance_arrow() self.add_distance_arrow()
self.right_shift_screen_while_showing_light_indicator_and_distance_arrow() self.right_shift_screen_while_showing_light_indicator_and_distance_arrow()
self.left_shift_again() self.left_shift_again()
self.revert_to_original_skipping_status()
self.morph_into_3d() self.morph_into_3d()
@ -1027,10 +1025,9 @@ class ScreenShapingScene(ThreeDScene):
self.screen = Line([3,-self.screen_height/2,0],[3,self.screen_height/2,0], self.screen = Line([3,-self.screen_height/2,0],[3,self.screen_height/2,0],
path_arc = 0, num_arc_anchors = 10) path_arc = 0, num_arc_anchors = 10)
# light source # light source
self.light_source = LightSource( self.light_source = LightSource(
opacity_function = inverse_quadratic(1,5,1), opacity_function = inverse_quadratic(1,2,1),
num_levels = NUM_LEVELS, num_levels = NUM_LEVELS,
radius = 10, radius = 10,
#screen = self.screen #screen = self.screen
@ -1043,8 +1040,6 @@ class ScreenShapingScene(ThreeDScene):
self.spotlight = self.light_source.spotlight self.spotlight = self.light_source.spotlight
self.lighthouse = self.light_source.lighthouse self.lighthouse = self.light_source.lighthouse
screen_tracker = ScreenTracker(self.light_source)
self.add(screen_tracker,self.light_source.shadow)
#self.add_foreground_mobject(self.light_source.shadow) #self.add_foreground_mobject(self.light_source.shadow)
@ -1052,24 +1047,26 @@ class ScreenShapingScene(ThreeDScene):
self.morty = Mortimer().scale(0.3).next_to(self.screen, RIGHT, buff = 0.5) self.morty = Mortimer().scale(0.3).next_to(self.screen, RIGHT, buff = 0.5)
# Add everything to the scene # Add everything to the scene
self.add(self.ambient_light, self.lighthouse) self.add(self.lighthouse)
#self.add_foreground_mobject(self.morty)
self.wait() self.wait()
self.play(FadeIn(self.screen)) self.play(FadeIn(self.screen))
self.wait() self.wait()
self.add_foreground_mobject(self.screen) self.add_foreground_mobject(self.screen)
self.add_foreground_mobject(self.morty)
self.play(SwitchOn(self.ambient_light))
dimmed_ambient_light = self.ambient_light.copy()
dimmed_ambient_light.dimming(AMBIENT_DIMMED)
#self.light_source.set_max_opacity_spotlight(0.001)
self.play( self.play(
self.light_source.set_max_opacity_spotlight,1.0, # this hides Morty for a moment, why? SwitchOn(self.spotlight),
Transform(self.ambient_light,dimmed_ambient_light), self.light_source.dim_ambient
FadeIn(self.light_source.shadow),
) )
screen_tracker = ScreenTracker(self.light_source)
self.add(screen_tracker)
self.wait() self.wait()
@ -1227,7 +1224,7 @@ class ScreenShapingScene(ThreeDScene):
self.play( self.play(
ReplacementTransform(self.arrow,self.new_arrow), ReplacementTransform(self.arrow,self.new_arrow),
ApplyMethod(self.screen.shift,[self.distance_to_source,0,0]), ApplyMethod(self.screen.shift,[self.distance_to_source,0,0]),
#ApplyMethod(self.indicator.shift,[self.left_shift,0,0]), ApplyMethod(self.indicator.shift,[self.left_shift,0,0]),
ApplyMethod(self.indicator.set_intensity,self.indicator_intensity), ApplyMethod(self.indicator.set_intensity,self.indicator_intensity),
# this should trigger ChangingDecimal, but it doesn't # this should trigger ChangingDecimal, but it doesn't
@ -1275,22 +1272,27 @@ class ScreenShapingScene(ThreeDScene):
projection_direction = self.camera.spherical_coords_to_point(phi1,theta1, 1) projection_direction = self.camera.spherical_coords_to_point(phi1,theta1, 1)
new_screen0 = Rectangle(height = self.screen_height, new_screen0 = Rectangle(height = self.screen_height,
width = 3, stroke_color = RED) width = 0.1, stroke_color = RED)
new_screen0.rotate(TAU/4,axis = DOWN) new_screen0.rotate(TAU/4,axis = DOWN)
new_screen0.move_to(self.screen.get_center()) new_screen0.move_to(self.screen.get_center())
self.add(new_screen0) self.add(new_screen0)
self.remove(self.screen) self.remove(self.screen)
self.light_source.set_screen(new_screen0) self.light_source.set_screen(new_screen0)
self.light_source.set_camera(self.camera)
new_screen = new_screen0.deepcopy() new_screen = new_screen0.deepcopy()
new_screen.width = new_screen.height new_screen.width = new_screen.height
self.play(Transform(new_screen0,new_screen))
self.play( self.play(
ApplyMethod(self.camera.rotation_mobject.move_to, camera_target_point), ApplyMethod(self.camera.rotation_mobject.move_to, camera_target_point),
) )
#self.play(Transform(new_screen0,new_screen))
self.wait() self.wait()