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

Rather than ignoring border with for non-one opacity, go back to having set_fill default to setting 0 border width for intermediate opacities

Browse Source
This commit is contained in:
Grant Sanderson
2024-08-16 12:38:11 -05:00
parent 21c0bcb8b6
commit 108db87087
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manimlib/mobject/types/vectorized_mobject.py
View File

@ -1,7 +1,6 @@
from __future__ import annotations from __future__ import annotations
from functools import wraps from functools import wraps
from functools import reduce
import moderngl import moderngl
import numpy as np import numpy as np
@ -192,7 +191,10 @@ class VMobject(Mobject):
recurse: bool = True recurse: bool = True
) -> Self: ) -> Self:
self.set_rgba_array_by_color(color, opacity, 'fill_rgba', recurse) self.set_rgba_array_by_color(color, opacity, 'fill_rgba', recurse)
if opacity is not None and 0 < opacity < 1 and border_width is None:
border_width = 0
if border_width is not None: if border_width is not None:
self.border_width = border_width
for mob in self.get_family(recurse): for mob in self.get_family(recurse):
data = mob.data if mob.has_points() > 0 else mob._data_defaults data = mob.data if mob.has_points() > 0 else mob._data_defaults
data["fill_border_width"] = border_width data["fill_border_width"] = border_width
@ -1392,11 +1394,10 @@ class VMobject(Mobject):
fill_datas.append(submob.data[fill_names]) fill_datas.append(submob.data[fill_names])
fill_indices.append(submob.get_triangulation()) fill_indices.append(submob.get_triangulation())
draw_border_width = reduce(op.and_, [ draw_border_width = op.and_(
(not submob._has_stroke) or submob.stroke_behind,
submob.data['fill_border_width'][0] > 0, submob.data['fill_border_width'][0] > 0,
submob.data['fill_rgba'][0, 3] == 1 (not submob._has_stroke) or submob.stroke_behind,
]) )
if draw_border_width: if draw_border_width:
# Add fill border # Add fill border
submob.get_joint_products() submob.get_joint_products()