From 0c9afb65d9c7bee290f1eb41562170a42bf363c8 Mon Sep 17 00:00:00 2001 From: Grant Sanderson Date: Wed, 1 Feb 2023 11:19:40 -0800 Subject: [PATCH] Small clean up to render calls --- manimlib/shader_wrapper.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/manimlib/shader_wrapper.py b/manimlib/shader_wrapper.py index 1f522fe7..2c949057 100644 --- a/manimlib/shader_wrapper.py +++ b/manimlib/shader_wrapper.py @@ -280,12 +280,10 @@ class FillShaderWrapper(ShaderWrapper): self.fill_canvas = get_fill_canvas(self.ctx) def render(self): - vao = self.vao - assert(vao is not None) winding = (len(self.vert_indices) == 0) - vao.program['winding'].value = winding + self.program['winding'].value = winding if not winding: - vao.render() + super().render() return original_fbo = self.ctx.fbo @@ -301,14 +299,13 @@ class FillShaderWrapper(ShaderWrapper): gl.GL_ONE, gl.GL_ONE, ) gl.glBlendEquationSeparate(gl.GL_FUNC_ADD, gl.GL_MAX) - self.ctx.blend_equation = moderngl.FUNC_ADD, moderngl.MAX - vao.render() + super().render() original_fbo.use() gl.glBlendFunc(gl.GL_ONE, gl.GL_ONE_MINUS_SRC_ALPHA) gl.glBlendEquation(gl.GL_FUNC_ADD) - texture_vao.render(moderngl.TRIANGLE_STRIP) + texture_vao.render() gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA)