Merge pull request 3b1b#752 from 3b1b/hyperdarts

Hyperdarts

Author: 3b1b

active_projects/hyperdarts.py

@@ -33,6 +33,7 @@ def __init__(self, *animations, **kwargs):
             self.group = Group(*remove_list_redundancies(
                 [anim.mobject for anim in animations]
             ))
+        self.init_run_time()
         Animation.__init__(self, self.group, **kwargs)
 
     def get_all_mobjects(self):
@@ -41,7 +42,7 @@ def get_all_mobjects(self):
     def begin(self):
         for anim in self.animations:
             anim.begin()
-        self.init_run_time()
+        # self.init_run_time()
 
     def finish(self):
         for anim in self.animations:

active_projects/spirals.py

@@ -1,12 +1,15 @@
 from manimlib.animation.animation import Animation
+from manimlib.animation.composition import Succession
 from manimlib.mobject.types.vectorized_mobject import VMobject
+from manimlib.mobject.mobject import Group
 from manimlib.utils.bezier import integer_interpolate
 from manimlib.utils.config_ops import digest_config
 from manimlib.utils.rate_functions import linear
 from manimlib.utils.rate_functions import double_smooth
 from manimlib.utils.rate_functions import smooth
 
 import numpy as np
+import itertools as it
 
 
 class ShowPartial(Animation):
@@ -132,4 +135,42 @@ def __init__(self, group, **kwargs):
     def interpolate_mobject(self, alpha):
         n_submobs = len(self.all_submobs)
         index = int(self.int_func(alpha * n_submobs))
+        self.update_submobject_list(index)
+
+    def update_submobject_list(self, index):
         self.mobject.submobjects = self.all_submobs[:index]
+
+
+class ShowSubmobjectsOneByOne(ShowIncreasingSubsets):
+    def __init__(self, group, **kwargs):
+        new_group = Group(*group)
+        super().__init__(new_group, **kwargs)
+
+    def update_submobject_list(self, index):
+        # N = len(self.all_submobs)
+        if index == 0:
+            self.mobject.submobjects = []
+        else:
+            self.mobject.submobjects = self.all_submobs[index - 1]
+
+
+# TODO, this is broken...
+class AddTextWordByWord(Succession):
+    CONFIG = {
+        # If given a value for run_time, it will
+        # override the time_per_char
+        "run_time": None,
+        "time_per_char": 0.06,
+    }
+
+    def __init__(self, text_mobject, **kwargs):
+        digest_config(self, kwargs)
+        tpc = self.time_per_char
+        anims = it.chain(*[
+            [
+                ShowIncreasingSubsets(word, run_time=tpc * len(word)),
+                Animation(word, run_time=0.005 * len(word)**1.5),
+            ]
+            for word in text_mobject
+        ])
+        super().__init__(*anims, **kwargs)

manimlib/animation/composition.py

@@ -154,8 +154,7 @@ class PatreonEndScreen(PatreonThanks, PiCreatureScene):
         "randomize_order": True,
         "capitalize": True,
         "name_y_spacing": 0.7,
-        # "thanks_words": "Funded by the community, with special thanks to:",
-        "thanks_words": "Early access, name in credits and more at 3b1b.org/support",
+        "thanks_words": "My thanks to all the patrons among you",
     }
 
     def construct(self):
@@ -245,7 +244,7 @@ def scroll_through_patrons(self):
         columns.next_to(underline, DOWN, buff=2)
 
         columns.generate_target()
-        columns.target.to_edge(DOWN, buff=2)
+        columns.target.to_edge(DOWN, buff=4)
         vect = columns.target.get_center() - columns.get_center()
         distance = get_norm(vect)
         wait_time = 20
@@ -259,11 +258,15 @@ def scroll_through_patrons(self):
         self.wait(wait_time)
 
     def modify_patron_name(self, name):
-        if name.lower() == "RedAgent14".lower():
-            return "Brian Shepetofsky"
-        elif name.lower() == "DeathByShrimp".lower():
-            return "Henry Bresnahan"
-
+        modification_map = {
+            "RedAgent14": "Brian Shepetofsky",
+            "DeathByShrimp": "Henry Bresnahan",
+            "akostrikov": "Aleksandr Kostrikov",
+            "Jacob Baxter": "Will Fleshman",
+        }
+        for n1, n2 in modification_map.items():
+            if name.lower() == n1.lower():
+                return n2
         return name
 
 

manimlib/animation/creation.py

@@ -202,8 +202,6 @@ def get_length(self):
         return get_norm(start - end)
 
 
-
-
 class Arc(TipableVMobject):
     CONFIG = {
         "radius": 1.0,

manimlib/for_3b1b_videos/common_scenes.py

@@ -50,6 +50,15 @@ def set_color(self, color=YELLOW_C, family=True):
         self.color = color
         return self
 
+    def get_stroke_width(self):
+        return self.stroke_width
+
+    def set_stroke_width(self, width, family=True):
+        mobs = self.family_members_with_points() if family else [self]
+        for mob in mobs:
+            mob.stroke_width = width
+        return self
+
     # def set_color_by_gradient(self, start_color, end_color):
     def set_color_by_gradient(self, *colors):
         self.rgbas = np.array(list(map(
@@ -158,6 +167,12 @@ def interpolate_color(self, mobject1, mobject2, alpha):
         self.rgbas = interpolate(
             mobject1.rgbas, mobject2.rgbas, alpha
         )
+        self.set_stroke_width(interpolate(
+            mobject1.get_stroke_width(),
+            mobject2.get_stroke_width(),
+            alpha,
+        ))
+        return self
 
     def pointwise_become_partial(self, mobject, a, b):
         lower_index, upper_index = [
@@ -206,6 +221,14 @@ def __init__(self, **kwargs):
         Mobject.__init__(self, **kwargs)
 
 
+class PGroup(PMobject):
+    def __init__(self, *pmobs, **kwargs):
+        if not all([isinstance(m, PMobject) for m in pmobs]):
+            raise Exception("All submobjects must be of type PMobject")
+        super().__init__(**kwargs)
+        self.add(*pmobs)
+
+
 class PointCloudDot(Mobject1D):
     CONFIG = {
         "radius": 0.075,

manimlib/mobject/geometry.py

@@ -543,6 +543,8 @@ def add_frames(self, *frames):
             self.file_writer.write_frame(frame)
 
     def add_sound(self, sound_file, time_offset=0, gain=None, **kwargs):
+        if self.skip_animations:
+            return
         time = self.get_time() + time_offset
         self.file_writer.add_sound(sound_file, time, gain, **kwargs)
 

manimlib/mobject/types/point_cloud_mobject.py

@@ -88,7 +88,9 @@ def __str__(self):
         return self.animated_name.replace(" ", "") + "Animation"
 
 
-names = []
+names = [
+    "Happy 18th Birthday\\\\Pranavi Hiremath!"
+]
 
 if __name__ == "__main__":
     for name in names:

manimlib/scene/scene.py

@@ -45,7 +45,7 @@ def stage_scenes(module_name):
     animation_dir = os.path.join(
         os.path.expanduser('~'),
         "Dropbox (3Blue1Brown)/3Blue1Brown Team Folder/videos",
-        "windmill", "1440p60"
+        "spirals", "1440p60"
     )
     # 
     files = os.listdir(animation_dir)