opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-31 05:52:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Mobject.const_data_keys so that interpolations can be faster

Browse Source
This commit is contained in:
Grant Sanderson
2023-01-16 13:27:20 -08:00
parent db45d9e646
commit c23f020d9a
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
manimlib/mobject/mobject.py
View File

@ -30,6 +30,7 @@ from manimlib.utils.color import color_to_rgb
from manimlib.utils.color import get_colormap_list from manimlib.utils.color import get_colormap_list
from manimlib.utils.color import rgb_to_hex from manimlib.utils.color import rgb_to_hex
from manimlib.utils.iterables import arrays_match from manimlib.utils.iterables import arrays_match
from manimlib.utils.iterables import array_is_constant
from manimlib.utils.iterables import batch_by_property from manimlib.utils.iterables import batch_by_property
from manimlib.utils.iterables import list_update from manimlib.utils.iterables import list_update
from manimlib.utils.iterables import listify from manimlib.utils.iterables import listify
@ -101,6 +102,7 @@ class Mobject(object):
self.parents: list[Mobject] = [] self.parents: list[Mobject] = []
self.family: list[Mobject] = [self] self.family: list[Mobject] = [self]
self.locked_data_keys: set[str] = set() self.locked_data_keys: set[str] = set()
self.const_data_keys: set[str] = set()
self.needs_new_bounding_box: bool = True self.needs_new_bounding_box: bool = True
self._is_animating: bool = False self._is_animating: bool = False
self.saved_state = None self.saved_state = None
@ -1674,11 +1676,12 @@ class Mobject(object):
keys = [k for k in self.data.dtype.names if k not in self.locked_data_keys] keys = [k for k in self.data.dtype.names if k not in self.locked_data_keys]
for key in keys: for key in keys:
func = path_func if key in self.pointlike_data_keys else interpolate func = path_func if key in self.pointlike_data_keys else interpolate
self.data[key] = func( md1 = mobject1.data[key]
mobject1.data[key], md2 = mobject2.data[key]
mobject2.data[key], if key in self.const_data_keys:
alpha md1 = md1[0]
) md2 = md2[0]
self.data[key] = func(md1, md2, alpha)
for key in self.uniforms: for key in self.uniforms:
self.uniforms[key] = interpolate( self.uniforms[key] = interpolate(
@ -1719,15 +1722,25 @@ class Mobject(object):
def lock_matching_data(self, mobject1: Mobject, mobject2: Mobject): def lock_matching_data(self, mobject1: Mobject, mobject2: Mobject):
for sm, sm1, sm2 in zip(self.get_family(), mobject1.get_family(), mobject2.get_family()): for sm, sm1, sm2 in zip(self.get_family(), mobject1.get_family(), mobject2.get_family()):
if sm.data.dtype == sm1.data.dtype == sm2.data.dtype: if sm.data.dtype == sm1.data.dtype == sm2.data.dtype:
sm.lock_data([ names = sm.data.dtype.names
key for key in sm.data.dtype.names sm.lock_data(filter(
if arrays_match(sm1.data[key], sm2.data[key]) lambda name: arrays_match(sm1.data[name], sm2.data[name]),
]) names,
))
sm.const_data_keys = set(filter(
lambda name: all(
array_is_constant(mob.data[name])
for mob in (sm, sm1, sm2)
),
names
))
return self return self
def unlock_data(self): def unlock_data(self):
for mob in self.get_family(): for mob in self.get_family():
mob.locked_data_keys = set() mob.locked_data_keys = set()
mob.const_data_keys = set()
# Operations touching shader uniforms # Operations touching shader uniforms