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

style: rename Color type to ManimColor

Browse source
This commit is contained in:
TonyCrane 2022-02-13 19:02:28 +08:00
parent 19187ead06
commit 992e61ddf2
No known key found for this signature in database
GPG key ID: 2313A5058A9C637C
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manimlib/mobject/mobject.py
View file

@ -43,7 +43,7 @@ Self = TypeVar("Self", bound="Mobject")
TimeBasedUpdater = Callable[["Mobject", float], None]
NonTimeUpdater = Callable[["Mobject"], None]
Updater = Union[TimeBasedUpdater, NonTimeUpdater]
Color = Union[str, colour.Color, Sequence[float]]
ManimColor = Union[str, colour.Color, Sequence[float]]
class Mobject(object):
@ -1024,7 +1024,7 @@ class Mobject(object):
def set_rgba_array_by_color(
self,
color: Color | None = None,
color: ManimColor | None = None,
opacity: float | None = None,
name: str = "rgbas",
recurse: bool = True
@ -1056,7 +1056,7 @@ class Mobject(object):
mob.data[name] = rgbas.copy()
return self
def set_color(self, color: Color, opacity: float | None = None, recurse: bool = True):
def set_color(self, color: ManimColor, opacity: float | None = None, recurse: bool = True):
self.set_rgba_array_by_color(color, opacity, recurse=False)
# Recurse to submobjects differently from how set_rgba_array_by_color
# in case they implement set_color differently
@ -1078,11 +1078,11 @@ class Mobject(object):
def get_opacity(self) -> float:
return self.data["rgbas"][0, 3]
def set_color_by_gradient(self, *colors: Color):
def set_color_by_gradient(self, *colors: ManimColor):
self.set_submobject_colors_by_gradient(*colors)
return self
def set_submobject_colors_by_gradient(self, *colors: Color):
def set_submobject_colors_by_gradient(self, *colors: ManimColor):
if len(colors) == 0:
raise Exception("Need at least one color")
elif len(colors) == 1:
@ -1127,7 +1127,7 @@ class Mobject(object):
def add_background_rectangle(
self,
color: Color | None = None,
color: ManimColor | None = None,
opacity: float = 0.75,
**kwargs
):

6
manimlib/mobject/types/point_cloud_mobject.py
View file

@ -13,7 +13,7 @@ from manimlib.utils.iterables import resize_with_interpolation
from manimlib.utils.iterables import resize_array
Color = Union[str, colour.Color, Sequence[float]]
ManimColor = Union[str, colour.Color, Sequence[float]]
class PMobject(Mobject):
@ -43,7 +43,7 @@ class PMobject(Mobject):
self,
points: npt.ArrayLike,
rgbas: np.ndarray | None = None,
color: Color | None = None,
color: ManimColor | None = None,
opacity: float | None = None
):
"""
@ -64,7 +64,7 @@ class PMobject(Mobject):
self.data["rgbas"][-len(new_rgbas):] = new_rgbas
return self
def set_color_by_gradient(self, *colors: Color):
def set_color_by_gradient(self, *colors: ManimColor):
self.data["rgbas"] = np.array(list(map(
color_to_rgba,
color_gradient(colors, self.get_num_points())

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

@ -34,7 +34,7 @@ from manimlib.utils.space_ops import z_to_vector
from manimlib.shader_wrapper import ShaderWrapper
Color = Union[str, colour.Color, Sequence[float]]
ManimColor = Union[str, colour.Color, Sequence[float]]
class VMobject(Mobject):
@ -130,7 +130,7 @@ class VMobject(Mobject):
def set_fill(
self,
color: Color | None = None,
color: ManimColor | None = None,
opacity: float | None = None,
recurse: bool = True
):
@ -139,7 +139,7 @@ class VMobject(Mobject):
def set_stroke(
self,
color: Color | None = None,
color: ManimColor | None = None,
width: float | npt.ArrayLike | None = None,
opacity: float | None = None,
background: bool | None = None,
@ -162,7 +162,7 @@ class VMobject(Mobject):
def set_backstroke(
self,
color: Color = BLACK,
color: ManimColor = BLACK,
width: float | npt.ArrayLike = 3,
background: bool = True
):
@ -177,10 +177,10 @@ class VMobject(Mobject):
def set_style(
self,
fill_color: Color | None = None,
fill_color: ManimColor | None = None,
fill_opacity: float | None = None,
fill_rgba: npt.ArrayLike | None = None,
stroke_color: Color | None = None,
stroke_color: ManimColor | None = None,
stroke_opacity: float | None = None,
stroke_rgba: npt.ArrayLike | None = None,
stroke_width: float | npt.ArrayLike | None = None,
@ -247,7 +247,7 @@ class VMobject(Mobject):
sm1.match_style(sm2)
return self
def set_color(self, color: Color, recurse: bool = True):
def set_color(self, color: ManimColor, recurse: bool = True):
self.set_fill(color, recurse=recurse)
self.set_stroke(color, recurse=recurse)
return self