public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-04-13 09:47:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small cleanup

Browse source
This commit is contained in:
Grant Sanderson 2023-01-24 12:04:43 -08:00
parent 8a6deb4068
commit 1dda706335
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
manimlib/camera/camera.py
View file

@ -241,20 +241,18 @@ class Camera(object):
def init_context(self, window: Window | None = None) -> None: def init_context(self, window: Window | None = None) -> None:
if window is None: if window is None:
ctx = moderngl.create_standalone_context() self.ctx = moderngl.create_standalone_context()
fbo = self.get_fbo(ctx, self.samples) self.fbo = self.get_fbo(self.samples)
else: else:
ctx = window.ctx self.ctx = window.ctx
fbo = ctx.detect_framebuffer() self.fbo = self.ctx.detect_framebuffer()
self.ctx = ctx
self.fbo = fbo
self.fbo.use() self.fbo.use()
self.set_ctx_blending() self.set_ctx_blending()
self.ctx.enable(moderngl.PROGRAM_POINT_SIZE) self.ctx.enable(moderngl.PROGRAM_POINT_SIZE)
# 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(ctx, 0) self.draw_fbo = self.get_fbo(samples=0)
def set_ctx_blending(self, enable: bool = True) -> None: def set_ctx_blending(self, enable: bool = True) -> None:
if enable: if enable:
@ -278,16 +276,15 @@ class Camera(object):
# Methods associated with the frame buffer # Methods associated with the frame buffer
def get_fbo( def get_fbo(
self, self,
ctx: moderngl.Context,
samples: int = 0 samples: int = 0
) -> moderngl.Framebuffer: ) -> moderngl.Framebuffer:
return ctx.framebuffer( return self.ctx.framebuffer(
color_attachments=ctx.texture( color_attachments=self.ctx.texture(
self.default_pixel_shape, self.default_pixel_shape,
components=self.n_channels, components=self.n_channels,
samples=samples, samples=samples,
), ),
depth_attachment=ctx.depth_renderbuffer( depth_attachment=self.ctx.depth_renderbuffer(
self.default_pixel_shape, self.default_pixel_shape,
samples=samples samples=samples
) )
@ -326,7 +323,7 @@ class Camera(object):
def get_pixel_array(self) -> np.ndarray: def get_pixel_array(self) -> np.ndarray:
raw = self.get_raw_fbo_data(dtype='f4') raw = self.get_raw_fbo_data(dtype='f4')
flat_arr = np.frombuffer(raw, dtype='f4') flat_arr = np.frombuffer(raw, dtype='f4')
arr = flat_arr.reshape([*reversed(self.fbo.size), self.n_channels]) arr = flat_arr.reshape([*reversed(self.draw_fbo.size), self.n_channels])
arr = arr[::-1] arr = arr[::-1]
# Convert from float # Convert from float
return (self.rgb_max_val * arr).astype(self.pixel_array_dtype) return (self.rgb_max_val * arr).astype(self.pixel_array_dtype)
@ -342,7 +339,7 @@ class Camera(object):
return texture return texture
# Getting camera attributes # Getting camera attributes
def get_pixel_size(self): def get_pixel_size(self) -> float:
return self.frame.get_shape()[0] / self.get_pixel_shape()[0] return self.frame.get_shape()[0] / self.get_pixel_shape()[0]
def get_pixel_shape(self) -> tuple[int, int]: def get_pixel_shape(self) -> tuple[int, int]:
@ -354,6 +351,10 @@ class Camera(object):
def get_pixel_height(self) -> int: def get_pixel_height(self) -> int:
return self.get_pixel_shape()[1] return self.get_pixel_shape()[1]
def get_aspect_ratio(self):
pw, ph = self.get_pixel_shape()
return pw / ph
def get_frame_height(self) -> float: def get_frame_height(self) -> float:
return self.frame.get_height() return self.frame.get_height()
@ -376,17 +377,15 @@ class Camera(object):
whether frame_height or frame_width whether frame_height or frame_width
remains fixed while the other changes accordingly. remains fixed while the other changes accordingly.
""" """
pixel_height = self.get_pixel_height()
pixel_width = self.get_pixel_width()
frame_height = self.get_frame_height() frame_height = self.get_frame_height()
frame_width = self.get_frame_width() frame_width = self.get_frame_width()
aspect_ratio = fdiv(pixel_width, pixel_height) aspect_ratio = self.get_aspect_ratio()
if not fixed_dimension: if not fixed_dimension:
frame_height = frame_width / aspect_ratio frame_height = frame_width / aspect_ratio
else: else:
frame_width = aspect_ratio * frame_height frame_width = aspect_ratio * frame_height
self.frame.set_height(frame_height) self.frame.set_height(frame_height, stretch=true)
self.frame.set_width(frame_width) self.frame.set_width(frame_width, stretch=true)
# Rendering # Rendering
def capture(self, *mobjects: Mobject) -> None: def capture(self, *mobjects: Mobject) -> None:
@ -446,9 +445,10 @@ class Camera(object):
# Program and vertex array # Program and vertex array
shader_program, vert_format = self.get_shader_program(shader_wrapper) shader_program, vert_format = self.get_shader_program(shader_wrapper)
attributes = shader_wrapper.vert_attributes
vao = self.ctx.vertex_array( vao = self.ctx.vertex_array(
program=shader_program, program=shader_program,
content=[(vbo, vert_format, *shader_wrapper.vert_attributes)], content=[(vbo, vert_format, *attributes)],
index_buffer=ibo, index_buffer=ibo,
) )
return { return {