A community-maintained Python framework for creating mathematical animations.
Changed several files to conform to PEP8
Grant Sanderson73433823ced9
diff --git a/animation/creation.py b/animation/creation.pyindex e345f893b..a0417b80b 100644--- a/animation/creation.py+++ b/animation/creation.py@@ -15,7 +15,8 @@ from utils.paths import counterclockwise_pathfrom utils.rate_functions import double_smoothfrom utils.rate_functions import smooth-#Drawing+# Drawing+class ShowPartial(Animation):def update_submobject(self, submobject, starting_submobject, alpha):@@ -26,26 +27,31 @@ class ShowPartial(Animation):def get_bounds(self, alpha):raise Exception("Not Implemented")+class ShowCreation(ShowPartial):CONFIG = {- "submobject_mode" : "one_at_a_time",+ "submobject_mode": "one_at_a_time",}+def get_bounds(self, alpha):return (0, alpha)+class Uncreate(ShowCreation):CONFIG = {- "rate_func" : lambda t : smooth(1-t),- "remover" : True+ "rate_func": lambda t: smooth(1 - t),+ "remover": True}+class Write(ShowCreation):CONFIG = {- "rate_func" : None,- "submobject_mode" : "lagged_start",+ "rate_func": None,+ "submobject_mode": "lagged_start",}+def __init__(self, mob_or_text, **kwargs):- digest_config(self, kwargs)+ digest_config(self, kwargs)if isinstance(mob_or_text, str):mobject = TextMobject(mob_or_text)else:@@ -67,13 +73,15 @@ class Write(ShowCreation):else:self.run_time = 2+class DrawBorderThenFill(Animation):CONFIG = {- "run_time" : 2,- "stroke_width" : 2,- "stroke_color" : None,- "rate_func" : double_smooth,+ "run_time": 2,+ "stroke_width": 2,+ "stroke_color": None,+ "rate_func": double_smooth,}+def __init__(self, vmobject, **kwargs):if not isinstance(vmobject, VMobject):raise Exception("DrawBorderThenFill only works for VMobjects")@@ -82,59 +90,64 @@ class DrawBorderThenFill(Animation):def update_submobject(self, submobject, starting_submobject, alpha):submobject.pointwise_become_partial(- starting_submobject, 0, min(2*alpha, 1)+ starting_submobject, 0, min(2 * alpha, 1))if alpha < 0.5:if self.stroke_color:- color = self.stroke_color+ color = self.stroke_colorelif starting_submobject.stroke_width > 0:color = starting_submobject.get_stroke_color()else:color = starting_submobject.get_color()- submobject.set_stroke(color, width = self.stroke_width)- submobject.set_fill(opacity = 0)+ submobject.set_stroke(color, width=self.stroke_width)+ submobject.set_fill(opacity=0)else:if not self.reached_halfway_point_before:self.reached_halfway_point_before = Truesubmobject.points = np.array(starting_submobject.points)width, opacity = [- interpolate(start, end, 2*alpha - 1)+ interpolate(start, end, 2 * alpha - 1)for start, end in [(self.stroke_width, starting_submobject.get_stroke_width()),(0, starting_submobject.get_fill_opacity())]]- submobject.set_stroke(width = width)- submobject.set_fill(opacity = opacity)+ submobject.set_stroke(width=width)+ submobject.set_fill(opacity=opacity)++# Fading-#Fadingclass FadeOut(Transform):CONFIG = {- "remover" : True,+ "remover": True,}+def __init__(self, mobject, **kwargs):target = mobject.copy()target.fade(1)Transform.__init__(self, mobject, target, **kwargs)- def clean_up(self, surrounding_scene = None):+ def clean_up(self, surrounding_scene=None):Transform.clean_up(self, surrounding_scene)self.update(0)+class FadeIn(Transform):def __init__(self, mobject, **kwargs):target = mobject.copy()Transform.__init__(self, mobject, target, **kwargs)self.starting_mobject.fade(1)if isinstance(self.starting_mobject, VMobject):- self.starting_mobject.set_stroke(width = 0)- self.starting_mobject.set_fill(opacity = 0)+ self.starting_mobject.set_stroke(width=0)+ self.starting_mobject.set_fill(opacity=0)+class FadeInAndShiftFromDirection(Transform):CONFIG = {- "direction" : DOWN,+ "direction": DOWN,}+def __init__(self, mobject, **kwargs):digest_config(self, kwargs)target = mobject.copy()@@ -142,19 +155,23 @@ class FadeInAndShiftFromDirection(Transform):mobject.fade(1)Transform.__init__(self, mobject, target, **kwargs)+class FadeInFromDown(FadeInAndShiftFromDirection):"""Essential a more convenient form of FadeInAndShiftFromDirection"""CONFIG = {- "direction" : DOWN,+ "direction": DOWN,}-#Growing+# Growing++class GrowFromPoint(Transform):CONFIG = {- "point_color" : None,+ "point_color": None,}+def __init__(self, mobject, point, **kwargs):digest_config(self, kwargs)target = mobject.copy()@@ -165,19 +182,23 @@ class GrowFromPoint(Transform):mobject.set_color(point_mob.get_color())Transform.__init__(self, mobject, target, **kwargs)+class GrowFromCenter(GrowFromPoint):def __init__(self, mobject, **kwargs):GrowFromPoint.__init__(self, mobject, mobject.get_center(), **kwargs)+class GrowArrow(GrowFromPoint):def __init__(self, arrow, **kwargs):GrowFromPoint.__init__(self, arrow, arrow.get_start(), **kwargs)+class SpinInFromNothing(GrowFromCenter):CONFIG = {- "path_func" : counterclockwise_path()+ "path_func": counterclockwise_path()}+class ShrinkToCenter(Transform):def __init__(self, mobject, **kwargs):Transform.__init__(diff --git a/for_3b1b_videos/pi_creature_scene.py b/for_3b1b_videos/pi_creature_scene.pyindex ba84a55d1..220e58a7b 100644--- a/for_3b1b_videos/pi_creature_scene.py+++ b/for_3b1b_videos/pi_creature_scene.py@@ -25,17 +25,19 @@ from scene.scene import Scenefrom utils.rate_functions import squish_rate_funcfrom utils.rate_functions import there_and_back+class PiCreatureScene(Scene):CONFIG = {- "total_wait_time" : 0,- "seconds_to_blink" : 3,- "pi_creatures_start_on_screen" : True,- "default_pi_creature_kwargs" : {- "color" : GREY_BROWN,- "flip_at_start" : True,+ "total_wait_time": 0,+ "seconds_to_blink": 3,+ "pi_creatures_start_on_screen": True,+ "default_pi_creature_kwargs": {+ "color": GREY_BROWN,+ "flip_at_start": True,},- "default_pi_creature_start_corner" : DOWN+LEFT,+ "default_pi_creature_start_corner": DOWN + LEFT,}+def setup(self):self.pi_creatures = self.create_pi_creatures()self.pi_creature = self.get_primary_pi_creature()@@ -43,7 +45,7 @@ class PiCreatureScene(Scene):self.add(*self.pi_creatures)def create_pi_creatures(self):- """+ """Likely updated for subclasses"""return VGroup(self.create_pi_creature())@@ -66,7 +68,7 @@ class PiCreatureScene(Scene):def get_on_screen_pi_creatures(self):mobjects = self.get_mobjects()return VGroup(*filter(- lambda pi : pi in mobjects,+ lambda pi: pi in mobjects,self.get_pi_creatures()))@@ -80,7 +82,7 @@ class PiCreatureScene(Scene):bubble_class = kwargs.pop("bubble_class", SpeechBubble)target_mode = kwargs.pop(- "target_mode",+ "target_mode","thinking" if bubble_class is ThoughtBubble else "speaking")bubble_kwargs = kwargs.pop("bubble_kwargs", {})@@ -91,10 +93,11 @@ class PiCreatureScene(Scene):on_screen_mobjects = self.camera.extract_mobject_family_members(self.get_mobjects())+def has_bubble(pi):return hasattr(pi, "bubble") and \- pi.bubble is not None and \- pi.bubble in on_screen_mobjects+ pi.bubble is not None and \+ pi.bubble in on_screen_mobjectspi_creatures_with_bubbles = filter(has_bubble, self.get_pi_creatures())if pi_creature in pi_creatures_with_bubbles:@@ -102,7 +105,7 @@ class PiCreatureScene(Scene):old_bubble = pi_creature.bubblebubble = pi_creature.get_bubble(*content,- bubble_class = bubble_class,+ bubble_class=bubble_class,**bubble_kwargs)anims += [@@ -114,9 +117,9 @@ class PiCreatureScene(Scene):anims.append(PiCreatureBubbleIntroduction(pi_creature,*content,- bubble_class = bubble_class,- bubble_kwargs = bubble_kwargs,- target_mode = target_mode,+ bubble_class=bubble_class,+ bubble_kwargs=bubble_kwargs,+ target_mode=target_mode,**kwargs))anims += [@@ -130,26 +133,28 @@ class PiCreatureScene(Scene):def pi_creature_says(self, *args, **kwargs):self.introduce_bubble(*args,- bubble_class = SpeechBubble,+ bubble_class=SpeechBubble,**kwargs)def pi_creature_thinks(self, *args, **kwargs):self.introduce_bubble(*args,- bubble_class = ThoughtBubble,+ bubble_class=ThoughtBubble,**kwargs)def say(self, *content, **kwargs):- self.pi_creature_says(self.get_primary_pi_creature(), *content, **kwargs)+ self.pi_creature_says(+ self.get_primary_pi_creature(), *content, **kwargs)def think(self, *content, **kwargs):- self.pi_creature_thinks(self.get_primary_pi_creature(), *content, **kwargs)+ self.pi_creature_thinks(+ self.get_primary_pi_creature(), *content, **kwargs)def compile_play_args_to_animation_list(self, *args):"""- Add animations so that all pi creatures look at the+ Add animations so that all pi creatures look at thefirst mobject being animated with each .play call"""animations = Scene.compile_play_args_to_animation_list(self, *args)@@ -157,13 +162,13 @@ class PiCreatureScene(Scene):return animationsnon_pi_creature_anims = filter(- lambda anim : anim.mobject not in self.get_pi_creatures(),+ lambda anim: anim.mobject not in self.get_pi_creatures(),animations)if len(non_pi_creature_anims) == 0:return animationsfirst_anim = non_pi_creature_anims[0]- #Look at ending state+ # Look at ending statefirst_anim.update(1)point_of_interest = first_anim.mobject.get_center()first_anim.update(0)@@ -174,7 +179,7 @@ class PiCreatureScene(Scene):if pi_creature in first_anim.mobject.submobject_family():continueanims_with_pi_creature = filter(- lambda anim : pi_creature in anim.mobject.submobject_family(),+ lambda anim: pi_creature in anim.mobject.submobject_family(),animations)for anim in anims_with_pi_creature:@@ -193,7 +198,7 @@ class PiCreatureScene(Scene):def blink(self):self.play(Blink(random.choice(self.get_on_screen_pi_creatures())))- def joint_blink(self, pi_creatures = None, shuffle = True, **kwargs):+ def joint_blink(self, pi_creatures=None, shuffle=True, **kwargs):if pi_creatures is None:pi_creatures = self.get_on_screen_pi_creatures()creatures_list = list(pi_creatures)@@ -202,25 +207,25 @@ class PiCreatureScene(Scene):def get_rate_func(pi):index = creatures_list.index(pi)- proportion = float(index)/len(creatures_list)- start_time = 0.8*proportion+ proportion = float(index) / len(creatures_list)+ start_time = 0.8 * proportionreturn squish_rate_func(there_and_back,start_time, start_time + 0.2)self.play(*[- Blink(pi, rate_func = get_rate_func(pi), **kwargs)+ Blink(pi, rate_func=get_rate_func(pi), **kwargs)for pi in creatures_list])return self- def wait(self, time = 1, blink = True):+ def wait(self, time=1, blink=True):while time >= 1:- time_to_blink = self.total_wait_time%self.seconds_to_blink == 0+ time_to_blink = self.total_wait_time % self.seconds_to_blink == 0if blink and self.any_pi_creatures_on_screen() and time_to_blink:self.blink()- self.num_plays -= 1 #This shouldn't count as an animation+ self.num_plays -= 1 # This shouldn't count as an animationelse:self.non_blink_wait()time -= 1@@ -229,14 +234,14 @@ class PiCreatureScene(Scene):self.non_blink_wait(time)return self- def non_blink_wait(self, time = 1):+ def non_blink_wait(self, time=1):Scene.wait(self, time)return selfdef change_mode(self, mode):self.play(self.get_primary_pi_creature().change_mode, mode)- def look_at(self, thing_to_look_at, pi_creatures = None):+ def look_at(self, thing_to_look_at, pi_creatures=None):if pi_creatures is None:pi_creatures = self.get_pi_creatures()self.play(*it.chain(*[@@ -244,30 +249,33 @@ class PiCreatureScene(Scene):for pi in pi_creatures]))+class TeacherStudentsScene(PiCreatureScene):CONFIG = {- "student_colors" : [BLUE_D, BLUE_E, BLUE_C],- "student_scale_factor" : 0.8,- "seconds_to_blink" : 2,- "screen_height" : 3,+ "student_colors": [BLUE_D, BLUE_E, BLUE_C],+ "student_scale_factor": 0.8,+ "seconds_to_blink": 2,+ "screen_height": 3,}+def setup(self):PiCreatureScene.setup(self)- self.screen = ScreenRectangle(height = self.screen_height)- self.screen.to_corner(UP+LEFT)- self.hold_up_spot = self.teacher.get_corner(UP+LEFT) + MED_LARGE_BUFF*UP+ self.screen = ScreenRectangle(height=self.screen_height)+ self.screen.to_corner(UP + LEFT)+ self.hold_up_spot = self.teacher.get_corner(+ UP + LEFT) + MED_LARGE_BUFF * UPdef create_pi_creatures(self):self.teacher = Mortimer()self.teacher.to_corner(DOWN + RIGHT)- self.teacher.look(DOWN+LEFT)+ self.teacher.look(DOWN + LEFT)self.students = VGroup(*[- Randolph(color = c)+ Randolph(color=c)for c in self.student_colors])self.students.arrange_submobjects(RIGHT)self.students.scale(self.student_scale_factor)- self.students.to_corner(DOWN+LEFT)+ self.students.to_corner(DOWN + LEFT)self.teacher.look_at(self.students[-1].eyes)for student in self.students:student.look_at(self.teacher.eyes)@@ -288,8 +296,8 @@ class TeacherStudentsScene(PiCreatureScene):def student_says(self, *content, **kwargs):if "target_mode" not in kwargs:target_mode = random.choice([- "raise_right_hand",- "raise_left_hand",+ "raise_right_hand",+ "raise_left_hand",])kwargs["target_mode"] = target_modestudent = self.get_students()[kwargs.get("student_index", 1)]@@ -307,7 +315,7 @@ class TeacherStudentsScene(PiCreatureScene):return self.pi_creature_thinks(student, *content, **kwargs)def change_all_student_modes(self, mode, **kwargs):- self.change_student_modes(*[mode]*len(self.students), **kwargs)+ self.change_student_modes(*[mode] * len(self.students), **kwargs)def change_student_modes(self, *modes, **kwargs):added_anims = kwargs.pop("added_anims", [])@@ -326,12 +334,12 @@ class TeacherStudentsScene(PiCreatureScene):pi.look_at(kwargs["look_at_arg"])submobject_mode = kwargs.get("submobject_mode", "lagged_start")return Transform(- start, target,- submobject_mode = submobject_mode,- run_time = 2+ start, target,+ submobject_mode=submobject_mode,+ run_time=2)- def zoom_in_on_thought_bubble(self, bubble = None, radius = FRAME_Y_RADIUS+FRAME_X_RADIUS):+ def zoom_in_on_thought_bubble(self, bubble=None, radius=FRAME_Y_RADIUS + FRAME_X_RADIUS):if bubble is None:for pi in self.get_pi_creatures():if hasattr(pi, "bubble") and isinstance(pi.bubble, ThoughtBubble):@@ -340,15 +348,16 @@ class TeacherStudentsScene(PiCreatureScene):if bubble is None:raise Exception("No pi creatures have a thought bubble")vect = -bubble.get_bubble_center()+def func(point):- centered = point+vect- return radius*centered/np.linalg.norm(centered)+ centered = point + vect+ return radius * centered / np.linalg.norm(centered)self.play(*[ApplyPointwiseFunction(func, mob)for mob in self.get_mobjects()])- def teacher_holds_up(self, mobject, target_mode = "raise_right_hand", **kwargs):+ def teacher_holds_up(self, mobject, target_mode="raise_right_hand", **kwargs):mobject.move_to(self.hold_up_spot, DOWN)mobject.shift_onto_screen()mobject_copy = mobject.copy()@@ -358,5 +367,3 @@ class TeacherStudentsScene(PiCreatureScene):ReplacementTransform(mobject_copy, mobject),self.teacher.change, target_mode,)--diff --git a/mobject/matrix.py b/mobject/matrix.pyindex cf20f6ded..e763032a4 100644--- a/mobject/matrix.py+++ b/mobject/matrix.py@@ -12,12 +12,13 @@ from constants import *VECTOR_LABEL_SCALE_FACTOR = 0.8+def matrix_to_tex_string(matrix):matrix = np.array(matrix).astype("string")if matrix.ndim == 1:matrix = matrix.reshape((matrix.size, 1))n_rows, n_cols = matrix.shape- prefix = "\\left[ \\begin{array}{%s}"%("c"*n_cols)+ prefix = "\\left[ \\begin{array}{%s}" % ("c" * n_cols)suffix = "\\end{array} \\right]"rows = [" & ".join(row)@@ -25,39 +26,43 @@ def matrix_to_tex_string(matrix):]return prefix + " \\\\ ".join(rows) + suffix+def matrix_to_mobject(matrix):return TexMobject(matrix_to_tex_string(matrix))-def vector_coordinate_label(vector_mob, integer_labels = True,- n_dim = 2, color = WHITE):++def vector_coordinate_label(vector_mob, integer_labels=True,+ n_dim=2, color=WHITE):vect = np.array(vector_mob.get_end())if integer_labels:vect = np.round(vect).astype(int)vect = vect[:n_dim]vect = vect.reshape((n_dim, 1))- label = Matrix(vect, add_background_rectangles = True)+ label = Matrix(vect, add_background_rectangles=True)label.scale(VECTOR_LABEL_SCALE_FACTOR)shift_dir = np.array(vector_mob.get_end())- if shift_dir[0] >= 0: #Pointing right- shift_dir -= label.get_left() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER*LEFT- else: #Pointing left- shift_dir -= label.get_right() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER*RIGHT+ if shift_dir[0] >= 0: # Pointing right+ shift_dir -= label.get_left() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * LEFT+ else: # Pointing left+ shift_dir -= label.get_right() + DEFAULT_MOBJECT_TO_MOBJECT_BUFFER * RIGHTlabel.shift(shift_dir)label.set_color(color)label.rect = BackgroundRectangle(label)label.add_to_back(label.rect)return label+class Matrix(VMobject):CONFIG = {- "v_buff" : 0.5,- "h_buff" : 1,- "add_background_rectangles" : False+ "v_buff": 0.5,+ "h_buff": 1,+ "add_background_rectangles": False}+def __init__(self, matrix, **kwargs):"""- Matrix can either either include numbres, tex_strings,+ Matrix can either either include numbres, tex_strings,or mobjects"""VMobject.__init__(self, **kwargs)@@ -89,9 +94,9 @@ class Matrix(VMobject):if i == 0 and j == 0:continueelif i == 0:- mob.next_to(matrix[i][j-1], RIGHT, self.h_buff)+ mob.next_to(matrix[i][j - 1], RIGHT, self.h_buff)else:- mob.next_to(matrix[i-1][j], DOWN, self.v_buff)+ mob.next_to(matrix[i - 1][j], DOWN, self.v_buff)return selfdef add_brackets(self):@@ -107,7 +112,7 @@ class Matrix(VMobject):def set_color_columns(self, *colors):for i, color in enumerate(colors):- VGroup(*self.mob_matrix[:,i]).set_color(color)+ VGroup(*self.mob_matrix[:, i]).set_color(color)return selfdef add_background_to_entries(self):@@ -123,15 +128,3 @@ class Matrix(VMobject):def get_brackets(self):return self.brackets------------