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

Have init_fill_fbo take in ctx as an argument

Browse source
This commit is contained in:
Grant Sanderson 2023-01-24 15:28:09 -08:00
parent 945aa9713f
commit 88ed1a2fdb
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
manimlib/camera/camera.py
View file

@ -231,7 +231,7 @@ class Camera(object):
self.init_textures() self.init_textures()
self.init_light_source() self.init_light_source()
self.refresh_perspective_uniforms() self.refresh_perspective_uniforms()
self.init_fill_fbo() # Experimental self.init_fill_fbo(self.ctx) # Experimental
# A cached map from mobjects to their associated list of render groups # A cached map from mobjects to their associated list of render groups
# so that these render groups are not regenerated unnecessarily for static # so that these render groups are not regenerated unnecessarily for static
# mobjects # mobjects
@ -255,16 +255,17 @@ class Camera(object):
# This is the frame buffer we'll draw into when emitting frames # This is the frame buffer we'll draw into when emitting frames
self.draw_fbo = self.get_fbo(samples=0) self.draw_fbo = self.get_fbo(samples=0)
def init_fill_fbo(self): def init_fill_fbo(self, ctx):
# Experimental # Experimental
self.fill_texture = self.ctx.texture( self.fill_texture = ctx.texture(
size=self.get_pixel_shape(), size=self.get_pixel_shape(),
components=4, components=4,
samples=self.samples, samples=self.samples,
) )
fill_depth = self.ctx.depth_renderbuffer(self.get_pixel_shape(), samples=self.samples) # TODO, depth buffer is not really used yet
self.fill_fbo = self.ctx.framebuffer(self.fill_texture, fill_depth) fill_depth = ctx.depth_renderbuffer(self.get_pixel_shape(), samples=self.samples)
self.fill_prog = self.ctx.program( self.fill_fbo = ctx.framebuffer(self.fill_texture, fill_depth)
self.fill_prog = ctx.program(
vertex_shader=''' vertex_shader='''
#version 330 #version 330
@ -285,10 +286,8 @@ class Camera(object):
out vec4 frag_color; out vec4 frag_color;
void main() { void main() {
vec4 color = texture(Texture, v_textcoord); frag_color = texture(Texture, v_textcoord);
if(color.a == 0) discard; if(frag_color.a == 0) discard;
frag_color = color;
// frag_color = vec4(1, 0, 0, 0.2);
} }
''', ''',
) )
@ -297,9 +296,9 @@ class Camera(object):
self.fill_prog['Texture'].value = tid self.fill_prog['Texture'].value = tid
self.n_textures += 1 self.n_textures += 1
verts = np.array([[0, 0], [0, 1], [1, 0], [1, 1]]) verts = np.array([[0, 0], [0, 1], [1, 0], [1, 1]])
self.fill_texture_vao = self.ctx.simple_vertex_array( self.fill_texture_vao = ctx.simple_vertex_array(
self.fill_prog, self.fill_prog,
self.ctx.buffer(verts.astype('f4').tobytes()), ctx.buffer(verts.astype('f4').tobytes()),
'texcoord', 'texcoord',
) )