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

Specify fill_color/stroke_color instead of color

Browse source
This commit is contained in:
Grant Sanderson 2022-12-16 09:55:50 -08:00
parent a04d4c0d79
commit 9e077b29db
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
manimlib/mobject/geometry.py
View file

@ -6,7 +6,7 @@ import numbers
import numpy as np import numpy as np
from manimlib.constants import DL, DOWN, DR, LEFT, ORIGIN, OUT, RIGHT, UL, UP, UR from manimlib.constants import DL, DOWN, DR, LEFT, ORIGIN, OUT, RIGHT, UL, UP, UR
from manimlib.constants import GREY_A, RED, WHITE from manimlib.constants import GREY_A, RED, WHITE, BLACK
from manimlib.constants import MED_SMALL_BUFF from manimlib.constants import MED_SMALL_BUFF
from manimlib.constants import DEGREES, PI, TAU from manimlib.constants import DEGREES, PI, TAU
from manimlib.mobject.mobject import Mobject from manimlib.mobject.mobject import Mobject
@ -350,17 +350,19 @@ class Dot(Circle):
self, self,
point: np_vector = ORIGIN, point: np_vector = ORIGIN,
radius: float = DEFAULT_DOT_RADIUS, radius: float = DEFAULT_DOT_RADIUS,
stroke_color: ManimColor = BLACK,
stroke_width: float = 0.0, stroke_width: float = 0.0,
fill_opacity: float = 1.0, fill_opacity: float = 1.0,
color: ManimColor = WHITE, fill_color: ManimColor = WHITE,
**kwargs **kwargs
): ):
super().__init__( super().__init__(
arc_center=point, arc_center=point,
radius=radius, radius=radius,
stroke_color=stroke_color,
stroke_width=stroke_width, stroke_width=stroke_width,
fill_opacity=fill_opacity, fill_opacity=fill_opacity,
color=color, fill_color=fill_color,
**kwargs **kwargs
) )
@ -395,13 +397,13 @@ class AnnularSector(VMobject):
inner_radius: float = 1.0, inner_radius: float = 1.0,
outer_radius: float = 2.0, outer_radius: float = 2.0,
arc_center: np_vector = ORIGIN, arc_center: np_vector = ORIGIN,
color: ManimColor = GREY_A, fill_color: ManimColor = GREY_A,
fill_opacity: float = 1.0, fill_opacity: float = 1.0,
stroke_width: float = 0.0, stroke_width: float = 0.0,
**kwargs, **kwargs,
): ):
super().__init__( super().__init__(
color=color, fill_color=fill_color,
fill_opacity=fill_opacity, fill_opacity=fill_opacity,
stroke_width=stroke_width, stroke_width=stroke_width,
) )
@ -445,12 +447,12 @@ class Annulus(VMobject):
outer_radius: float = 2.0, outer_radius: float = 2.0,
fill_opacity: float = 1.0, fill_opacity: float = 1.0,
stroke_width: float = 0.0, stroke_width: float = 0.0,
color: ManimColor = GREY_A, fill_color: ManimColor = GREY_A,
center: np_vector = ORIGIN, center: np_vector = ORIGIN,
**kwargs, **kwargs,
): ):
super().__init__( super().__init__(
color=color, fill_color=fill_color,
fill_opacity=fill_opacity, fill_opacity=fill_opacity,
stroke_width=stroke_width, stroke_width=stroke_width,
) )
@ -676,7 +678,7 @@ class Arrow(Line):
self, self,
start: np_vector | Mobject, start: np_vector | Mobject,
end: np_vector | Mobject, end: np_vector | Mobject,
color: ManimColor = GREY_A, stroke_color: ManimColor = GREY_A,
stroke_width: float = 5, stroke_width: float = 5,
buff: float = 0.25, buff: float = 0.25,
tip_width_ratio: float = 5, tip_width_ratio: float = 5,
@ -692,7 +694,7 @@ class Arrow(Line):
self.max_stroke_width = stroke_width self.max_stroke_width = stroke_width
super().__init__( super().__init__(
start, end, start, end,
color=color, stroke_color=stroke_color,
stroke_width=stroke_width, stroke_width=stroke_width,
buff=buff, buff=buff,
**kwargs **kwargs
@ -1051,10 +1053,9 @@ class Rectangle(Polygon):
self, self,
width: float = 4.0, width: float = 4.0,
height: float = 2.0, height: float = 2.0,
color: ManimColor = WHITE,
**kwargs **kwargs
): ):
super().__init__(UR, UL, DL, DR, color=color, **kwargs) super().__init__(UR, UL, DL, DR, **kwargs)
self.set_width(width, stretch=True) self.set_width(width, stretch=True)
self.set_height(height, stretch=True) self.set_height(height, stretch=True)