diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py index 2b72c084..866249e5 100644 --- a/manimlib/mobject/mobject.py +++ b/manimlib/mobject/mobject.py @@ -70,7 +70,7 @@ class Mobject(object): ] data_dtype: np.dtype = np.dtype([ ('points', ' str: - return rgb_to_hex(self.data["rgbas"][0, :3]) + return rgb_to_hex(self.data["rgba"][0, :3]) def get_opacity(self) -> float: - return self.data["rgbas"][0, 3] + return self.data["rgba"][0, 3] def set_color_by_gradient(self, *colors: ManimColor): if self.has_points(): diff --git a/manimlib/mobject/types/dot_cloud.py b/manimlib/mobject/types/dot_cloud.py index 11be87a0..9a6e861e 100644 --- a/manimlib/mobject/types/dot_cloud.py +++ b/manimlib/mobject/types/dot_cloud.py @@ -31,8 +31,8 @@ class DotCloud(PMobject): ] data_dtype: np.dtype = np.dtype([ ('points', np.float32, (3,)), - ('radii', np.float32, (1,)), - ('rgbas', np.float32, (4,)), + ('radius', np.float32, (1,)), + ('rgba', np.float32, (4,)), ]) def __init__( self, @@ -104,15 +104,15 @@ class DotCloud(PMobject): def set_radii(self, radii: npt.ArrayLike): n_points = len(self.get_points()) radii = np.array(radii).reshape((len(radii), 1)) - self.data["radii"][:] = resize_with_interpolation(radii, n_points) + self.data["radius"][:] = resize_with_interpolation(radii, n_points) self.refresh_bounding_box() return self def get_radii(self) -> np.ndarray: - return self.data["radii"] + return self.data["radius"] def set_radius(self, radius: float): - self.data["radii"][:] = radius + self.data["radius"][:] = radius self.refresh_bounding_box() return self @@ -151,8 +151,8 @@ class DotCloud(PMobject): def get_shader_data(self) -> np.ndarray: shader_data = super().get_shader_data() - self.read_data_to_shader(shader_data, "radius", "radii") - self.read_data_to_shader(shader_data, "color", "rgbas") + self.read_data_to_shader(shader_data, "radius", "radius") + self.read_data_to_shader(shader_data, "color", "rgba") return shader_data diff --git a/manimlib/mobject/types/point_cloud_mobject.py b/manimlib/mobject/types/point_cloud_mobject.py index 4bb9cb5d..ee1b384b 100644 --- a/manimlib/mobject/types/point_cloud_mobject.py +++ b/manimlib/mobject/types/point_cloud_mobject.py @@ -37,14 +37,14 @@ class PMobject(Mobject): # rgbas array will have been resized with points if color is not None: if opacity is None: - opacity = self.data["rgbas"][-1, 3] + opacity = self.data["rgba"][-1, 3] rgbas = np.repeat( [color_to_rgba(color, opacity)], len(points), axis=0 ) if rgbas is not None: - self.data["rgbas"][-len(rgbas):] = rgbas + self.data["rgba"][-len(rgbas):] = rgbas return self def add_point(self, point: Vect3, rgba=None, color=None, opacity=None): @@ -53,15 +53,15 @@ class PMobject(Mobject): return self def set_color_by_gradient(self, *colors: ManimColor): - self.data["rgbas"][:] = np.array(list(map( + self.data["rgba"][:] = np.array(list(map( color_to_rgba, color_gradient(colors, self.get_num_points()) ))) return self def match_colors(self, pmobject: PMobject): - self.data["rgbas"][:] = resize_with_interpolation( - pmobject.data["rgbas"], self.get_num_points() + self.data["rgba"][:] = resize_with_interpolation( + pmobject.data["rgba"], self.get_num_points() ) return self