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

Change return type for Mobject.get_shader_data

Browse source
This commit is contained in:
Grant Sanderson 2024-10-01 13:18:40 -05:00
parent 512fb89726
commit 95bb67c47f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
manimlib/mobject/mobject.py
View file

@ -2029,17 +2029,17 @@ class Mobject(object):
result = [] result = []
for submobs, sid in batches: for submobs, sid in batches:
shader_wrapper = submobs[0].shader_wrapper shader_wrapper = submobs[0].shader_wrapper
data_list = list(it.chain(*(sm.get_shader_data() for sm in submobs))) data_list = [sm.get_shader_data() for sm in submobs]
shader_wrapper.read_in(data_list) shader_wrapper.read_in(data_list)
result.append(shader_wrapper) result.append(shader_wrapper)
return result return result
def get_shader_data(self) -> Iterable[np.ndarray]: def get_shader_data(self) -> np.ndarray:
indices = self.get_shader_vert_indices() indices = self.get_shader_vert_indices()
if indices is not None: if indices is not None:
return [self.data[indices]] return self.data[indices]
else: else:
return [self.data] return self.data
def get_uniforms(self): def get_uniforms(self):
return self.uniforms return self.uniforms

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

@ -1280,11 +1280,11 @@ class VMobject(Mobject):
super().refresh_shader_wrapper_id() super().refresh_shader_wrapper_id()
return self return self
def get_shader_data(self) -> Iterable[np.ndarray]: def get_shader_data(self) -> np.ndarray:
# Do we want this elsewhere? Say whenever points are refreshed or something? # Do we want this elsewhere? Say whenever points are refreshed or something?
self.get_joint_angles() self.get_joint_angles()
self.data["base_normal"][0::2] = self.data["point"][0] self.data["base_normal"][0::2] = self.data["point"][0]
return [self.data[self.get_outer_vert_indices()]] return self.data[self.get_outer_vert_indices()]
class VGroup(Group, VMobject, Generic[SubVmobjectType]): class VGroup(Group, VMobject, Generic[SubVmobjectType]):