public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check_data_alignment by default

Browse source
This commit is contained in:
Grant Sanderson 2021-01-12 11:21:57 -10:00
parent ca1c2f7797
commit ba8fb4a6b7
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manimlib/mobject/mobject.py
View file

@ -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):

2
manimlib/mobject/types/dot_cloud.py
View file

@ -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

2
manimlib/mobject/types/image_mobject.py
View file

@ -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

6
manimlib/mobject/types/surface.py
View file

@ -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

6
manimlib/mobject/types/vectorized_mobject.py
View file

@ -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