middle of massive restructure, everything still broken

animation/simple_animations.py

@@ -2,42 +2,12 @@ import numpy as np
 import itertools as it
 from copy import deepcopy
 
-from animation import Animation
-from transform import Transform
-from mobject import *
-from constants import *
 from helpers import *
 
+from animation import Animation
+from meta_animations import DelayByOrder
+from transform import Transform
 
-class DelayByOrder(Animation):
-    """
-    Modifier of animation.
-
-    Warning: This will not work on all animation types, but 
-    when it does, it will be pretty cool
-    """
-    DEFAULT_CONFIG = {
-        "max_power" : 5
-    }
-    def __init__(self, animation, **kwargs):
-        digest_config(self, DelayByOrder, kwargs, locals())
-        kwargs.update(dict([
-            (attr, getattr(animation, attr))
-            for attr in Animation.DEFAULT_CONFIG
-        ]))
-        self.num_mobject_points = animation.mobject.get_num_points()
-        Animation.__init__(self, animation.mobject, **kwargs)
-        self.name = self.__class__.__name__ + str(self.animation)
-
-    def update_mobject(self, alpha):
-        dim = self.mobject.DIM
-        alpha_array = np.array([
-            [alpha**power]*dim
-            for n in range(self.num_mobject_points)
-            for prop in [(n+1.0)/self.num_mobject_points]
-            for power in [1+prop*(self.max_power-1)]
-        ])
-        self.animation.update_mobject(alpha_array)
 
 class Rotating(Animation):
     DEFAULT_CONFIG = {
@@ -55,17 +25,6 @@ class Rotating(Animation):
         for axis in self.axes:
             self.mobject.rotate(self.radians * alpha, axis)
 
-class RotationAsTransform(Rotating):
-    DEFAULT_CONFIG = {
-        "axes" : [OUT],
-        "radians" : np.pi / 2,
-        "run_time" : DEFAULT_ANIMATION_RUN_TIME,
-        "alpha_func" : smooth,
-    }
-    def __init__(self, mobject, **kwargs):
-        digest_config(self, RotationAsTransform, kwargs, locals())
-        Rotating.__init__(self, mobject, **kwargs)
-
 class FadeOut(Animation):
     def update_mobject(self, alpha):
         self.mobject.rgbs = self.starting_mobject.rgbs * (1 - alpha)
@@ -136,96 +95,6 @@ class Homotopy(Animation):
             for x, y, z in self.starting_mobject.points
         ])
 
-class ComplexHomotopy(Homotopy):
-    def __init__(self, complex_homotopy, **kwargs):
-        """
-        Complex Hootopy a function (z, t) to z'
-        """
-        def homotopy((x, y, z, t)):
-            c = complex_homotopy((complex(x, y), t))
-            return (c.real, c.imag, z)
-        if len(args) > 0:
-            args = list(args)
-            mobject = args.pop(0)
-        elif "mobject" in kwargs:
-            mobject = kwargs["mobject"]
-        else:
-            mobject = Grid()
-        Homotopy.__init__(self, homotopy, mobject, *args, **kwargs)
-        self.name = "ComplexHomotopy" + \
-            to_cammel_case(complex_homotopy.__name__)
-
-class Succession(Animation):
-    def __init__(self, *animations, **kwargs):
-        if "run_time" in kwargs:
-            run_time = kwargs.pop("run_time")
-        else:
-            run_time = sum([anim.run_time for anim in animations])
-        self.num_anims = len(animations)
-        self.anims = animations
-        mobject = animations[0].mobject
-        Animation.__init__(self, mobject, run_time = run_time, **kwargs)
-
-    def __str__(self):
-        return self.__class__.__name__ + \
-               "".join(map(str, self.anims))
-
-    def update(self, alpha):
-        scaled_alpha = alpha*self.num_anims
-        self.mobject = self.anims
-        for index in range(len(self.anims)):
-            self.anims[index].update(scaled_alpha - index)
-
-####### Pi Creature Stuff #############
-
-class WalkPiCreature(Animation):
-    def __init__(self, pi_creature, destination, *args, **kwargs):
-        self.final = deepcopy(pi_creature).move_to(destination)
-        self.middle = pi_creature.get_step_intermediate(self.final)
-        Animation.__init__(self, pi_creature, *args, **kwargs)
-
-    def update_mobject(self, alpha):
-        if alpha < 0.5:
-            Mobject.interpolate(
-                self.starting_mobject,
-                self.middle,
-                self.mobject,
-                2*alpha
-            )
-        else:
-            Mobject.interpolate(
-                self.middle,
-                self.final,
-                self.mobject,
-                2*alpha - 1
-            )
-
-
-class BlinkPiCreature(Transform):
-    def __init__(self, pi_creature, *args, **kwargs):
-        blinked = deepcopy(pi_creature).blink()
-        Transform.__init__(
-            self, pi_creature, blinked,
-            alpha_func = squish_alpha_func(there_and_back),
-            *args, **kwargs
-        )
-            
-
-class WaveArm(Transform):
-    def __init__(self, pi_creature, *args, **kwargs):
-        final = deepcopy(pi_creature)
-        body_to_arm = pi_creature.arm.get_center()-pi_creature.get_center()
-        if body_to_arm[0] < 0:
-            wag_direction = LEFT
-        else:
-            wag_direction = RIGHT
-        final.arm.wag(0.7*UP, wag_direction, 2.0)
-        final.rewire_part_attributes(self_from_parts = True)
-        Transform.__init__(
-            self, pi_creature, final,
-            alpha_func = there_and_back,
-            *args, **kwargs
-        )