From ba8fb4a6b7242889e931fc7ee23a18ece879868a Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Tue, 12 Jan 2021 11:21:57 -1000 Subject: [PATCH] check_data_alignment by default --- manimlib/mobject/mobject.py | 5 ++--- manimlib/mobject/types/dot_cloud.py | 2 +- manimlib/mobject/types/image_mobject.py | 2 +- manimlib/mobject/types/surface.py | 6 +++--- manimlib/mobject/types/vectorized_mobject.py | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py index 979eb952..6d474f56 100644 --- a/manimlib/mobject/mobject.py +++ b/manimlib/mobject/mobject.py @@ -1403,11 +1403,10 @@ class Mobject(object): self.shader_data = resize_array(self.shader_data, length) return self.shader_data - def read_data_to_shader(self, shader_data, shader_data_key, data_key, check_alignment=False): + def read_data_to_shader(self, shader_data, shader_data_key, data_key): if data_key in self.locked_data_keys: return - if check_alignment: - self.check_data_alignment(shader_data, data_key) + self.check_data_alignment(shader_data, data_key) shader_data[shader_data_key] = self.data[data_key] def get_shader_data(self): diff --git a/manimlib/mobject/types/dot_cloud.py b/manimlib/mobject/types/dot_cloud.py index 63713844..6df532fc 100644 --- a/manimlib/mobject/types/dot_cloud.py +++ b/manimlib/mobject/types/dot_cloud.py @@ -70,5 +70,5 @@ class DotCloud(PMobject): def get_shader_data(self): shader_data = super().get_shader_data() self.read_data_to_shader(shader_data, "radius", "radii") - self.read_data_to_shader(shader_data, "color", "rgbas", check_alignment=True) + self.read_data_to_shader(shader_data, "color", "rgbas") return shader_data diff --git a/manimlib/mobject/types/image_mobject.py b/manimlib/mobject/types/image_mobject.py index 034cefa7..bada35e3 100644 --- a/manimlib/mobject/types/image_mobject.py +++ b/manimlib/mobject/types/image_mobject.py @@ -63,5 +63,5 @@ class ImageMobject(Mobject): def get_shader_data(self): shader_data = super().get_shader_data() self.read_data_to_shader(shader_data, "im_coords", "im_coords") - self.read_data_to_shader(shader_data, "opacity", "opacity", check_alignment=True) + self.read_data_to_shader(shader_data, "opacity", "opacity") return shader_data diff --git a/manimlib/mobject/types/surface.py b/manimlib/mobject/types/surface.py index affde24d..ade174bc 100644 --- a/manimlib/mobject/types/surface.py +++ b/manimlib/mobject/types/surface.py @@ -158,7 +158,7 @@ class ParametricSurface(Mobject): return shader_data def fill_in_shader_color_info(self, shader_data): - self.read_data_to_shader(shader_data, "color", "rgbas", check_alignment=True) + self.read_data_to_shader(shader_data, "color", "rgbas") return shader_data def get_shader_vert_indices(self): @@ -250,6 +250,6 @@ class TexturedSurface(ParametricSurface): return result def fill_in_shader_color_info(self, shader_data): - self.read_data_to_shader(shader_data, "opacity", "opacity", check_alignment=True) - self.read_data_to_shader(shader_data, "im_coords", "im_coords", check_alignment=True) + self.read_data_to_shader(shader_data, "opacity", "opacity") + self.read_data_to_shader(shader_data, "im_coords", "im_coords") return shader_data diff --git a/manimlib/mobject/types/vectorized_mobject.py b/manimlib/mobject/types/vectorized_mobject.py index 4463f59c..d1506dd6 100644 --- a/manimlib/mobject/types/vectorized_mobject.py +++ b/manimlib/mobject/types/vectorized_mobject.py @@ -840,8 +840,8 @@ class VMobject(Mobject): self.stroke_data["next_point"][:-nppc] = points[nppc:] self.stroke_data["next_point"][-nppc:] = points[:nppc] - self.read_data_to_shader(self.stroke_data, "color", "stroke_rgba", True) - self.read_data_to_shader(self.stroke_data, "stroke_width", "stroke_width", True) + self.read_data_to_shader(self.stroke_data, "color", "stroke_rgba") + self.read_data_to_shader(self.stroke_data, "stroke_width", "stroke_width") self.read_data_to_shader(self.stroke_data, "unit_normal", "unit_normal") return self.stroke_data @@ -914,7 +914,7 @@ class VMobject(Mobject): self.fill_data["vert_index"][:, 0] = range(len(points)) self.read_data_to_shader(self.fill_data, "point", "points") - self.read_data_to_shader(self.fill_data, "color", "fill_rgba", True) + self.read_data_to_shader(self.fill_data, "color", "fill_rgba") self.read_data_to_shader(self.fill_data, "unit_normal", "unit_normal") return self.fill_data