Merge remote-tracking branch 'upstream/main' into RefactorExcludeDots

# Conflicts:
#	manim/mobject/text/text_mobject.py

Author: henrikmidtiby

manim/camera/camera.py

@@ -14,11 +14,19 @@
 
 import cairo
 import numpy as np
+import numpy.typing as npt
 from PIL import Image
 from scipy.spatial.distance import pdist
 from typing_extensions import Self
 
-from manim.typing import MatrixMN, PixelArray, Point3D, Point3D_Array
+from manim.typing import (
+    FloatRGBA_Array,
+    FloatRGBALike_Array,
+    ManimInt,
+    PixelArray,
+    Point3D,
+    Point3D_Array,
+)
 
 from .. import config, logger
 from ..constants import *
@@ -211,8 +219,8 @@ def type_or_raise(
             type[Mobject], Callable[[list[Mobject], PixelArray], Any]
         ] = {
             VMobject: self.display_multiple_vectorized_mobjects,  # type: ignore[dict-item]
-            PMobject: self.display_multiple_point_cloud_mobjects,
-            AbstractImageMobject: self.display_multiple_image_mobjects,
+            PMobject: self.display_multiple_point_cloud_mobjects,  # type: ignore[dict-item]
+            AbstractImageMobject: self.display_multiple_image_mobjects,  # type: ignore[dict-item]
             Mobject: lambda batch, pa: batch,  # Do nothing
         }
         # We have to check each type in turn because we are dealing with
@@ -723,7 +731,7 @@ def set_cairo_context_path(self, ctx: cairo.Context, vmobject: VMobject) -> Self
         return self
 
     def set_cairo_context_color(
-        self, ctx: cairo.Context, rgbas: MatrixMN, vmobject: VMobject
+        self, ctx: cairo.Context, rgbas: FloatRGBALike_Array, vmobject: VMobject
     ) -> Self:
         """Sets the color of the cairo context
 
@@ -818,7 +826,7 @@ def apply_stroke(
 
     def get_stroke_rgbas(
         self, vmobject: VMobject, background: bool = False
-    ) -> PixelArray:
+    ) -> FloatRGBA_Array:
         """Gets the RGBA array for the stroke of the passed
         VMobject.
 
@@ -837,7 +845,7 @@ def get_stroke_rgbas(
         """
         return vmobject.get_stroke_rgbas(background)
 
-    def get_fill_rgbas(self, vmobject: VMobject) -> PixelArray:
+    def get_fill_rgbas(self, vmobject: VMobject) -> FloatRGBA_Array:
         """Returns the RGBA array of the fill of the passed VMobject
 
         Parameters
@@ -898,7 +906,7 @@ def display_multiple_background_colored_vmobjects(
     # As a result, the other methods do not have as detailed docstrings as would be preferred.
 
     def display_multiple_point_cloud_mobjects(
-        self, pmobjects: list, pixel_array: PixelArray
+        self, pmobjects: Iterable[PMobject], pixel_array: PixelArray
     ) -> None:
         """Displays multiple PMobjects by modifying the passed pixel array.
 
@@ -921,8 +929,8 @@ def display_multiple_point_cloud_mobjects(
     def display_point_cloud(
         self,
         pmobject: PMobject,
-        points: list,
-        rgbas: np.ndarray,
+        points: Point3D_Array,
+        rgbas: FloatRGBA_Array,
         thickness: float,
         pixel_array: PixelArray,
     ) -> None:
@@ -972,7 +980,9 @@ def display_point_cloud(
         pixel_array[:, :] = new_pa.reshape((ph, pw, rgba_len))
 
     def display_multiple_image_mobjects(
-        self, image_mobjects: list, pixel_array: np.ndarray
+        self,
+        image_mobjects: Iterable[AbstractImageMobject],
+        pixel_array: PixelArray,
     ) -> None:
         """Displays multiple image mobjects by modifying the passed pixel_array.
 
@@ -1121,8 +1131,8 @@ def transform_points_pre_display(
     def points_to_pixel_coords(
         self,
         mobject: Mobject,
-        points: np.ndarray,
-    ) -> np.ndarray:  # TODO: Write more detailed docstrings for this method.
+        points: Point3D_Array,
+    ) -> npt.NDArray[ManimInt]:  # TODO: Write more detailed docstrings for this method.
         points = self.transform_points_pre_display(mobject, points)
         shifted_points = points - self.frame_center
 

manim/camera/three_d_camera.py

@@ -20,6 +20,7 @@
 from manim.mobject.types.vectorized_mobject import VMobject
 from manim.mobject.value_tracker import ValueTracker
 from manim.typing import (
+    FloatRGBA_Array,
     MatrixMN,
     Point3D,
     Point3D_Array,
@@ -109,7 +110,9 @@ def get_value_trackers(self) -> list[ValueTracker]:
             self.zoom_tracker,
         ]
 
-    def modified_rgbas(self, vmobject: VMobject, rgbas: MatrixMN) -> MatrixMN:
+    def modified_rgbas(
+        self, vmobject: VMobject, rgbas: FloatRGBA_Array
+    ) -> FloatRGBA_Array:
         if not self.should_apply_shading:
             return rgbas
         if vmobject.shade_in_3d and (vmobject.get_num_points() > 0):
@@ -137,12 +140,12 @@ def get_stroke_rgbas(
         self,
         vmobject: VMobject,
         background: bool = False,
-    ) -> MatrixMN:  # NOTE : DocStrings From parent
+    ) -> FloatRGBA_Array:  # NOTE : DocStrings From parent
         return self.modified_rgbas(vmobject, vmobject.get_stroke_rgbas(background))
 
     def get_fill_rgbas(
         self, vmobject: VMobject
-    ) -> MatrixMN:  # NOTE : DocStrings From parent
+    ) -> FloatRGBA_Array:  # NOTE : DocStrings From parent
         return self.modified_rgbas(vmobject, vmobject.get_fill_rgbas())
 
     def get_mobjects_to_display(

manim/mobject/mobject.py

@@ -2357,7 +2357,7 @@ def __getitem__(self, value):
     def __iter__(self):
         return iter(self.split())
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self.split())
 
     def get_group_class(self) -> type[Group]:

