public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-08-19 21:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change to using glBlendFuncSeparate

Browse source 
To please type checkers
This commit is contained in:
Grant Sanderson 2023-01-26 22:51:14 -08:00
parent eab8edd51d
commit 6388647860
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
manimlib/shader_wrapper.py
View file

@ -275,6 +275,7 @@ class FillShaderWrapper(ShaderWrapper):
**kwargs **kwargs
): ):
super().__init__(ctx, *args, **kwargs) super().__init__(ctx, *args, **kwargs)
self.texture_fbo, self.texture_vao = get_fill_palette(self.ctx)
def render(self): def render(self):
vao = self.vao vao = self.vao
@ -286,22 +287,25 @@ class FillShaderWrapper(ShaderWrapper):
return return
original_fbo = self.ctx.fbo original_fbo = self.ctx.fbo
texture_fbo, texture_vao = get_fill_palette(self.ctx)
texture_fbo.clear() self.texture_fbo.clear()
texture_fbo.use() self.texture_fbo.use()
self.ctx.blend_func = ( gl.glBlendFuncSeparate(
# Ordinary blending for colors # Ordinary blending for colors
moderngl.SRC_ALPHA, moderngl.ONE_MINUS_SRC_ALPHA, gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA,
# Just take the max of the alphas, given the shenanigans # Just take the max of the alphas, given the shenanigans
# with how alphas are being used to compute winding numbers # with how alphas are being used to compute winding numbers
moderngl.ONE, moderngl.ONE gl.GL_ONE, gl.GL_ONE,
) )
gl.glBlendEquationSeparate(gl.GL_FUNC_ADD, gl.GL_MAX)
self.ctx.blend_equation = moderngl.FUNC_ADD, moderngl.MAX self.ctx.blend_equation = moderngl.FUNC_ADD, moderngl.MAX
vao.render(moderngl.TRIANGLE_STRIP) vao.render(moderngl.TRIANGLE_STRIP)
original_fbo.use() original_fbo.use()
self.ctx.blend_func = (moderngl.ONE, moderngl.ONE_MINUS_SRC_ALPHA) gl.glBlendFunc(gl.GL_ONE, gl.GL_ONE_MINUS_SRC_ALPHA)
self.ctx.blend_equation = moderngl.FUNC_ADD gl.glBlendEquation(gl.GL_FUNC_ADD)
texture_vao.render(moderngl.TRIANGLE_STRIP)
self.ctx.blend_func = moderngl.DEFAULT_BLENDING self.texture_vao.render(moderngl.TRIANGLE_STRIP)
gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA)