GLVis · publixsubfan · Mar 26, 2021 · Mar 30, 2021 · Mar 31, 2021 · Mar 31, 2021
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -10,8 +10,12 @@
 # CONTRIBUTING.md for details.
 
 list(APPEND SOURCES
+  gl/framebuffer.cpp
   gl/renderer.cpp
   gl/renderer_core.cpp
+  gl/renderer_msaa.cpp
+  gl/renderer_print.cpp
+  gl/depth_peel_oit.cpp
   gl/shader.cpp
   gl/types.cpp
   aux_vis.cpp
@@ -28,10 +32,14 @@ list(APPEND SOURCES
   vsvector3d.cpp)
 
 list(APPEND HEADERS
+  gl/framebuffer.hpp
   gl/attr_traits.hpp
   gl/platform_gl.hpp
   gl/renderer.hpp
   gl/renderer_core.hpp
+  gl/renderer_msaa.hpp
+  gl/renderer_print.hpp
+  gl/depth_peel_oit.hpp
   gl/shader.hpp
   gl/types.hpp
   aux_vis.hpp

diff --git a/lib/aux_js.cpp b/lib/aux_js.cpp
@@ -36,9 +36,6 @@ bool startVisualization(const std::string input, const std::string data_type,
    // 0 - scalar data, 1 - vector data, 2 - mesh only, (-1) - unknown
    const int field_type = stream_state.ReadStream(ss, data_type);
 
-   // reset antialiasing
-   GetAppWindow()->getRenderer().setAntialiasing(0);
-
       std::string line;
    double minv = 0.0, maxv = 0.0;
    while (ss >> line)

diff --git a/lib/aux_vis.cpp b/lib/aux_vis.cpp
@@ -33,6 +33,10 @@ using namespace mfem;
 #include <fontconfig/fontconfig.h>
 #endif
 
+#include "gl/renderer_msaa.hpp"
+#include "gl/renderer_print.hpp"
+#include "gl/depth_peel_oit.hpp"
+
 int visualize = 0;
 VisualizationScene * locscene;
 
@@ -41,13 +45,18 @@ static int glvis_multisample = GLVIS_MULTISAMPLE;
 #else
 static int glvis_multisample = -1;
 #endif
+bool multisample_status = false;
 
 float line_w = 1.f;
 float line_w_aa = gl3::LINE_WIDTH_AA;
 
 SdlWindow * wnd = nullptr;
 bool wndLegacyGl = false;
 
+gl3::DefaultPass rndr_main_pass;
+gl3::DepthPeeler rndr_depth_peeled;
+gl3::MultisamplePass rndr_msaa_pass;
+
 SdlWindow * GetAppWindow()
 {
    return wnd;
@@ -85,12 +94,16 @@ int InitVisualization (const char name[], int x, int y, int w, int h)
       wnd->clearEvents();
    }
 
+   multisample_status = false;
+
+   rndr_main_pass.SetGLDevice(wnd->getRenderer().getDevice());
+   rndr_msaa_pass.SetGLDevice(wnd->getRenderer().getDevice());
+   rndr_depth_peeled.SetGLDevice(wnd->getRenderer().getDevice());
+
 #ifdef GLVIS_DEBUG
    cout << "Window should be up" << endl;
 #endif
    InitFont();
-   wnd->getRenderer().setLineWidth(line_w);
-   wnd->getRenderer().setLineWidthMS(line_w_aa);
 
    // auxReshapeFunc (MyReshape); // not needed, MyExpose calls it
    // auxReshapeFunc (NULL);
@@ -109,6 +122,7 @@ int InitVisualization (const char name[], int x, int y, int w, int h)
 
    wnd->setTouchPinchCallback(TouchPinch);
 
+   wnd->setOnKeyDown('A', KeyAPressed);
    // auxKeyFunc (AUX_p, KeyCtrlP); // handled in vsdata.cpp
    wnd->setOnKeyDown (SDLK_s, KeyS);
    wnd->setOnKeyDown ('S', KeyS);
@@ -317,7 +331,6 @@ void SetVisualizationScene(VisualizationScene * scene, int view,
       // SendKeySequence(keys);
       CallKeySequence(keys);
    }
-   wnd->getRenderer().setPalette(&locscene->palette);
 }
 
 void RunVisualization()
@@ -377,16 +390,35 @@ void MyReshape(GLsizei w, GLsizei h)
 void MyExpose(GLsizei w, GLsizei h)
 {
    MyReshape (w, h);
-   GLuint color_tex = locscene->palette.GetColorTexture();
-   GLuint alpha_tex = locscene->palette.GetAlphaTexture();
-   wnd->getRenderer().setColorTexture(color_tex);
-   wnd->getRenderer().setAlphaTexture(alpha_tex);
+   bool use_depth_peel = !(locscene->matAlpha == 1.0);
+   if (!use_depth_peel)
+   {
+      rndr_main_pass.setFontTexture(GetFont()->getFontTex());
+      rndr_main_pass.setPalette(locscene->palette);
+   }
+   else
+   {
+      rndr_depth_peeled.setFontTexture(GetFont()->getFontTex());
+      rndr_depth_peeled.setPalette(locscene->palette);
+   }
+   // Set antialiasing parameters
+   rndr_msaa_pass.SetAntialiasing(multisample_status);
+   rndr_msaa_pass.SetNumSamples(GetMultisample());
+   rndr_msaa_pass.SetLineWidth(line_w);
+   rndr_msaa_pass.SetLineWidthMS(line_w_aa);
    gl3::SceneInfo frame = locscene->GetSceneObjs();
    for (auto drawable_ptr : frame.needs_buffering)
    {
       wnd->getRenderer().buffer(drawable_ptr);
    }
-   wnd->getRenderer().render(frame.queue);
+   if (!use_depth_peel)
+   {
+      wnd->getRenderer().render({&rndr_main_pass}, {&rndr_msaa_pass}, frame.queue);
+   }
+   else
+   {
+      wnd->getRenderer().render({&rndr_depth_peeled}, {&rndr_msaa_pass}, frame.queue);
+   }
 }
 
 void MyExpose()
@@ -1096,6 +1128,8 @@ void PrintCaptureBuffer(gl3::CaptureBuffer& cbuf)
    }
 }
 
