opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-28 20:43:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have Mobject pass their own render primative

Browse Source
This commit is contained in:
Grant Sanderson
2020-02-07 09:37:21 -08:00
parent 1018cca4eb
commit b243c522b1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manimlib/camera/camera.py
View File

@ -13,7 +13,6 @@ from manimlib.mobject.mobject import Mobject
from manimlib.utils.config_ops import digest_config from manimlib.utils.config_ops import digest_config
from manimlib.utils.iterables import batch_by_property from manimlib.utils.iterables import batch_by_property
from manimlib.utils.iterables import list_difference_update from manimlib.utils.iterables import list_difference_update
from manimlib.utils.iterables import join_structured_arrays
from manimlib.utils.family_ops import extract_mobject_family_members from manimlib.utils.family_ops import extract_mobject_family_members
from manimlib.utils.simple_functions import fdiv from manimlib.utils.simple_functions import fdiv
@ -221,9 +220,10 @@ class Camera(object):
# but can we somehow use z-buffering to better effect here? # but can we somehow use z-buffering to better effect here?
batches = batch_by_property(shader_infos, self.get_shader_id) batches = batch_by_property(shader_infos, self.get_shader_id)
for info_group, sid in batches: for info_group, sid in batches:
data = join_structured_arrays(*[info["data"] for info in info_group])
shader = self.get_shader(sid) shader = self.get_shader(sid)
self.render_from_shader(shader, data) data = np.hstack([info["data"] for info in info_group])
render_primative = info_group[0]["render_primative"]
self.render_from_shader(shader, data, render_primative)
# Shader stuff # Shader stuff
def init_shaders(self): def init_shaders(self):
@ -280,10 +280,10 @@ class Camera(object):
shader['aspect_ratio'].value = fw / fh shader['aspect_ratio'].value = fw / fh
shader['anti_alias_width'].value = ANTI_ALIAS_WIDTH shader['anti_alias_width'].value = ANTI_ALIAS_WIDTH
def render_from_shader(self, shader, data): def render_from_shader(self, shader, data, render_primative):
vbo = shader.ctx.buffer(data.tobytes()) vbo = shader.ctx.buffer(data.tobytes())
vao = shader.ctx.simple_vertex_array(shader, vbo, *data.dtype.names) vao = shader.ctx.simple_vertex_array(shader, vbo, *data.dtype.names)
vao.render(moderngl.TRIANGLES) # TODO, allow different render types vao.render(render_primative)
def get_vmob_shader(ctx, type): def get_vmob_shader(ctx, type):