From 4c3d1f5d61fc62ea355a63f5090a9860c9310830 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Thu, 8 Mar 2018 13:55:01 -0800 Subject: [PATCH] Changed from animation.simple_animation import * to account for animation.compositions --- active_projects/WindingNumber.py | 1 + active_projects/WindingNumber_G.py | 162 ++++++++++++++----- eop/bayes.py | 1 + eop/bayes_footnote.py | 1 + eop/combinations.py | 1 + eop/independence.py | 1 + example_scenes.py | 1 + old_projects/256.py | 1 + old_projects/basel/basel.py | 1 + old_projects/basel/basel2.py | 1 + old_projects/bell.py | 1 + old_projects/borsuk.py | 1 + old_projects/brachistochrone/curves.py | 3 +- old_projects/brachistochrone/cycloid.py | 1 + old_projects/brachistochrone/graveyard.py | 1 + old_projects/brachistochrone/light.py | 1 + old_projects/brachistochrone/misc.py | 1 + old_projects/brachistochrone/multilayered.py | 1 + old_projects/brachistochrone/wordplay.py | 1 + old_projects/crypto.py | 1 + old_projects/domino_play.py | 1 + old_projects/efvgt.py | 1 + old_projects/eoc/chapter1.py | 1 + old_projects/eoc/chapter10.py | 1 + old_projects/eoc/chapter2.py | 1 + old_projects/eoc/chapter3.py | 1 + old_projects/eoc/chapter4.py | 1 + old_projects/eoc/chapter5.py | 1 + old_projects/eoc/chapter6.py | 1 + old_projects/eoc/chapter7.py | 1 + old_projects/eoc/chapter8.py | 1 + old_projects/eoc/chapter9.py | 1 + old_projects/eoc/footnote.py | 1 + old_projects/eoc/old_chapter1.py | 1 + old_projects/eola/chapter0.py | 1 + old_projects/eola/chapter1.py | 1 + old_projects/eola/chapter10.py | 1 + old_projects/eola/chapter11.py | 1 + old_projects/eola/chapter2.py | 1 + old_projects/eola/chapter3.py | 1 + old_projects/eola/chapter4.py | 1 + old_projects/eola/chapter5.py | 1 + old_projects/eola/chapter6.py | 1 + old_projects/eola/chapter7.py | 1 + old_projects/eola/chapter8.py | 1 + old_projects/eola/chapter8p2.py | 1 + old_projects/eola/chapter9.py | 1 + old_projects/eola/footnote.py | 1 + old_projects/eola/footnote2.py | 1 + old_projects/eola/thumbnails.py | 1 + old_projects/fourier.py | 1 + old_projects/fractal_charm.py | 1 + old_projects/fractal_dimension.py | 1 + old_projects/hanoi.py | 1 + old_projects/highD.py | 1 + old_projects/leibniz.py | 1 + old_projects/mug.py | 1 + old_projects/nn/part1.py | 1 + old_projects/nn/part2.py | 1 + old_projects/nn/playground.py | 1 + old_projects/patreon.py | 1 + old_projects/putnam.py | 1 + old_projects/qa_round_two.py | 1 + old_projects/tattoo.py | 1 + old_projects/triangle_of_power/end.py | 1 + old_projects/triangle_of_power/intro.py | 1 + old_projects/triangle_of_power/triangle.py | 1 + old_projects/triples.py | 1 + old_projects/uncertainty.py | 1 + old_projects/waves.py | 1 + old_projects/wcat.py | 1 + old_projects/zeta.py | 1 + topics/characters.py | 3 +- topics/light.py | 1 + topics/objects.py | 3 +- 75 files changed, 196 insertions(+), 46 deletions(-) diff --git a/active_projects/WindingNumber.py b/active_projects/WindingNumber.py index 38b573e8..7f070458 100644 --- a/active_projects/WindingNumber.py +++ b/active_projects/WindingNumber.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/active_projects/WindingNumber_G.py b/active_projects/WindingNumber_G.py index fc4b7e0a..2b5a3934 100644 --- a/active_projects/WindingNumber_G.py +++ b/active_projects/WindingNumber_G.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * @@ -31,7 +32,7 @@ from topics.graph_scene import * from active_projects.WindingNumber import * -class AltTeacherStudentScene(TeacherStudentsScene): +class AltTeacherStudentsScene(TeacherStudentsScene): def setup(self): TeacherStudentsScene.setup(self) self.teacher.set_color(YELLOW_E) @@ -39,24 +40,34 @@ class AltTeacherStudentScene(TeacherStudentsScene): ############### -class TestColorMap(ColorMappedObjectsScene): +class IntroSceneWrapper(PiCreatureScene): CONFIG = { - "func" : example_plane_func, + "default_pi_creature_kwargs" : { + "color" : YELLOW_E, + "flip_at_start" : False, + "height" : 2, + }, + "default_pi_creature_start_corner" : DOWN+LEFT, + # "default_pi_creature_height" : 1, } def construct(self): - ColorMappedObjectsScene.construct(self) - circle = Circle(color = WHITE) - circle.color_using_background_image(self.background_image_file) + morty = self.pi_creature + rect = ScreenRectangle(height = 5) + rect.to_corner(UP+RIGHT) + self.add(rect) - self.play(ShowCreation(circle)) - self.play(circle.scale, 2) - self.wait() - self.play(circle.set_fill, {"opacity" : 0.2}) - for corner in standard_rect: - self.play(circle.to_corner, corner, run_time = 2) + main_topic, meta_topic = toipcs = VGroup( + TextMobject("Main topic"), + TextMobject("Meta topic"), + ) + topics.arrange_submobjects(DOWN, aligned_edge = LEFT) -class PiCreaturesAreIntrigued(AltTeacherStudentScene): + + + + +class PiCreaturesAreIntrigued(AltTeacherStudentsScene): def construct(self): self.teacher_says( "You can extend \\\\ this to 2d", @@ -66,7 +77,7 @@ class PiCreaturesAreIntrigued(AltTeacherStudentScene): self.look_at(self.screen) self.wait(3) -class RewriteEquationWithTeacher(AltTeacherStudentScene): +class RewriteEquationWithTeacher(AltTeacherStudentsScene): def construct(self): equations = VGroup( TexMobject( @@ -157,6 +168,7 @@ class DotsHoppingToColor(Scene): (1, 2, 1), (2, -2, 1), ), + "dot_density" : 0.25, } def construct(self): input_coloring, output_coloring = self.get_colorings() @@ -212,10 +224,7 @@ class DotsHoppingToColor(Scene): Animation(input_plane), input_plane.white_parts.highlight, BLACK, input_plane.lines_to_fade.set_stroke, {"width" : 0}, - LaggedStart( - ApplyFunction, dots, - lambda dot : (lambda d : d.set_stroke(width = 0).scale(0.25), dot) - ), + FadeOut(dots), ) self.wait() @@ -224,25 +233,18 @@ class DotsHoppingToColor(Scene): right_half_block.next_to(SPACE_WIDTH*RIGHT, RIGHT) self.play(right_half_block.restore) self.wait() - self.play(LaggedStart( - ApplyMethod, dots, - lambda d : (d.shift, SMALL_BUFF*UP), - rate_func = wiggle, - )) - self.wait() - # Show red points + # Show yellow points inspector = DashedLine( ORIGIN, TAU*UP, - dashed_segment_length = TAU/12, + dashed_segment_length = TAU/24, fill_opacity = 0, stroke_width = 3, stroke_color = WHITE, ) - inspector.add(*inspector.copy().highlight(BLACK).shift((TAU/12)*UP)) + inspector.add(*inspector.copy().highlight(BLACK).shift((TAU/24)*UP)) inspector.apply_complex_function(np.exp) - inspector.show() - inspector.scale(0.1) + inspector.scale(0.15) inspector_image = inspector.copy() def point_function(point): @@ -252,27 +254,26 @@ class DotsHoppingToColor(Scene): def update_inspector_image(inspector_image): inspector_image.move_to(point_function(inspector.get_center())) - # inspector_image.points = inspector.points - # inspector_image.apply_function(point_function) inspector_image_update_anim = UpdateFromFunc( inspector_image, update_inspector_image ) - red_points_label = TextMobject("Red points") - red_points_label.highlight(BLACK) + yellow_points_label = TextMobject("Yellow points") + yellow_points_label.scale(0.7) + yellow_points_label.highlight(BLACK) self.play( - inspector.move_to, input_plane.coords_to_point(-2.5, 1.5), + inspector.move_to, input_plane.coords_to_point(1.5, 0), inspector.set_stroke, {"width" : 2}, ) - red_points_label.next_to(inspector, UP, aligned_edge = LEFT) + yellow_points_label.next_to(inspector, UP) self.play( Rotating( - inspector, about_point = inspector.get_corner(DOWN+RIGHT), + inspector, about_point = inspector.get_corner(UP+LEFT), rate_func = smooth, run_time = 2, ), - Write(red_points_label) + Write(yellow_points_label) ) self.wait() self.play(right_half_block.next_to, SPACE_WIDTH*RIGHT, RIGHT) @@ -284,7 +285,7 @@ class DotsHoppingToColor(Scene): self.play( ApplyMethod( inspector.move_to, - input_plane.coords_to_point(-1.8, -0.5), + input_plane.coords_to_point(0, 2), path_arc = -TAU/8, run_time = 3, ), @@ -293,13 +294,13 @@ class DotsHoppingToColor(Scene): self.play( ApplyMethod( inspector.move_to, - input_plane.coords_to_point(-2.7, 1.7), - path_arc = TAU/8, + input_plane.coords_to_point(2, 0), + path_arc = TAU/4, run_time = 3, ), inspector_image_update_anim ) - self.play(FadeOut(red_points_label)) + self.play(FadeOut(yellow_points_label)) # Show black zero zeros = tuple(it.starmap(input_plane.coords_to_point, [ @@ -310,13 +311,54 @@ class DotsHoppingToColor(Scene): self.play( ApplyMethod( inspector.move_to, zero, + path_arc = -TAU/8, run_time = 2, ), inspector_image_update_anim, ) self.wait() + self.play(FadeOut(VGroup(inspector, inspector_image))) + # Show all dots and slowly fade them out + for dot in dots: + dot.scale(1.5) + self.play( + FadeOut(input_coloring), + input_plane.white_parts.highlight, WHITE, + LaggedStart(GrowFromCenter, dots) + ) + self.wait() + random.shuffle(dots.submobjects) + self.play(LaggedStart( + FadeOut, dots, + lag_ratio = 0.05, + run_time = 10, + )) + # Ask about whether a region contains a zero + question = TextMobject("Does this region \\\\ contain a zero?") + question.add_background_rectangle(opacity = 1) + question.next_to(input_plane.label, DOWN) + square = Square() + square.match_background_image_file(input_coloring) + square.move_to(input_plane) + + self.play(ShowCreation(square), Write(question)) + self.wait() + quads = [ + (0, 0.5, 6, 6.25), + (1, 1, 0.5, 2), + (-1, -1, 3, 4.5), + (0, 1.25, 5, 1.7), + (-2, -1, 1, 1), + ] + for x, y, width, height in quads: + self.play( + square.stretch_to_fit_width, width, + square.stretch_to_fit_height, height, + square.move_to, input_plane.coords_to_point(x, y) + ) + self.wait() @@ -392,7 +434,7 @@ class DotsHoppingToColor(Scene): return planes def get_dots(self, input_plane, output_plane): - step = 0.25 + step = self.dot_density x_min = -3.0 x_max = 3.0 y_min = -3.0 @@ -413,7 +455,41 @@ class DotsHoppingToColor(Scene): dots.add(dot) return dots - +class SoWeFoundTheZeros(AltTeacherStudentsScene): + def construct(self): + self.student_says( + "Aha! So we \\\\ found the solutions!", + target_mode = "hooray", + student_index = 2, + bubble_kwargs = {"direction" : LEFT}, + ) + self.wait() + self.teacher_says( + "Er...only \\\\ kind of", + target_mode = "hesitant" + ) + self.wait(3) + +class PiCreatureAsksWhatWentWrong(PiCreatureScene): + def construct(self): + randy = self.pi_creature + randy.set_color(YELLOW_E) + randy.flip() + randy.to_corner(DOWN+LEFT) + question = TextMobject("What went wrong?") + question.next_to(randy, UP) + question.shift_onto_screen() + question.save_state() + question.shift(DOWN).fade(1) + + self.play(randy.change, "erm") + self.wait(2) + self.play( + Animation(VectorizedPoint(ORIGIN)), + question.restore, + randy.change, "confused", + ) + self.wait(5) diff --git a/eop/bayes.py b/eop/bayes.py index b916f2b6..3eb0469e 100644 --- a/eop/bayes.py +++ b/eop/bayes.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/eop/bayes_footnote.py b/eop/bayes_footnote.py index dd978212..f212be30 100644 --- a/eop/bayes_footnote.py +++ b/eop/bayes_footnote.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/eop/combinations.py b/eop/combinations.py index 85891823..701f19e5 100644 --- a/eop/combinations.py +++ b/eop/combinations.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/eop/independence.py b/eop/independence.py index eaabbdef..0cc28aec 100644 --- a/eop/independence.py +++ b/eop/independence.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/example_scenes.py b/example_scenes.py index d9538204..b0ffb4b0 100644 --- a/example_scenes.py +++ b/example_scenes.py @@ -15,6 +15,7 @@ from camera import Camera from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * diff --git a/old_projects/256.py b/old_projects/256.py index 2ba199cf..3e13551b 100644 --- a/old_projects/256.py +++ b/old_projects/256.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/basel/basel.py b/old_projects/basel/basel.py index 20814be5..ece1b189 100644 --- a/old_projects/basel/basel.py +++ b/old_projects/basel/basel.py @@ -10,6 +10,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.continual_animation import * from animation.playground import * diff --git a/old_projects/basel/basel2.py b/old_projects/basel/basel2.py index dd3049a9..f940c8c6 100644 --- a/old_projects/basel/basel2.py +++ b/old_projects/basel/basel2.py @@ -11,6 +11,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.continual_animation import * from animation.playground import * diff --git a/old_projects/bell.py b/old_projects/bell.py index 5ab94e62..14f5b035 100644 --- a/old_projects/bell.py +++ b/old_projects/bell.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/borsuk.py b/old_projects/borsuk.py index 218cb38d..25d6f750 100644 --- a/old_projects/borsuk.py +++ b/old_projects/borsuk.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/brachistochrone/curves.py b/old_projects/brachistochrone/curves.py index d51f4d74..7f703727 100644 --- a/old_projects/brachistochrone/curves.py +++ b/old_projects/brachistochrone/curves.py @@ -11,7 +11,8 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * -from animation.simple_animations import * +from animation.simple_animations import * +from animation.compositions import * from animation.playground import TurnInsideOut, Vibrate from topics.geometry import * from topics.characters import Randolph, Mathematician diff --git a/old_projects/brachistochrone/cycloid.py b/old_projects/brachistochrone/cycloid.py index 695a1c0d..0a51b320 100644 --- a/old_projects/brachistochrone/cycloid.py +++ b/old_projects/brachistochrone/cycloid.py @@ -12,6 +12,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import Randolph from topics.functions import * diff --git a/old_projects/brachistochrone/graveyard.py b/old_projects/brachistochrone/graveyard.py index 1e73d6ef..430670c2 100644 --- a/old_projects/brachistochrone/graveyard.py +++ b/old_projects/brachistochrone/graveyard.py @@ -12,6 +12,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import TurnInsideOut, Vibrate from topics.geometry import * from topics.characters import Randolph, Mathematician diff --git a/old_projects/brachistochrone/light.py b/old_projects/brachistochrone/light.py index 2ebc4545..8b179ddb 100644 --- a/old_projects/brachistochrone/light.py +++ b/old_projects/brachistochrone/light.py @@ -12,6 +12,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import TurnInsideOut, Vibrate from topics.geometry import * from topics.characters import Randolph, Mathematician diff --git a/old_projects/brachistochrone/misc.py b/old_projects/brachistochrone/misc.py index d3a2050f..9e21a609 100644 --- a/old_projects/brachistochrone/misc.py +++ b/old_projects/brachistochrone/misc.py @@ -11,6 +11,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import TurnInsideOut, Vibrate from topics.geometry import * from topics.characters import * diff --git a/old_projects/brachistochrone/multilayered.py b/old_projects/brachistochrone/multilayered.py index 29075d30..49fcb15c 100644 --- a/old_projects/brachistochrone/multilayered.py +++ b/old_projects/brachistochrone/multilayered.py @@ -12,6 +12,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import Randolph from topics.functions import * diff --git a/old_projects/brachistochrone/wordplay.py b/old_projects/brachistochrone/wordplay.py index cff199da..4b4eabce 100644 --- a/old_projects/brachistochrone/wordplay.py +++ b/old_projects/brachistochrone/wordplay.py @@ -13,6 +13,7 @@ from topics.three_dimensions import Stars from animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import TurnInsideOut, Vibrate from topics.geometry import * from topics.characters import Randolph, Mathematician diff --git a/old_projects/crypto.py b/old_projects/crypto.py index be3b5f0a..a53a1dfd 100644 --- a/old_projects/crypto.py +++ b/old_projects/crypto.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/domino_play.py b/old_projects/domino_play.py index d9402c6a..3090f907 100644 --- a/old_projects/domino_play.py +++ b/old_projects/domino_play.py @@ -11,6 +11,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/efvgt.py b/old_projects/efvgt.py index 2e431343..bc57cd9f 100644 --- a/old_projects/efvgt.py +++ b/old_projects/efvgt.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter1.py b/old_projects/eoc/chapter1.py index 900d82ed..13dfe4a4 100644 --- a/old_projects/eoc/chapter1.py +++ b/old_projects/eoc/chapter1.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter10.py b/old_projects/eoc/chapter10.py index eaa12d79..d412d11a 100644 --- a/old_projects/eoc/chapter10.py +++ b/old_projects/eoc/chapter10.py @@ -10,6 +10,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter2.py b/old_projects/eoc/chapter2.py index 385a3d56..29236d7f 100644 --- a/old_projects/eoc/chapter2.py +++ b/old_projects/eoc/chapter2.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter3.py b/old_projects/eoc/chapter3.py index 038d557c..117359a0 100644 --- a/old_projects/eoc/chapter3.py +++ b/old_projects/eoc/chapter3.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter4.py b/old_projects/eoc/chapter4.py index 52453904..ca61f797 100644 --- a/old_projects/eoc/chapter4.py +++ b/old_projects/eoc/chapter4.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter5.py b/old_projects/eoc/chapter5.py index 05c98beb..5f02ade3 100644 --- a/old_projects/eoc/chapter5.py +++ b/old_projects/eoc/chapter5.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter6.py b/old_projects/eoc/chapter6.py index c9fe9e73..5d32c7e1 100644 --- a/old_projects/eoc/chapter6.py +++ b/old_projects/eoc/chapter6.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter7.py b/old_projects/eoc/chapter7.py index b10df5f5..eb4b017a 100644 --- a/old_projects/eoc/chapter7.py +++ b/old_projects/eoc/chapter7.py @@ -10,6 +10,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter8.py b/old_projects/eoc/chapter8.py index 00b75026..7f420e8d 100644 --- a/old_projects/eoc/chapter8.py +++ b/old_projects/eoc/chapter8.py @@ -9,6 +9,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/chapter9.py b/old_projects/eoc/chapter9.py index a8f860b6..57eb9f80 100644 --- a/old_projects/eoc/chapter9.py +++ b/old_projects/eoc/chapter9.py @@ -10,6 +10,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/footnote.py b/old_projects/eoc/footnote.py index 0eca1562..38b2da94 100644 --- a/old_projects/eoc/footnote.py +++ b/old_projects/eoc/footnote.py @@ -10,6 +10,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eoc/old_chapter1.py b/old_projects/eoc/old_chapter1.py index da371ad4..38d642f5 100644 --- a/old_projects/eoc/old_chapter1.py +++ b/old_projects/eoc/old_chapter1.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eola/chapter0.py b/old_projects/eola/chapter0.py index eb1315dd..be09e132 100644 --- a/old_projects/eola/chapter0.py +++ b/old_projects/eola/chapter0.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eola/chapter1.py b/old_projects/eola/chapter1.py index e4e4616e..6dd2abf9 100644 --- a/old_projects/eola/chapter1.py +++ b/old_projects/eola/chapter1.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/eola/chapter10.py b/old_projects/eola/chapter10.py index 2fde6a8b..b1c65eb2 100644 --- a/old_projects/eola/chapter10.py +++ b/old_projects/eola/chapter10.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter11.py b/old_projects/eola/chapter11.py index f3ca6cbe..a38e682f 100644 --- a/old_projects/eola/chapter11.py +++ b/old_projects/eola/chapter11.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter2.py b/old_projects/eola/chapter2.py index 93ec2130..8a4575d4 100644 --- a/old_projects/eola/chapter2.py +++ b/old_projects/eola/chapter2.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter3.py b/old_projects/eola/chapter3.py index afd1fae5..345cd83a 100644 --- a/old_projects/eola/chapter3.py +++ b/old_projects/eola/chapter3.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter4.py b/old_projects/eola/chapter4.py index b29fb1f0..a31da52e 100644 --- a/old_projects/eola/chapter4.py +++ b/old_projects/eola/chapter4.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter5.py b/old_projects/eola/chapter5.py index 7e3afa8a..f5039b21 100644 --- a/old_projects/eola/chapter5.py +++ b/old_projects/eola/chapter5.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter6.py b/old_projects/eola/chapter6.py index 5a442e69..ba1d6bf0 100644 --- a/old_projects/eola/chapter6.py +++ b/old_projects/eola/chapter6.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter7.py b/old_projects/eola/chapter7.py index 3cd2e1c1..65793e7d 100644 --- a/old_projects/eola/chapter7.py +++ b/old_projects/eola/chapter7.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter8.py b/old_projects/eola/chapter8.py index 4d90daec..fbd050e4 100644 --- a/old_projects/eola/chapter8.py +++ b/old_projects/eola/chapter8.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter8p2.py b/old_projects/eola/chapter8p2.py index 77a3489d..03a01d05 100644 --- a/old_projects/eola/chapter8p2.py +++ b/old_projects/eola/chapter8p2.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/chapter9.py b/old_projects/eola/chapter9.py index c75e21e9..4f655f41 100644 --- a/old_projects/eola/chapter9.py +++ b/old_projects/eola/chapter9.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/footnote.py b/old_projects/eola/footnote.py index 58675c9e..86306685 100644 --- a/old_projects/eola/footnote.py +++ b/old_projects/eola/footnote.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/footnote2.py b/old_projects/eola/footnote2.py index 10580f08..c67e5e9e 100644 --- a/old_projects/eola/footnote2.py +++ b/old_projects/eola/footnote2.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/eola/thumbnails.py b/old_projects/eola/thumbnails.py index ae5de87a..1fda50fe 100644 --- a/old_projects/eola/thumbnails.py +++ b/old_projects/eola/thumbnails.py @@ -6,6 +6,7 @@ from mobject.vectorized_mobject import VMobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from topics.geometry import * from topics.characters import * from topics.functions import * diff --git a/old_projects/fourier.py b/old_projects/fourier.py index c725d148..3f9523ae 100644 --- a/old_projects/fourier.py +++ b/old_projects/fourier.py @@ -5,6 +5,7 @@ import scipy from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/fractal_charm.py b/old_projects/fractal_charm.py index 7b759332..11b8812e 100644 --- a/old_projects/fractal_charm.py +++ b/old_projects/fractal_charm.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/fractal_dimension.py b/old_projects/fractal_dimension.py index 1ec5520c..f1a24641 100644 --- a/old_projects/fractal_dimension.py +++ b/old_projects/fractal_dimension.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/hanoi.py b/old_projects/hanoi.py index daebf3b9..236ddcfb 100644 --- a/old_projects/hanoi.py +++ b/old_projects/hanoi.py @@ -9,6 +9,7 @@ from mobject.point_cloud_mobject import Mobject1D from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/highD.py b/old_projects/highD.py index d264876f..df34c46b 100644 --- a/old_projects/highD.py +++ b/old_projects/highD.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/leibniz.py b/old_projects/leibniz.py index c551d247..714f1fa6 100644 --- a/old_projects/leibniz.py +++ b/old_projects/leibniz.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/mug.py b/old_projects/mug.py index 2ba68d08..f58c6a6f 100644 --- a/old_projects/mug.py +++ b/old_projects/mug.py @@ -11,6 +11,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/nn/part1.py b/old_projects/nn/part1.py index 91b8884b..141d54af 100644 --- a/old_projects/nn/part1.py +++ b/old_projects/nn/part1.py @@ -13,6 +13,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/nn/part2.py b/old_projects/nn/part2.py index bde9e1ad..60d03390 100644 --- a/old_projects/nn/part2.py +++ b/old_projects/nn/part2.py @@ -12,6 +12,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/nn/playground.py b/old_projects/nn/playground.py index 918034a0..c8e68720 100644 --- a/old_projects/nn/playground.py +++ b/old_projects/nn/playground.py @@ -15,6 +15,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/patreon.py b/old_projects/patreon.py index 111e7f68..e5643cf4 100644 --- a/old_projects/patreon.py +++ b/old_projects/patreon.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/putnam.py b/old_projects/putnam.py index 809c821a..302db6f7 100644 --- a/old_projects/putnam.py +++ b/old_projects/putnam.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/qa_round_two.py b/old_projects/qa_round_two.py index 0aa2774c..a1ef9fdf 100644 --- a/old_projects/qa_round_two.py +++ b/old_projects/qa_round_two.py @@ -11,6 +11,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/tattoo.py b/old_projects/tattoo.py index 502cedce..60b43aa2 100644 --- a/old_projects/tattoo.py +++ b/old_projects/tattoo.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/triangle_of_power/end.py b/old_projects/triangle_of_power/end.py index a795ee33..7abb3289 100644 --- a/old_projects/triangle_of_power/end.py +++ b/old_projects/triangle_of_power/end.py @@ -6,6 +6,7 @@ from mobject import Mobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/triangle_of_power/intro.py b/old_projects/triangle_of_power/intro.py index f9768221..11f4ab90 100644 --- a/old_projects/triangle_of_power/intro.py +++ b/old_projects/triangle_of_power/intro.py @@ -6,6 +6,7 @@ from mobject import Mobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/triangle_of_power/triangle.py b/old_projects/triangle_of_power/triangle.py index 01387f9d..42d19266 100644 --- a/old_projects/triangle_of_power/triangle.py +++ b/old_projects/triangle_of_power/triangle.py @@ -8,6 +8,7 @@ from mobject import Mobject from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/triples.py b/old_projects/triples.py index a9bead15..82d055dc 100644 --- a/old_projects/triples.py +++ b/old_projects/triples.py @@ -9,6 +9,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/uncertainty.py b/old_projects/uncertainty.py index 80ccc2c4..96451c52 100644 --- a/old_projects/uncertainty.py +++ b/old_projects/uncertainty.py @@ -6,6 +6,7 @@ import scipy from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from animation.continual_animation import * from topics.geometry import * diff --git a/old_projects/waves.py b/old_projects/waves.py index 1315b446..104c6909 100644 --- a/old_projects/waves.py +++ b/old_projects/waves.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.continual_animation import * from animation.playground import * from topics.geometry import * diff --git a/old_projects/wcat.py b/old_projects/wcat.py index b72e1e45..a8d31b24 100644 --- a/old_projects/wcat.py +++ b/old_projects/wcat.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/old_projects/zeta.py b/old_projects/zeta.py index 064d2986..ef8f7f1c 100644 --- a/old_projects/zeta.py +++ b/old_projects/zeta.py @@ -8,6 +8,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.playground import * from topics.geometry import * from topics.characters import * diff --git a/topics/characters.py b/topics/characters.py index 434d2c3c..f21d9675 100644 --- a/topics/characters.py +++ b/topics/characters.py @@ -10,7 +10,8 @@ from topics.geometry import ScreenRectangle from animation import Animation from animation.transform import * -from animation.simple_animations import Write, ShowCreation, AnimationGroup +from animation.simple_animations import Write, ShowCreation +from animation.compositions import AnimationGroup from scene import Scene diff --git a/topics/light.py b/topics/light.py index 587d9c08..9d3f0bfe 100644 --- a/topics/light.py +++ b/topics/light.py @@ -7,6 +7,7 @@ from mobject.vectorized_mobject import * from animation.animation import Animation from animation.transform import * from animation.simple_animations import * +from animation.compositions import * from animation.continual_animation import * from animation.playground import * diff --git a/topics/objects.py b/topics/objects.py index af9607c6..76a476b8 100644 --- a/topics/objects.py +++ b/topics/objects.py @@ -6,7 +6,8 @@ from mobject.svg_mobject import SVGMobject from mobject.tex_mobject import TextMobject, TexMobject, Brace from animation import Animation -from animation.simple_animations import Rotating, LaggedStart, AnimationGroup +from animation.simple_animations import Rotating +from animation.compositions import LaggedStart, AnimationGroup from animation.transform import ApplyMethod, FadeIn, GrowFromCenter from topics.geometry import Circle, Line, Rectangle, Square, \