+gl3::CapturePass print_pass;
+
 void KeyCtrlP()
 {
 #ifdef __EMSCRIPTEN__
@@ -1126,7 +1160,10 @@ void KeyCtrlP()
                        GL2PS_NO_BLENDING |
                        GL2PS_NO_OPENGL_CONTEXT,
                        GL_RGBA, 0, NULL, 16, 16, 16, 0, fp, "a" );
-      gl3::CaptureBuffer cbuf = wnd->getRenderer().capture(wnd_scn.queue);
+      print_pass.setFontTexture(GetFont()->getFontTex());
+      print_pass.setPalette(locscene->palette);
+      wnd->getRenderer().render( {&print_pass}, {}, wnd_scn.queue);
+      gl3::CaptureBuffer cbuf = print_pass.GetLastCaptureBuffer();
       PrintCaptureBuffer(cbuf);
       gl2psEndPage();
    }
@@ -1137,6 +1174,28 @@ void KeyCtrlP()
 #endif
 }
 
+
+void KeyAPressed()
+{
+   if (glvis_multisample < 0)
+   {
+      cout << "Multisampling disabled." << endl;
+      return;
+   }
+   multisample_status = !multisample_status;
+
+   if (multisample_status)
+   {
+      cout << "Multisampling/Antialiasing: on" << endl;
+   }
+   else
+   {
+      cout << "Multisampling/Antialiasing: off" << endl;
+   }
+
+   SendExposeEvent();
+}
+
 void KeyQPressed()
 {
    wnd->signalQuit();
@@ -1501,18 +1560,13 @@ void SetLineWidth(float width)
    line_w = width;
    if (wnd)
    {
-      wnd->getRenderer().setLineWidth(line_w);
+      wnd->getRenderer().SetLineWidth(line_w);
    }
 }
 
 void SetLineWidthMS(float width_ms)
 {
    line_w_aa = width_ms;
-   if (wnd)
-   {
-      wnd->getRenderer().setLineWidthMS(line_w_aa);
-   }
-
 }
 
 float GetLineWidth()
@@ -1555,7 +1609,7 @@ void InitFont()
 {
    // This function is called after the window is created.
    GLenum alphaChannel =
-      gl3::GLDevice::useLegacyTextureFmts() ? GL_ALPHA : GL_RED;
+      gl3::GLDevice::isOpenGL3() ? GL_RED : GL_ALPHA;
    glvis_font.setAlphaChannel(alphaChannel);
    bool try_fc_patterns = true;
    if (!priority_font.empty())
@@ -1580,7 +1634,6 @@ void InitFont()
               << endl;
       }
    }
-   wnd->getRenderer().setFontTexture(glvis_font.getFontTex());
 }
 
 GlVisFont * GetFont()

diff --git a/lib/aux_vis.hpp b/lib/aux_vis.hpp
@@ -55,6 +55,7 @@ void RightButtonUp   (EventInfo *event);
 
 void TouchPinch(SDL_MultiGestureEvent & e);
 
+void KeyAPressed();
 void KeyCtrlP();
 void KeyS();
 void KeyQPressed();