manim/mobject/opengl/opengl_mobject.py

@@ -53,6 +53,8 @@
 
     from manim.renderer.shader_wrapper import ShaderWrapper
     from manim.typing import (
+        FloatRGB_Array,
+        FloatRGBA_Array,
         ManimFloat,
         MappingFunction,
         MatrixMN,
@@ -328,9 +330,9 @@ def init_data(self) -> None:
         """Initializes the ``points``, ``bounding_box`` and ``rgbas`` attributes and groups them into self.data.
         Subclasses can inherit and overwrite this method to extend `self.data`.
         """
-        self.points = np.zeros((0, 3))
-        self.bounding_box = np.zeros((3, 3))
-        self.rgbas = np.zeros((1, 4))
+        self.points: Point3D_Array = np.zeros((0, 3))
+        self.bounding_box: Point3D_Array = np.zeros((3, 3))
+        self.rgbas: FloatRGBA_Array = np.zeros((1, 4))
 
     def init_colors(self) -> object:
         """Initializes the colors.
@@ -2082,7 +2084,7 @@ def set_rgba_array(
         recurse: bool = True,
     ) -> Self:
         if color is not None:
-            rgbs = np.array([color_to_rgb(c) for c in listify(color)])
+            rgbs: FloatRGB_Array = np.array([color_to_rgb(c) for c in listify(color)])
         if opacity is not None:
             opacities = listify(opacity)
 
@@ -2105,14 +2107,16 @@ def set_rgba_array(
 
         # Color and opacity
         if color is not None and opacity is not None:
-            rgbas = np.array([[*rgb, o] for rgb, o in zip(*make_even(rgbs, opacities))])
+            rgbas: FloatRGBA_Array = np.array(
+                [[*rgb, o] for rgb, o in zip(*make_even(rgbs, opacities))]
+            )
             for mob in self.get_family(recurse):
                 mob.data[name] = rgbas.copy()
         return self
 
     def set_rgba_array_direct(
         self,
-        rgbas: npt.NDArray[RGBA_Array_Float],
+        rgbas: FloatRGBA_Array,
         name: str = "rgbas",
         recurse: bool = True,
     ) -> Self:
@@ -2794,6 +2798,7 @@ def set_color_by_xyz_func(
         # of the shader code
         for char in "xyz":
             glsl_snippet = glsl_snippet.replace(char, "point." + char)
+        # TODO: get_colormap_list does not exist
         rgb_list = get_colormap_list(colormap)
         self.set_color_by_code(
             f"color.rgb = float_to_color({glsl_snippet}, {float(min_value)}, {float(max_value)}, {get_colormap_code(rgb_list)});",

manim/mobject/opengl/opengl_point_cloud_mobject.py

@@ -2,9 +2,10 @@
 
 __all__ = ["OpenGLPMobject", "OpenGLPGroup", "OpenGLPMPoint"]
 
+from typing import TYPE_CHECKING
+
 import moderngl
 import numpy as np
-from typing_extensions import Self
 
 from manim.constants import *
 from manim.mobject.opengl.opengl_mobject import OpenGLMobject
@@ -20,6 +21,16 @@
 from manim.utils.config_ops import _Uniforms
 from manim.utils.iterables import resize_with_interpolation
 
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
+    from manim.typing import (
+        FloatRGBA_Array,
+        FloatRGBALike_Array,
+        Point3D_Array,
+        Point3DLike_Array,
+    )
+
 __all__ = ["OpenGLPMobject", "OpenGLPGroup", "OpenGLPMPoint"]
 
 
@@ -48,14 +59,20 @@ def __init__(
         )
 
     def reset_points(self) -> Self:
-        self.rgbas = np.zeros((1, 4))
-        self.points = np.zeros((0, 3))
+        self.rgbas: FloatRGBA_Array = np.zeros((1, 4))
+        self.points: Point3D_Array = np.zeros((0, 3))
         return self
 
     def get_array_attrs(self):
         return ["points", "rgbas"]
 
-    def add_points(self, points, rgbas=None, color=None, opacity=None):
+    def add_points(
+        self,
+        points: Point3DLike_Array,
+        rgbas: FloatRGBALike_Array | None = None,
+        color: ParsableManimColor | None = None,
+        opacity: float | None = None,
+    ) -> Self:
         """Add points.
 
         Points must be a Nx3 numpy array.

manim/mobject/opengl/opengl_vectorized_mobject.py

@@ -84,6 +84,9 @@ class OpenGLVMobject(OpenGLMobject):
     stroke_shader_folder = "quadratic_bezier_stroke"
     fill_shader_folder = "quadratic_bezier_fill"
 
+    # TODO: although these are called "rgba" in singular, they are used as
+    # FloatRGBA_Arrays and should be called instead "rgbas" in plural for consistency.
+    # The same should probably apply for "stroke_width" and "unit_normal".
     fill_rgba = _Data()
     stroke_rgba = _Data()
     stroke_width = _Data()

manim/mobject/svg/svg_mobject.py

@@ -11,7 +11,7 @@
 import svgelements as se
 
 from manim import config, logger
-from manim.utils.color import ParsableManimColor
+from manim.utils.color import ManimColor, ParsableManimColor
 
 from ...constants import RIGHT
 from ...utils.bezier import get_quadratic_approximation_of_cubic
@@ -120,7 +120,7 @@ def __init__(
         self.should_center = should_center
         self.svg_height = height
         self.svg_width = width
-        self.color = color
+        self.color = ManimColor(color)
         self.opacity = opacity
         self.fill_color = fill_color
         self.fill_opacity = fill_opacity  # type: ignore[assignment]

manim/mobject/text/code_mobject.py

@@ -19,7 +19,6 @@
 from manim.mobject.geometry.arc import Dot
 from manim.mobject.geometry.shape_matchers import SurroundingRectangle
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
-from manim.mobject.text.text_mobject import Paragraph
 from manim.mobject.types.vectorized_mobject import VGroup, VMobject
 from manim.typing import StrPath
 from manim.utils.color import WHITE, ManimColor
@@ -119,6 +118,7 @@ def construct(self):
         "line_spacing": 0.5,
         "disable_ligatures": True,
     }
+    code: VMobject
 
     def __init__(
         self,
@@ -200,6 +200,8 @@ def __init__(
         base_paragraph_config = self.default_paragraph_config.copy()
         base_paragraph_config.update(paragraph_config)
 
+        from manim.mobject.text.text_mobject import Paragraph
+
         self.code_lines = Paragraph(
             *code_lines,
             **base_paragraph_config,
@@ -224,6 +226,8 @@ def __init__(
             )
             self.add(self.line_numbers)
 
+        for line in self.code_lines:
+            line.submobjects = [c for c in line if not isinstance(c, Dot)]
         self.add(self.code_lines)
 
         if background_config is None:

manim/mobject/text/numbers.py

@@ -18,7 +18,7 @@
 from manim.mobject.value_tracker import ValueTracker
 from manim.typing import Vector3DLike
 
-string_to_mob_map: dict[str, VMobject] = {}
+string_to_mob_map: dict[str, SingleStringMathTex] = {}
 
 
 class DecimalNumber(VMobject, metaclass=ConvertToOpenGL):
@@ -227,7 +227,7 @@ def _string_to_mob(
         if string not in string_to_mob_map:
             string_to_mob_map[string] = mob_class(string, **kwargs)
         mob = string_to_mob_map[string].copy()
-        mob.font_size = self._font_size  # type: ignore[attr-defined]
+        mob.font_size = self._font_size
         return mob
 
     def _get_formatter(self, **kwargs: Any) -> str: