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

Have shader_info remember its own id

Browse source
This commit is contained in:
Grant Sanderson 2020-06-15 11:59:24 -07:00
parent 9d772496dd
commit 1e6eef89ec
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
manimlib/utils/shaders.py
View file

@ -46,22 +46,19 @@ def get_shader_info(data=None,
depth_test=False,
render_primative=moderngl.TRIANGLE_STRIP,
):
return {
key: value
for key, value in zip(
SHADER_INFO_KEYS,
[
data,
vert_file,
geom_file,
frag_file,
uniforms or dict(),
texture_paths or dict(),
depth_test,
str(render_primative)
]
)
result = {
"data": data,
"vert": vert_file,
"geom": geom_file,
"frag": frag_file,
"uniforms": uniforms or dict(),
"texture_paths": texture_paths or dict(),
"depth_test": depth_test,
"render_primative": str(render_primative),
}
# A unique id for a shader
result["id"] = "|".join([str(result[key]) for key in SHADER_KEYS_FOR_ID])
return result
def is_valid_shader_info(shader_info):
@ -75,7 +72,7 @@ def is_valid_shader_info(shader_info):
def shader_info_to_id(shader_info):
# A unique id for a shader
return "|".join([str(shader_info[key]) for key in SHADER_KEYS_FOR_ID])
return shader_info["id"]
def same_shader_type(info1, info2):