opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-03 04:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use ctx.vertex_array instead of ctx.simple_vertex_array

Browse Source
This commit is contained in:
Grant Sanderson
2020-06-27 00:00:50 -07:00
parent 60e1c88eb4
commit 6ba1eae8f6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manimlib/camera/camera.py
View File

@ -347,7 +347,7 @@ class Camera(object):
if not raw_data:
return
shader = self.get_shader(shader_info)
shader, vert_format = self.get_shader(shader_info)
if shader is None:
return
@ -360,7 +360,11 @@ class Camera(object):
vbo = shader_info["vbo"]
else:
vbo = self.ctx.buffer(raw_data)
vao = self.ctx.simple_vertex_array(shader, vbo, *shader_info["attributes"])
# vao = self.ctx.simple_vertex_array(shader, vbo, *shader_info["attributes"])
vao = self.ctx.vertex_array(
program=shader,
content=[(vbo, vert_format, *shader_info["attributes"])]
)
vao.render(int(shader_info["render_primative"]))
vao.release()
if "vbo" not in shader_info:
@ -376,18 +380,18 @@ class Camera(object):
if sid not in self.id_to_shader:
# Create shader program for the first time, then cache
# in the id_to_shader dictionary
self.id_to_shader[sid] = self.ctx.program(
**shader_info_to_program_code(shader_info)
)
shader = self.id_to_shader[sid]
program = self.ctx.program(**shader_info_to_program_code(shader_info))
vert_format = moderngl.detect_format(program, shader_info["attributes"])
self.id_to_shader[sid] = (program, vert_format)
program, vert_format = self.id_to_shader[sid]
# Set uniforms
self.set_perspective_uniforms(shader)
self.set_perspective_uniforms(program)
for name, path in shader_info["texture_paths"].items():
tid = self.get_texture_id(path)
shader[name].value = tid
program[name].value = tid
for name, value in shader_info["uniforms"].items():
shader[name].value = value
return shader
program[name].value = value
return program, vert_format
def set_perspective_uniforms(self, shader):
for key, value in self.perspective_uniforms.items():