Adding :class: ManimColor to manim and converting all types

.mypy.ini

@@ -23,6 +23,9 @@ ignore_errors = True
 [mypy-manim.utils.*]
 ignore_errors = True
 
+[mypy-manim.utils.color]
+ignore_errors = False
+
 [mypy-manim.animation.*]
 ignore_errors = True
 

docs/source/_templates/autosummary/class.rst

@@ -7,6 +7,8 @@ Qualified name: ``{{ fullname | escape }}``
 .. autoclass:: {{ objname }}
    :show-inheritance:
    :members:
+   :private-members:
+
 
    {% block methods %}
    {%- if methods %}

docs/source/conf.py

@@ -43,6 +43,7 @@
     "sphinx.ext.viewcode",
     "sphinxext.opengraph",
     "manim.utils.docbuild.manim_directive",
+    "manim.utils.docbuild.autocolor_directive",
     "sphinx.ext.graphviz",
     "sphinx.ext.inheritance_diagram",
     "sphinxcontrib.programoutput",

manim/_config/utils.py

@@ -23,11 +23,11 @@
 from pathlib import Path
 from typing import Any, Iterable, Iterator
 
-import colour
 import numpy as np
 
 from .. import constants
 from ..constants import RendererType
+from ..utils.color import ManimColor
 from ..utils.tex import TexTemplate, TexTemplateFromFile
 from ..utils.tex_templates import TexTemplateLibrary
 
@@ -1096,7 +1096,7 @@ def format(self, val: str) -> None:
 
     background_color = property(
         lambda self: self._d["background_color"],
-        lambda self, val: self._d.__setitem__("background_color", colour.Color(val)),
+        lambda self, val: self._d.__setitem__("background_color", ManimColor(val)),
         doc="Background color of the scene (-c).",
     )
 

manim/animation/changing.py

@@ -6,12 +6,17 @@
 
 from typing import Callable
 
-from colour import Color
-
 from manim._config import config
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
 from manim.mobject.types.vectorized_mobject import VGroup, VMobject
-from manim.utils.color import BLUE_B, BLUE_D, BLUE_E, GREY_BROWN, WHITE
+from manim.utils.color import (
+    BLUE_B,
+    BLUE_D,
+    BLUE_E,
+    GREY_BROWN,
+    WHITE,
+    ParsableManimColor,
+)
 from manim.utils.rate_functions import smooth
 
 
@@ -140,7 +145,7 @@ def __init__(
         self,
         traced_point_func: Callable,
         stroke_width: float = 2,
-        stroke_color: Color = WHITE,
+        stroke_color: ParsableManimColor | None = WHITE,
         dissipating_time: float | None = None,
         **kwargs,
     ):

manim/animation/creation.py

@@ -77,13 +77,13 @@ def construct(self):
 from typing import TYPE_CHECKING, Callable, Iterable, Sequence
 
 import numpy as np
-from colour import Color
 
 if TYPE_CHECKING:
     from manim.mobject.text.text_mobject import Text
 
 from manim.mobject.opengl.opengl_surface import OpenGLSurface
 from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject
+from manim.utils.color import ManimColor
 
 from .. import config
 from ..animation.animation import Animation
@@ -259,7 +259,7 @@ def get_outline(self) -> Mobject:
             sm.set_stroke(color=self.get_stroke_color(sm), width=self.stroke_width)
         return outline
 
-    def get_stroke_color(self, vmobject: VMobject | OpenGLVMobject) -> Color:
+    def get_stroke_color(self, vmobject: VMobject | OpenGLVMobject) -> ManimColor:
         if self.stroke_color:
             return self.stroke_color
         elif vmobject.get_stroke_width() > 0:

manim/animation/indication.py

@@ -40,7 +40,6 @@ def construct(self):
 from typing import Callable, Iterable, Optional, Tuple, Type, Union
 
 import numpy as np
-from colour import Color
 
 from manim.mobject.geometry.arc import Circle, Dot
 from manim.mobject.geometry.line import Line
@@ -58,7 +57,7 @@ def construct(self):
 from ..mobject.mobject import Mobject
 from ..mobject.types.vectorized_mobject import VGroup, VMobject
 from ..utils.bezier import interpolate, inverse_interpolate
