display final render in opengl viewport widget

Author: fu5ha

src/appleseed.qtcommon/widgets/miscellaneous.cpp

@@ -193,16 +193,6 @@ bool file_exists(const QString& path)
     return info.exists() && info.isFile();
 }
 
-QByteArray load_gl_shader(const QString& base_name)
-{
-    const QString resource_path(QString(":/shaders/%1").arg(base_name));
-
-    QFile file(resource_path);
-    file.open(QFile::ReadOnly);
-
-    return file.readAll();
-}
-
 QIcon load_icons(const QString& base_name)
 {
     const QString base_icon_filepath(make_app_path("icons/%1.png").arg(base_name));

src/appleseed.qtcommon/widgets/miscellaneous.h

@@ -77,9 +77,6 @@ QString make_app_path(const QString& path);
 // Check whether a file exists.
 bool file_exists(const QString& path);
 
-// Load a GLSL shader from file into a QByteArray.
-QByteArray load_gl_shader(const QString& base_name);
-
 // Load an icon and its variants (hover, disabled...) from the application's icons directory.
 QIcon load_icons(const QString& base_name);
 

src/appleseed.studio/CMakeLists.txt

@@ -246,12 +246,14 @@ source_group ("mainwindow\\pythonconsole" FILES
 set (mainwindow_rendering_sources
     mainwindow/rendering/cameracontroller.cpp
     mainwindow/rendering/cameracontroller.h
+    mainwindow/rendering/glscenelayer.cpp
+    mainwindow/rendering/glscenelayer.h
+    mainwindow/rendering/lightpathslayer.cpp
+    mainwindow/rendering/lightpathslayer.h
     mainwindow/rendering/lightpathspickinghandler.cpp
     mainwindow/rendering/lightpathspickinghandler.h
-    mainwindow/rendering/lightpathstab.cpp
-    mainwindow/rendering/lightpathstab.h
-    mainwindow/rendering/lightpathswidget.cpp
-    mainwindow/rendering/lightpathswidget.h
+    mainwindow/rendering/lightpathsviewportmanager.cpp
+    mainwindow/rendering/lightpathsviewportmanager.h
     mainwindow/rendering/materialdrophandler.cpp
     mainwindow/rendering/materialdrophandler.h
     mainwindow/rendering/pixelcolortracker.cpp
@@ -266,14 +268,16 @@ set (mainwindow_rendering_sources
     mainwindow/rendering/renderclipboardhandler.h
     mainwindow/rendering/renderingmanager.cpp
     mainwindow/rendering/renderingmanager.h
-    mainwindow/rendering/renderregionhandler.cpp
-    mainwindow/rendering/renderregionhandler.h
-    mainwindow/rendering/rendertab.cpp
-    mainwindow/rendering/rendertab.h
-    mainwindow/rendering/renderwidget.cpp
-    mainwindow/rendering/renderwidget.h
+    mainwindow/rendering/renderlayer.cpp
+    mainwindow/rendering/renderlayer.h
     mainwindow/rendering/scenepickinghandler.cpp
     mainwindow/rendering/scenepickinghandler.h
+    mainwindow/rendering/viewportregionselectionhandler.cpp
+    mainwindow/rendering/viewportregionselectionhandler.h
+    mainwindow/rendering/viewporttab.cpp
+    mainwindow/rendering/viewporttab.h
+    mainwindow/rendering/viewportwidget.cpp
+    mainwindow/rendering/viewportwidget.h
 )
 list (APPEND appleseed.studio_sources
     ${mainwindow_rendering_sources}
@@ -337,6 +341,8 @@ source_group ("python\\studio" FILES
 )
 
 set (utility_sources
+    utility/gl.cpp
+    utility/gl.h
     utility/inputwidgetproxies.cpp
     utility/inputwidgetproxies.h
     utility/settingskeys.h

src/appleseed.studio/main/main.cpp

@@ -334,7 +334,7 @@ int main(int argc, char* argv[])
     // Set default surface format before creating application instance. This is
     // required on macOS in order to use an OpenGL Core profile context.
     QSurfaceFormat default_format;
-    default_format.setVersion(3, 3);
+    default_format.setVersion(4, 1);
     default_format.setProfile(QSurfaceFormat::CoreProfile);
     QSurfaceFormat::setDefaultFormat(default_format);