public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-19 13:01:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save _has_fill and _has_stroke to prevent unnecessary recalculation

Browse source
This commit is contained in:
Grant Sanderson 2023-02-02 14:26:08 -08:00
parent e5eed7c36a
commit b9d6dcd67d
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
manimlib/mobject/types/vectorized_mobject.py
View file

@ -111,6 +111,8 @@ class VMobject(Mobject):
self.anti_alias_width = anti_alias_width self.anti_alias_width = anti_alias_width
self.fill_border_width = fill_border_width self.fill_border_width = fill_border_width
self._use_winding_fill = use_winding_fill self._use_winding_fill = use_winding_fill
self._has_fill = False
self._has_stroke = False
self.needs_new_triangulation = True self.needs_new_triangulation = True
self.triangulation = np.zeros(0, dtype='i4') self.triangulation = np.zeros(0, dtype='i4')
@ -134,6 +136,16 @@ class VMobject(Mobject):
return super().add(*vmobjects) return super().add(*vmobjects)
# Colors # Colors
def note_changed_fill(self) -> Self:
for submob in self.get_family():
submob._has_fill = submob.has_fill()
return self
def note_changed_stroke(self) -> Self:
for submob in self.get_family():
submob._has_stroke = submob.has_stroke()
return self
def init_colors(self): def init_colors(self):
self.set_fill( self.set_fill(
color=self.fill_color, color=self.fill_color,
@ -164,6 +176,10 @@ class VMobject(Mobject):
for name in names: for name in names:
super().set_rgba_array(rgba_array, name, recurse) super().set_rgba_array(rgba_array, name, recurse)
if name == "fill_rgba":
self.note_changed_fill()
elif name == "stroke_rgba":
self.note_changed_stroke()
return self return self
def set_fill( def set_fill(
@ -177,6 +193,7 @@ class VMobject(Mobject):
if border_width is not None: if border_width is not None:
for mob in self.get_family(recurse): for mob in self.get_family(recurse):
mob.data["fill_border_width"] = border_width mob.data["fill_border_width"] = border_width
self.note_changed_fill()
return self return self
def set_stroke( def set_stroke(
@ -202,6 +219,8 @@ class VMobject(Mobject):
if background is not None: if background is not None:
for mob in self.get_family(recurse): for mob in self.get_family(recurse):
mob.stroke_behind = background mob.stroke_behind = background
self.note_changed_stroke()
return self return self
def set_backstroke( def set_backstroke(
@ -255,6 +274,8 @@ class VMobject(Mobject):
if shading is not None: if shading is not None:
mob.set_shading(*shading, recurse=False) mob.set_shading(*shading, recurse=False)
self.note_changed_fill()
self.note_changed_stroke()
return self return self
def get_style(self) -> dict[str, Any]: def get_style(self) -> dict[str, Any]:
@ -378,10 +399,12 @@ class VMobject(Mobject):
return self.uniforms["anti_alias_width"] return self.uniforms["anti_alias_width"]
def has_stroke(self) -> bool: def has_stroke(self) -> bool:
return any(self.data['stroke_width']) and any(self.data['stroke_rgba'][:, 3]) data = self.data if len(self.data) > 0 else self._data_defaults
return any(data['stroke_width']) and any(data['stroke_rgba'][:, 3])
def has_fill(self) -> bool: def has_fill(self) -> bool:
return any(self.data['fill_rgba'][:, 3]) data = self.data if len(self.data) > 0 else self._data_defaults
return any(data['fill_rgba'][:, 3])
def get_opacity(self) -> float: def get_opacity(self) -> float:
if self.has_fill(): if self.has_fill():
@ -971,6 +994,10 @@ class VMobject(Mobject):
*args, **kwargs *args, **kwargs
) -> Self: ) -> Self:
super().interpolate(mobject1, mobject2, alpha, *args, **kwargs) super().interpolate(mobject1, mobject2, alpha, *args, **kwargs)
self._has_stroke = mobject1._has_stroke or mobject2._has_stroke
self._has_fill = mobject1._has_fill or mobject2._has_fill
if self.has_fill() and not self._use_winding_fill: if self.has_fill() and not self._use_winding_fill:
tri1 = mobject1.get_triangulation() tri1 = mobject1.get_triangulation()
tri2 = mobject2.get_triangulation() tri2 = mobject2.get_triangulation()
@ -1202,6 +1229,8 @@ class VMobject(Mobject):
@triggers_refreshed_triangulation @triggers_refreshed_triangulation
def set_data(self, data: np.ndarray) -> Self: def set_data(self, data: np.ndarray) -> Self:
super().set_data(data) super().set_data(data)
self.note_changed_fill()
self.note_changed_stroke()
return self return self
# TODO, how to be smart about tangents here? # TODO, how to be smart about tangents here?
@ -1291,8 +1320,8 @@ class VMobject(Mobject):
for submob in family: for submob in family:
submob.get_joint_products() submob.get_joint_products()
indices = submob.get_outer_vert_indices() indices = submob.get_outer_vert_indices()
has_fill = submob.has_fill() has_fill = submob._has_fill
has_stroke = submob.has_stroke() has_stroke = submob._has_stroke
back_stroke = has_stroke and submob.stroke_behind back_stroke = has_stroke and submob.stroke_behind
front_stroke = has_stroke and not submob.stroke_behind front_stroke = has_stroke and not submob.stroke_behind
if back_stroke: if back_stroke: