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

FIx Mobject.replace_shader_code

Browse source
This commit is contained in:
Grant Sanderson 2023-02-02 20:47:55 -08:00
parent d10745a379
commit c4777015fc
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
manimlib/mobject/mobject.py
View file

@ -105,6 +105,7 @@ class Mobject(object):
self.bounding_box: Vect3Array = np.zeros((3, 3)) self.bounding_box: Vect3Array = np.zeros((3, 3))
self._shaders_initialized: bool = False self._shaders_initialized: bool = False
self._data_has_changed: bool = True self._data_has_changed: bool = True
self.shader_code_replacements: dict[str, str] = dict()
self.init_data() self.init_data()
self._data_defaults = np.ones(1, dtype=self.data.dtype) self._data_defaults = np.ones(1, dtype=self.data.dtype)
@ -1895,12 +1896,12 @@ class Mobject(object):
# Shader code manipulation # Shader code manipulation
@affects_data
def replace_shader_code(self, old: str, new: str) -> Self: def replace_shader_code(self, old: str, new: str) -> Self:
# TODO, will this work with VMobject structure, given self.shader_code_replacements[old] = new
# that it does not simpler return shader_wrappers of self._shaders_initialized = False
# family? for mob in self.get_ancestors():
for wrapper in self.get_shader_wrapper_list(): mob._shaders_initialized = False
wrapper.replace_code(old, new)
return self return self
def set_color_by_code(self, glsl_code: str) -> Self: def set_color_by_code(self, glsl_code: str) -> Self:
@ -1969,6 +1970,8 @@ class Mobject(object):
self.shader_wrapper.vert_indices = self.get_shader_vert_indices() self.shader_wrapper.vert_indices = self.get_shader_vert_indices()
self.shader_wrapper.bind_to_mobject_uniforms(self.get_uniforms()) self.shader_wrapper.bind_to_mobject_uniforms(self.get_uniforms())
self.shader_wrapper.depth_test = self.depth_test self.shader_wrapper.depth_test = self.depth_test
for old, new in self.shader_code_replacements.items():
self.shader_wrapper.replace_code(old, new)
return self.shader_wrapper return self.shader_wrapper
def get_shader_wrapper_list(self, ctx: Context) -> list[ShaderWrapper]: def get_shader_wrapper_list(self, ctx: Context) -> list[ShaderWrapper]:

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

@ -1292,6 +1292,10 @@ class VMobject(Mobject):
self.fill_shader_wrapper, self.fill_shader_wrapper,
self.stroke_shader_wrapper, self.stroke_shader_wrapper,
] ]
for sw in self.shader_wrappers:
rep = self.family_members_with_points()[0]
for old, new in rep.shader_code_replacements.items():
sw.replace_code(old, new)
def refresh_shader_wrapper_id(self) -> Self: def refresh_shader_wrapper_id(self) -> Self:
if not self._shaders_initialized: if not self._shaders_initialized:
@ -1355,8 +1359,9 @@ class VMobject(Mobject):
self.stroke_shader_wrapper.read_in(stroke_datas), self.stroke_shader_wrapper.read_in(stroke_datas),
] ]
for sw in shader_wrappers: for sw in shader_wrappers:
sw.bind_to_mobject_uniforms(family[0].get_uniforms()) rep = family[0] # Representative family member
sw.depth_test = family[0].depth_test sw.bind_to_mobject_uniforms(rep.get_uniforms())
sw.depth_test = rep.depth_test
return [sw for sw in shader_wrappers if len(sw.vert_data) > 0] return [sw for sw in shader_wrappers if len(sw.vert_data) > 0]