opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-31 22:13:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add depth sampling for fill

Browse Source
This commit is contained in:
Grant Sanderson
2023-01-28 10:36:41 -08:00
parent 1a62314719
commit 60a27f52f1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manimlib/utils/shaders.py
View File

@ -103,7 +103,7 @@ def get_colormap_code(rgb_list: Sequence[float]) -> str:
@lru_cache() @lru_cache()
def get_fill_canvas(ctx) -> Tuple[Framebuffer, VertexArray, Tuple[float, float, float]]: def get_fill_canvas(ctx: moderngl.Context) -> Tuple[Framebuffer, VertexArray, Tuple[float, float, float]]:
""" """
Because VMobjects with fill are rendered in a funny way, using Because VMobjects with fill are rendered in a funny way, using
alpha blending to effectively compute the winding number around alpha blending to effectively compute the winding number around
@ -121,8 +121,8 @@ def get_fill_canvas(ctx) -> Tuple[Framebuffer, VertexArray, Tuple[float, float,
# Important to make sure dtype is floating point (not fixed point) # Important to make sure dtype is floating point (not fixed point)
# so that alpha values can be negative and are not clipped # so that alpha values can be negative and are not clipped
texture = ctx.texture(size=size, components=4, dtype='f2') texture = ctx.texture(size=size, components=4, dtype='f2')
depth_buffer = ctx.depth_renderbuffer(size) # TODO, currently not used depth_texture = ctx.depth_texture(size=size)
texture_fbo = ctx.framebuffer(texture, depth_buffer) texture_fbo = ctx.framebuffer(texture, depth_texture)
# We'll paint onto a canvas with initially negative rgbs, and # We'll paint onto a canvas with initially negative rgbs, and
# discard any pixels remaining close to this value. This is # discard any pixels remaining close to this value. This is
@ -150,6 +150,7 @@ def get_fill_canvas(ctx) -> Tuple[Framebuffer, VertexArray, Tuple[float, float,
#version 330 #version 330
uniform sampler2D Texture; uniform sampler2D Texture;
uniform sampler2D DepthTexture;
uniform vec3 null_rgb; uniform vec3 null_rgb;
in vec2 v_textcoord; in vec2 v_textcoord;
@ -164,12 +165,13 @@ def get_fill_canvas(ctx) -> Tuple[Framebuffer, VertexArray, Tuple[float, float,
// Un-blend from the null value // Un-blend from the null value
color.rgb -= (1 - color.a) * null_rgb; color.rgb -= (1 - color.a) * null_rgb;
//TODO, set gl_FragDepth; gl_FragDepth = texture(DepthTexture, v_textcoord)[0];
} }
''', ''',
) )
simple_program['Texture'].value = get_texture_id(texture) simple_program['Texture'].value = get_texture_id(texture)
simple_program['DepthTexture'].value = get_texture_id(depth_texture)
simple_program['null_rgb'].value = null_rgb simple_program['null_rgb'].value = null_rgb
verts = np.array([[0, 0], [0, 1], [1, 0], [1, 1]]) verts = np.array([[0, 0], [0, 1], [1, 0], [1, 1]])