mirror of
https://github.com/3b1b/manim.git
synced 2025-08-05 16:49:03 +00:00
Removed meta_animation module, seems seems a bad way to separate things
This commit is contained in:
Grant Sanderson
parent
ca1ea90402
commit
66b0c39fb5
3 changed files with 98 additions and 114 deletions
|
|
@ -1,94 +0,0 @@
|
||||||
import numpy as np
|
|
||||||
import itertools as it
|
|
||||||
|
|
||||||
from helpers import *
|
|
||||||
from animation import Animation
|
|
||||||
from transform import Transform
|
|
||||||
from mobject import Mobject
|
|
||||||
|
|
||||||
|
|
||||||
class DelayByOrder(Animation):
|
|
||||||
"""
|
|
||||||
Modifier of animation.
|
|
||||||
|
|
||||||
Warning: This will not work on all animation types.
|
|
||||||
"""
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"max_power" : 5
|
|
||||||
}
|
|
||||||
def __init__(self, animation, **kwargs):
|
|
||||||
digest_locals(self)
|
|
||||||
self.num_mobject_points = animation.mobject.get_num_points()
|
|
||||||
kwargs.update(dict([
|
|
||||||
(attr, getattr(animation, attr))
|
|
||||||
for attr in Animation.DEFAULT_CONFIG
|
|
||||||
]))
|
|
||||||
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 TransformAnimations(Transform):
|
|
||||||
DEFAULT_CONFIG = {
|
|
||||||
"rate_func" : squish_rate_func(smooth)
|
|
||||||
}
|
|
||||||
def __init__(self, start_anim, end_anim, **kwargs):
|
|
||||||
digest_config(self, kwargs, locals())
|
|
||||||
if "run_time" in kwargs:
|
|
||||||
self.run_time = kwargs.pop("run_time")
|
|
||||||
else:
|
|
||||||
self.run_time = max(start_anim.run_time, end_anim.run_time)
|
|
||||||
for anim in start_anim, end_anim:
|
|
||||||
anim.set_run_time(self.run_time)
|
|
||||||
|
|
||||||
if start_anim.starting_mobject.get_num_points() != end_anim.starting_mobject.get_num_points():
|
|
||||||
Mobject.align_data(start_anim.starting_mobject, end_anim.starting_mobject)
|
|
||||||
for anim in start_anim, end_anim:
|
|
||||||
if hasattr(anim, "ending_mobject"):
|
|
||||||
Mobject.align_data(anim.starting_mobject, anim.ending_mobject)
|
|
||||||
|
|
||||||
Transform.__init__(self, start_anim.mobject, end_anim.mobject, **kwargs)
|
|
||||||
#Rewire starting and ending mobjects
|
|
||||||
start_anim.mobject = self.starting_mobject
|
|
||||||
end_anim.mobject = self.ending_mobject
|
|
||||||
|
|
||||||
def update(self, alpha):
|
|
||||||
self.start_anim.update(alpha)
|
|
||||||
self.end_anim.update(alpha)
|
|
||||||
Transform.update(self, alpha)
|
|
||||||
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -4,8 +4,6 @@ import itertools as it
|
||||||
from helpers import *
|
from helpers import *
|
||||||
|
|
||||||
from animation import Animation
|
from animation import Animation
|
||||||
from meta_animations import DelayByOrder
|
|
||||||
from transform import Transform
|
|
||||||
|
|
||||||
|
|
||||||
class Rotating(Animation):
|
class Rotating(Animation):
|
||||||
|
|
@ -32,23 +30,6 @@ class Rotating(Animation):
|
||||||
method(alpha*self.radians, axes = axes)
|
method(alpha*self.radians, axes = axes)
|
||||||
|
|
||||||
|
|
||||||
class FadeOut(Animation):
|
|
||||||
def update_mobject(self, alpha):
|
|
||||||
self.mobject.rgbs = self.starting_mobject.rgbs * (1 - alpha)
|
|
||||||
|
|
||||||
class FadeIn(Animation):
|
|
||||||
def update_mobject(self, alpha):
|
|
||||||
self.mobject.rgbs = self.starting_mobject.rgbs * alpha
|
|
||||||
if self.mobject.points.shape != self.starting_mobject.points.shape:
|
|
||||||
self.mobject.points = self.starting_mobject.points
|
|
||||||
#TODO, Why do you need to do this? Shouldn't points always align?
|
|
||||||
|
|
||||||
class ShimmerIn(DelayByOrder):
|
|
||||||
def __init__(self, mobject, **kwargs):
|
|
||||||
mobject.sort_points(lambda p : np.dot(p, DOWN+RIGHT))
|
|
||||||
DelayByOrder.__init__(self, FadeIn(mobject, **kwargs))
|
|
||||||
|
|
||||||
|
|
||||||
class ShowCreation(Animation):
|
class ShowCreation(Animation):
|
||||||
def update_mobject(self, alpha):
|
def update_mobject(self, alpha):
|
||||||
pairs = zip(
|
pairs = zip(
|
||||||
|
|
@ -104,7 +85,55 @@ class Homotopy(Animation):
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
class DelayByOrder(Animation):
|
||||||
|
"""
|
||||||
|
Modifier of animation.
|
||||||
|
|
||||||
|
Warning: This will not work on all animation types.
|
||||||
|
"""
|
||||||
|
DEFAULT_CONFIG = {
|
||||||
|
"max_power" : 5
|
||||||
|
}
|
||||||
|
def __init__(self, animation, **kwargs):
|
||||||
|
digest_locals(self)
|
||||||
|
self.num_mobject_points = animation.mobject.get_num_points()
|
||||||
|
kwargs.update(dict([
|
||||||
|
(attr, getattr(animation, attr))
|
||||||
|
for attr in Animation.DEFAULT_CONFIG
|
||||||
|
]))
|
||||||
|
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 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)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import warnings
|
||||||
from helpers import *
|
from helpers import *
|
||||||
|
|
||||||
from animation import Animation
|
from animation import Animation
|
||||||
|
from simple_animations import DelayByOrder
|
||||||
from mobject import Mobject, Point
|
from mobject import Mobject, Point
|
||||||
|
|
||||||
class Transform(Animation):
|
class Transform(Animation):
|
||||||
|
|
@ -119,6 +120,26 @@ class ApplyMethod(Transform):
|
||||||
**kwargs
|
**kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
|
class FadeOut(ApplyMethod):
|
||||||
|
def __init__(self, mobject, **kwargs):
|
||||||
|
ApplyMethod.__init__(self, mobject.fade, 1, **kwargs)
|
||||||
|
|
||||||
|
class FadeIn(Transform):
|
||||||
|
def __init__(self, mobject, **kwargs):
|
||||||
|
target = mobject.copy()
|
||||||
|
mobject.fade(1)
|
||||||
|
Transform.__init__(self, mobject, target, **kwargs)
|
||||||
|
# self.mobject.rgbs = self.starting_mobject.rgbs * alpha
|
||||||
|
# if self.mobject.points.shape != self.starting_mobject.points.shape:
|
||||||
|
# self.mobject.points = self.starting_mobject.points
|
||||||
|
# #TODO, Why do you need to do this? Shouldn't points always align?
|
||||||
|
|
||||||
|
class ShimmerIn(DelayByOrder):
|
||||||
|
def __init__(self, mobject, **kwargs):
|
||||||
|
mobject.sort_points(lambda p : np.dot(p, DOWN+RIGHT))
|
||||||
|
DelayByOrder.__init__(self, FadeIn(mobject, **kwargs))
|
||||||
|
|
||||||
|
|
||||||
class Rotate(ApplyMethod):
|
class Rotate(ApplyMethod):
|
||||||
DEFAULT_CONFIG = {
|
DEFAULT_CONFIG = {
|
||||||
"in_place" : False,
|
"in_place" : False,
|
||||||
|
|
@ -182,6 +203,34 @@ class ApplyMatrix(Animation):
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class TransformAnimations(Transform):
|
||||||
|
DEFAULT_CONFIG = {
|
||||||
|
"rate_func" : squish_rate_func(smooth)
|
||||||
|
}
|
||||||
|
def __init__(self, start_anim, end_anim, **kwargs):
|
||||||
|
digest_config(self, kwargs, locals())
|
||||||
|
if "run_time" in kwargs:
|
||||||
|
self.run_time = kwargs.pop("run_time")
|
||||||
|
else:
|
||||||
|
self.run_time = max(start_anim.run_time, end_anim.run_time)
|
||||||
|
for anim in start_anim, end_anim:
|
||||||
|
anim.set_run_time(self.run_time)
|
||||||
|
|
||||||
|
if start_anim.starting_mobject.get_num_points() != end_anim.starting_mobject.get_num_points():
|
||||||
|
Mobject.align_data(start_anim.starting_mobject, end_anim.starting_mobject)
|
||||||
|
for anim in start_anim, end_anim:
|
||||||
|
if hasattr(anim, "ending_mobject"):
|
||||||
|
Mobject.align_data(anim.starting_mobject, anim.ending_mobject)
|
||||||
|
|
||||||
|
Transform.__init__(self, start_anim.mobject, end_anim.mobject, **kwargs)
|
||||||
|
#Rewire starting and ending mobjects
|
||||||
|
start_anim.mobject = self.starting_mobject
|
||||||
|
end_anim.mobject = self.ending_mobject
|
||||||
|
|
||||||
|
def update(self, alpha):
|
||||||
|
self.start_anim.update(alpha)
|
||||||
|
self.end_anim.update(alpha)
|
||||||
|
Transform.update(self, alpha)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue