From 95bb67c47fb799bd6283bd88cd937938b1909a45 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Tue, 1 Oct 2024 13:18:40 -0500 Subject: [PATCH] Change return type for Mobject.get_shader_data --- manimlib/mobject/mobject.py | 8 ++++---- manimlib/mobject/types/vectorized_mobject.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py index a09d6116..a24e925b 100644 --- a/manimlib/mobject/mobject.py +++ b/manimlib/mobject/mobject.py @@ -2029,17 +2029,17 @@ class Mobject(object): result = [] for submobs, sid in batches: 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) result.append(shader_wrapper) return result - def get_shader_data(self) -> Iterable[np.ndarray]: + def get_shader_data(self) -> np.ndarray: indices = self.get_shader_vert_indices() if indices is not None: - return [self.data[indices]] + return self.data[indices] else: - return [self.data] + return self.data def get_uniforms(self): return self.uniforms diff --git a/manimlib/mobject/types/vectorized_mobject.py b/manimlib/mobject/types/vectorized_mobject.py index 715e9b83..2e686cd7 100644 --- a/manimlib/mobject/types/vectorized_mobject.py +++ b/manimlib/mobject/types/vectorized_mobject.py @@ -1280,11 +1280,11 @@ class VMobject(Mobject): super().refresh_shader_wrapper_id() 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? self.get_joint_angles() 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]):