fix: fix msaa

Author: YishiMichael

manim3/rendering/framebuffers/framebuffer.py

@@ -65,6 +65,12 @@ def __init__(
         )
         self._flag: ContextFlag = flag
 
+    def get_attachment(
+        self: Self,
+        name: str
+    ) -> moderngl.Texture:
+        return self._named_attachments[name]
+
     def clear(
         self: Self,
         color: tuple[float, float, float, float] | None = None
@@ -94,12 +100,3 @@ def render(
             Toplevel._get_context().set_blendings(self._blendings)
             Toplevel._get_context().set_flag(self._flag)
             vertex_array_info.vertex_array.render()
-
-    def copy_from(
-        self: Self,
-        framebuffer: Framebuffer
-    ) -> None:
-        Toplevel._get_context().copy_framebuffer(
-            dst=self._framebuffer,
-            src=framebuffer._framebuffer
-        )

manim3/rendering/framebuffers/oit_framebuffer.py

@@ -43,15 +43,3 @@ def __init__(
             samples=samples,
             flag=ContextFlag.BLEND
         )
-
-    @property
-    def accum_attachment(
-        self: Self
-    ) -> moderngl.Texture:
-        return self._named_attachments["accum"]
-
-    @property
-    def revealage_attachment(
-        self: Self
-    ) -> moderngl.Texture:
-        return self._named_attachments["revealage"]

manim3/shaders/oit_compose.glsl

@@ -1,23 +1,22 @@
+#if MSAA_SAMPLES
+uniform sampler2DMS t_accum_map;
+uniform sampler2DMS t_revealage_map;
+#else
 uniform sampler2D t_accum_map;
 uniform sampler2D t_revealage_map;
+#endif
 
 
 /***********************/
 #if defined VERTEX_SHADER
 /***********************/
 
 
-in vec3 in_position;
-in vec2 in_uv;
-
-out VS_FS {
-    vec2 uv;
-} vs_out;
+in vec2 in_coordinates;
 
 
 void main() {
-    vs_out.uv = in_uv;
-    gl_Position = vec4(in_position, 1.0);
+    gl_Position = vec4(in_coordinates, 0.0, 1.0);
 }
 
 
@@ -26,24 +25,30 @@ void main() {
 /***************************/
 
 
-in VS_FS {
-    vec2 uv;
-} fs_in;
+layout (pixel_center_integer) in vec4 gl_FragCoord;
 
 out vec4 frag_color;
 
 
+vec4 get_frag_color(vec4 accum, float revealage) {
+    return accum.a == 0.0 || revealage == 0.0 ? vec4(0.0) : vec4(accum.rgb / accum.a, isinf(revealage) ? 1.0 : 1.0 - exp2(revealage));
+}
+
+
 void main() {
     // Inspired from `https://casual-effects.blogspot.com/2015/03/implemented-weighted-blended-order.html`.
     // `accum = sum(w * a * rgb, w * a)`
     // `revealage = sum(w * log2(1 - a))`
-    float revealage = texture(t_revealage_map, fs_in.uv).x;
-    if (revealage == 0.0) {
-        // Save the blending and color texture fetch cost.
-        discard;
+    ivec2 coords = ivec2(gl_FragCoord);
+    #if MSAA_SAMPLES
+    frag_color = vec4(0.0);
+    for (int i = 0; i < MSAA_SAMPLES; ++i) {
+        frag_color += get_frag_color(texelFetch(t_accum_map, coords, i), texelFetch(t_revealage_map, coords, i).x);
     }
-    vec4 accum = texture(t_accum_map, fs_in.uv);
-    frag_color = vec4(accum.rgb / accum.a, 1.0 - exp2(revealage));
+    frag_color /= MSAA_SAMPLES;
+    #else
+    frag_color = get_frag_color(texelFetch(t_accum_map, coords, 0), texelFetch(t_revealage_map, coords, 0).x);
+    #endif
 }
 
 

manim3/toplevel/context.py

@@ -156,17 +156,6 @@ def scope(
             uniform_buffers=uniform_buffers
         )
 
-    def copy_framebuffer(
-        self: Self,
-        *,
-        dst: moderngl.Framebuffer,
-        src: moderngl.Framebuffer
-    ) -> None:
-        self._mgl_context.copy_framebuffer(
-            dst=dst,
-            src=src
-        )
-
     def blit_framebuffer(
         self: Self,
         *,

manim3/toplevel/renderer.py

@@ -223,10 +223,8 @@ def record_frame(
 
 class Renderer(ToplevelResource):
     __slots__ = (
-        "_use_msaa",
         "_final_framebuffer",
         "_oit_framebuffer",
-        "_oit_msaa_framebuffer",
         "_oit_compose_vertex_array",
         "_livestreamer",
         "_video_recorder",
@@ -239,50 +237,42 @@ def __init__(
         super().__init__()
 
         msaa_samples = Toplevel._get_config().msaa_samples
-        use_msaa = bool(msaa_samples)
         final_framebuffer = FinalFramebuffer()
-        oit_framebuffer = OITFramebuffer()
-        oit_msaa_framebuffer = OITFramebuffer(samples=msaa_samples) if use_msaa else oit_framebuffer
+        oit_framebuffer = OITFramebuffer(samples=msaa_samples)
         oit_compose_vertex_array = VertexArray(
             shader_filename="oit_compose.glsl",
+            custom_macros=(
+                f"#define MSAA_SAMPLES {msaa_samples}",
+            ),
             texture_buffers=(
                 TextureBuffer(
                     name="t_accum_map",
-                    textures=oit_framebuffer.accum_attachment
+                    textures=oit_framebuffer.get_attachment("accum")
                 ),
                 TextureBuffer(
                     name="t_revealage_map",
-                    textures=oit_framebuffer.revealage_attachment
+                    textures=oit_framebuffer.get_attachment("revealage")
                 )
             ),
             attributes_buffer=AttributesBuffer(
                 field_declarations=(
-                    "vec3 in_position",
-                    "vec2 in_uv"
+                    "vec2 in_coordinates",
                 ),
                 data_dict={
-                    "in_position": np.array((
-                        (-1.0, -1.0, 0.0),
-                        (1.0, -1.0, 0.0),
-                        (1.0, 1.0, 0.0),
-                        (-1.0, 1.0, 0.0)
-                    )),
-                    "in_uv": np.array((
-                        (0.0, 0.0),
-                        (1.0, 0.0),
+                    "in_coordinates": np.array((
+                        (-1.0, -1.0),
+                        (1.0, -1.0),
                         (1.0, 1.0),
-                        (0.0, 1.0)
+                        (-1.0, 1.0)
                     ))
                 },
                 primitive_mode=PrimitiveMode.TRIANGLE_FAN,
                 vertices_count=4
             )
         )
 
-        self._use_msaa: bool = use_msaa
         self._final_framebuffer: FinalFramebuffer = final_framebuffer
         self._oit_framebuffer: OITFramebuffer = oit_framebuffer
-        self._oit_msaa_framebuffer: OITFramebuffer = oit_msaa_framebuffer
         self._oit_compose_vertex_array: VertexArray = oit_compose_vertex_array
         self._livestreamer: Livestreamer = Livestreamer()
         self._video_recorder: VideoRecorder = VideoRecorder()
@@ -302,12 +292,10 @@ def _render_frame(
     ) -> None:
         scene = Toplevel._get_scene()
 
-        self._oit_msaa_framebuffer.clear()
+        self._oit_framebuffer.clear()
         for mobject in scene._root_mobject.iter_descendants():
             for vertex_array in mobject._iter_vertex_arrays():
-                self._oit_msaa_framebuffer.render(vertex_array)
-        if self._use_msaa:
-            self._oit_framebuffer.copy_from(self._oit_msaa_framebuffer)  # TODO: resolve in final fbo, using sampler2DMS, texelFetch.
+                self._oit_framebuffer.render(vertex_array)
 
         self._final_framebuffer.clear(color=(*scene._background_color, scene._background_opacity))
         self._final_framebuffer.render(self._oit_compose_vertex_array)

pyproject.toml

@@ -16,14 +16,19 @@ classifiers = [
     "Programming Language :: Python"
 ]
 dependencies = [
+    "attrs",
+    "cairocffi",
     "colour",
+    "ffmpeg-python",
     "mapbox-earcut",
     "moderngl",
     "numpy",
+    "pangocairocffi",
+    "pangocffi",
     "pillow",
+    "pyclipr",
     "pyglet",
-    "pyopengl",
+    "rich",
     "scipy",
-    "shapely",
     "svgelements"
 ]