-from ..utils.color import GREY, YELLOW
+from ..utils.color import GREY, YELLOW, ParsableManimColor
 from ..utils.deprecation import deprecated
 from ..utils.rate_functions import smooth, there_and_back, wiggle
 from ..utils.space_ops import normalize
@@ -609,7 +608,7 @@ def __init__(
         fade_out=False,
         time_width=0.3,
         buff: float = SMALL_BUFF,
-        color: Color = YELLOW,
+        color: ParsableManimColor = YELLOW,
         run_time=1,
         stroke_width=DEFAULT_STROKE_WIDTH,
         **kwargs

manim/camera/camera.py

@@ -24,7 +24,7 @@
 from ..mobject.types.image_mobject import AbstractImageMobject
 from ..mobject.types.point_cloud_mobject import PMobject
 from ..mobject.types.vectorized_mobject import VMobject
-from ..utils.color import color_to_int_rgba
+from ..utils.color import ManimColor, ParsableManimColor, color_to_int_rgba
 from ..utils.family import extract_mobject_family_members
 from ..utils.images import get_full_raster_image_path
 from ..utils.iterables import list_difference_update
@@ -75,6 +75,8 @@ def __init__(
         frame_height: float | None = None,
         frame_width: float | None = None,
         frame_rate: float | None = None,
+        background_color: ParsableManimColor | None = None,
+        background_opacity: float | None = None,
         **kwargs,
     ):
         self.background_image = background_image
@@ -106,9 +108,14 @@ def __init__(
             frame_rate = config["frame_rate"]
         self.frame_rate = frame_rate
 
-        # TODO: change this to not use kwargs.get
-        for attr in ["background_color", "background_opacity"]:
-            setattr(self, f"_{attr}", kwargs.get(attr, config[attr]))
+        if background_color is None:
+            self._background_color = ManimColor.parse(config["background_color"])
+        else:
+            self._background_color = ManimColor.parse(background_color)
+        if background_opacity is None:
+            self._background_opacity = config["background_opacity"]
+        else:
+            self._background_opacity = background_opacity
 
         # This one is in the same boat as the above, but it doesn't have the
         # same name as the corresponding key so it has to be handled on its own

manim/mobject/geometry/arc.py

@@ -48,7 +48,6 @@ def construct(self):
 from typing import TYPE_CHECKING, Sequence
 
 import numpy as np
-from colour import Color
 
 from manim.constants import *
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
@@ -492,7 +491,7 @@ def construct(self):
     def __init__(
         self,
         radius: float | None = None,
-        color: Color | str = RED,
+        color: ParsableManimColor = RED,
         **kwargs,
     ):
         super().__init__(
@@ -658,7 +657,7 @@ def __init__(
         radius: float = DEFAULT_DOT_RADIUS,
         stroke_width: float = 0,
         fill_opacity: float = 1.0,
-        color: Color | str = WHITE,
+        color: ParsableManimColor = WHITE,
         **kwargs,
     ):
         super().__init__(

manim/mobject/geometry/labeled.py

@@ -12,7 +12,7 @@
 )
 from manim.mobject.text.tex_mobject import MathTex, Tex
 from manim.mobject.text.text_mobject import Text
-from manim.utils.color import WHITE, Color
+from manim.utils.color import WHITE, ManimColor, ParsableManimColor
 
 
 class LabeledLine(Line):
@@ -26,11 +26,11 @@ class LabeledLine(Line):
         A ratio in the range [0-1] to indicate the position of the label with respect to the length of the line. Default value is 0.5.
     font_size : float | optional
         Control font size for the label. This parameter is only used when `label` is of type `str`.
-    label_color: numpy.ndarray | optional
+    label_color: ParsableManimColor | optional
         The color of the label's text. This parameter is only used when `label` is of type `str`.
     label_frame : Bool | optional
         Add a `SurroundingRectangle` frame to the label box.
-    frame_fill_color : numpy.ndarray | optional
+    frame_fill_color : ParsableManimColor | optional
         Background color to fill the label box. If no value is provided, the background color of the canvas will be used.
     frame_fill_opacity : float | optional
         Determine the opacity of the label box by passing a value in the range [0-1], where 0 indicates complete transparency and 1 means full opacity.
@@ -65,13 +65,15 @@ def __init__(
         label: str | Tex | MathTex | Text,
         label_position: float = 0.5,
         font_size: float = DEFAULT_FONT_SIZE,
-        label_color: Color | str | None = WHITE,
+        label_color: ParsableManimColor = WHITE,
         label_frame: bool = True,
-        frame_fill_color: Color | str | None = None,
+        frame_fill_color: ParsableManimColor = None,
         frame_fill_opacity: float = 1,
         *args,
         **kwargs,
     ) -> None:
+        label_color = ManimColor(label_color)
+        frame_fill_color = ManimColor(frame_fill_color)
         if isinstance(label, str):
             from manim import MathTex
 
@@ -120,11 +122,11 @@ class LabeledArrow(LabeledLine, Arrow):
         A ratio in the range [0-1] to indicate the position of the label with respect to the length of the line. Default value is 0.5.
     font_size : float | optional
         Control font size for the label. This parameter is only used when `label` is of type `str`.
-    label_color: numpy.ndarray | optional
+    label_color: ParsableManimColor | optional
         The color of the label's text. This parameter is only used when `label` is of type `str`.
     label_frame : Bool | optional
         Add a `SurroundingRectangle` frame to the label box.
-    frame_fill_color : numpy.ndarray | optional
+    frame_fill_color : ParsableManimColor | optional
         Background color to fill the label box. If no value is provided, the background color of the canvas will be used.
     frame_fill_opacity : float | optional
         Determine the opacity of the label box by passing a value in the range [0-1], where 0 indicates complete transparency and 1 means full opacity.

manim/mobject/geometry/line.py

@@ -17,7 +17,6 @@
 from typing import Any, Sequence
 
 import numpy as np
-from colour import Color
 
 from manim import config
 from manim.constants import *
@@ -28,7 +27,6 @@
 from manim.mobject.opengl.opengl_mobject import OpenGLMobject
 from manim.mobject.types.vectorized_mobject import DashedVMobject, VGroup, VMobject
 from manim.utils.color import *
-from manim.utils.color import Colors
 from manim.utils.space_ops import angle_of_vector, line_intersection, normalize
 
 
@@ -647,7 +645,7 @@ def coordinate_label(
         self,
         integer_labels: bool = True,
         n_dim: int = 2,
-        color: Color | None = None,
+        color: ParsableManimColor | None = None,
         **kwargs,
     ):
         """Creates a label based on the coordinates of the vector.
@@ -879,7 +877,7 @@ def __init__(
         dot: bool = False,
         dot_radius: float | None = None,
         dot_distance: float = 0.55,
-        dot_color: Colors = WHITE,
+        dot_color: ParsableManimColor = WHITE,
         elbow: bool = False,
         **kwargs,
     ):

manim/mobject/geometry/polygram.py

@@ -19,7 +19,6 @@
 from typing import Iterable, Sequence
 
 import numpy as np
-from colour import Color
 
 from manim.constants import *
 from manim.mobject.geometry.arc import ArcBetweenPoints
@@ -597,7 +596,7 @@ def construct(self):
 
     def __init__(
         self,
-        color: Color = WHITE,
+        color: ParsableManimColor = WHITE,
         height: float = 2.0,
         width: float = 4.0,
         grid_xstep: float | None = None,

manim/mobject/geometry/shape_matchers.py

@@ -10,7 +10,7 @@
 from manim.mobject.geometry.polygram import RoundedRectangle
 from manim.mobject.mobject import Mobject
 from manim.mobject.types.vectorized_mobject import VGroup
-from manim.utils.color import BLACK, RED, YELLOW, Color, Colors
+from manim.utils.color import BLACK, RED, YELLOW, ParsableManimColor
 
 
 class SurroundingRectangle(RoundedRectangle):
@@ -79,7 +79,7 @@ def construct(self):
     def __init__(
         self,
         mobject,
-        color: Colors | None = None,
+        color: ParsableManimColor | None = None,
         stroke_width: float = 0,
         stroke_opacity: float = 0,
         fill_opacity: float = 0.75,
@@ -121,7 +121,7 @@ def set_style(self, fill_opacity, **kwargs):
         return self
 
     def get_fill_color(self):
-        return Color(self.color)
+        return self.color
 
 
 class Cross(VGroup):
@@ -152,7 +152,7 @@ def construct(self):
     def __init__(
         self,
         mobject: Mobject | None = None,
-        stroke_color: Color = RED,
+        stroke_color: ParsableManimColor = RED,
         stroke_width: float = 6,
         scale_factor: float = 1,
         **kwargs,