opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-28 20:43:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reimplemented DrawBorderThenFill

Browse Source
This commit is contained in:
Grant Sanderson
2019-02-09 08:59:02 -08:00
parent ab9effbc3c
commit 2d945dc929
1 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
manimlib/animation/creation.py
View File

@ -8,9 +8,11 @@ from manimlib.constants import *
from manimlib.mobject.types.vectorized_mobject import VMobject from manimlib.mobject.types.vectorized_mobject import VMobject
from manimlib.mobject.types.vectorized_mobject import VGroup from manimlib.mobject.types.vectorized_mobject import VGroup
from manimlib.utils.bezier import interpolate from manimlib.utils.bezier import interpolate
from manimlib.utils.bezier import integer_interpolate
from manimlib.utils.config_ops import digest_config from manimlib.utils.config_ops import digest_config
from manimlib.utils.paths import counterclockwise_path from manimlib.utils.paths import counterclockwise_path
from manimlib.utils.rate_functions import linear from manimlib.utils.rate_functions import linear
from manimlib.utils.rate_functions import double_smooth
from manimlib.utils.rate_functions import smooth from manimlib.utils.rate_functions import smooth
# Drawing # Drawing
@ -46,9 +48,10 @@ class Uncreate(ShowCreation):
} }
class DrawBorderThenFill(Succession): class DrawBorderThenFill(Animation):
CONFIG = { CONFIG = {
"run_time": 2, "run_time": 2,
"rate_func": double_smooth,
"stroke_width": 2, "stroke_width": 2,
"stroke_color": None, "stroke_color": None,
"draw_border_animation_config": {}, "draw_border_animation_config": {},
@ -57,34 +60,26 @@ class DrawBorderThenFill(Succession):
def __init__(self, vmobject, **kwargs): def __init__(self, vmobject, **kwargs):
self.check_validity_of_input(vmobject) self.check_validity_of_input(vmobject)
# Intialize with no animations, but add them Animation.__init__(self, vmobject, **kwargs)
# in the begin method
Succession.__init__(self, **kwargs)
self.mobject = vmobject
def check_validity_of_input(self, vmobject): def check_validity_of_input(self, vmobject):
if not isinstance(vmobject, VMobject): if not isinstance(vmobject, VMobject):
raise Exception("DrawBorderThenFill only works for VMobjects") raise Exception(
"DrawBorderThenFill only works for VMobjects"
)
def begin(self): def begin(self):
vmobject = self.mobject self.outline = self.get_outline()
self.original_vmobject = vmobject.copy()
self.animations = [
self.get_draw_border_animation(vmobject),
self.get_fill_animation(vmobject),
]
super().begin() super().begin()
def get_draw_border_animation(self, vmobject): def get_outline(self):
vmobject.set_stroke( outline = self.mobject.copy()
color=self.get_stroke_color(vmobject), outline.set_fill(opacity=0)
outline.set_stroke(
color=self.get_stroke_color(outline),
width=self.stroke_width width=self.stroke_width
) )
vmobject.set_fill(opacity=0) return outline
return ShowCreation(
vmobject,
**self.draw_border_animation_config
)
def get_stroke_color(self, vmobject): def get_stroke_color(self, vmobject):
if self.stroke_color: if self.stroke_color:
@ -93,43 +88,36 @@ class DrawBorderThenFill(Succession):
return vmobject.get_stroke_color() return vmobject.get_stroke_color()
return vmobject.get_color() return vmobject.get_color()
def get_fill_animation(self, vmobject): def get_all_mobjects(self):
return Transform( return [*super().get_all_mobjects(), self.outline]
vmobject,
self.original_vmobject,
**self.fill_animation_config,
)
def update_mobjects(self, dt): def interpolate_submobject(self, submob, start, outline, alpha):
super().update_mobjects(dt) index, subalpha = integer_interpolate(0, 2, alpha)
self.original_vmobject.update(dt) if index == 0:
submob.pointwise_become_partial(
outline, 0, subalpha
)
submob.match_style(outline)
else:
submob.interpolate(outline, start, subalpha)
class Write(LaggedStart): class Write(DrawBorderThenFill):
CONFIG = { CONFIG = {
# To be figured out in # To be figured out in
# set_default_config_from_lengths # set_default_config_from_lengths
"run_time": None, "run_time": None,
"lag_ratio": None, "lag_ratio": None,
"draw_border_then_fill_config": {} "rate_func": linear,
} }
def __init__(self, tex_mobject, **kwargs): def __init__(self, mobject, **kwargs):
digest_config(self, kwargs) digest_config(self, kwargs)
letters = VGroup(*tex_mobject.family_members_with_points()) self.set_default_config_from_length(mobject)
self.tex_mobject = tex_mobject DrawBorderThenFill.__init__(self, mobject, **kwargs)
self.set_default_config_from_length(len(letters))
subanims = [
DrawBorderThenFill(
letter,
**self.draw_border_then_fill_config,
)
for letter in letters
]
LaggedStart.__init__(self, *subanims, **kwargs)
self.mobject = tex_mobject
def set_default_config_from_length(self, length): def set_default_config_from_length(self, mobject):
length = len(mobject.family_members_with_points())
if self.run_time is None: if self.run_time is None:
if length < 15: if length < 15:
self.run_time = 1 self.run_time = 1
@ -138,20 +126,6 @@ class Write(LaggedStart):
if self.lag_ratio is None: if self.lag_ratio is None:
self.lag_ratio = min(4.0 / length, 0.2) self.lag_ratio = min(4.0 / length, 0.2)
# def get_all_mobjects(self):
# # self.mobject here, which is what usually would
# # be returned, will be a different Group of all
# # letters
# return self.tex_mobject
# def update_mobjects(self, dt):
# self.tex_mobject.update(dt)
def clean_up_from_scene(self, scene):
super().clean_up_from_scene(scene)
scene.remove(self.mobject)
scene.add(self.tex_mobject)
class ShowIncreasingSubsets(Animation): class ShowIncreasingSubsets(Animation):
def __init__(self, group, **kwargs): def __init__(self, group, **kwargs):