Skip to content

Commit

Permalink
display final render in opengl viewport widget
Browse files Browse the repository at this point in the history
  • Loading branch information
fu5ha authored and oktomus committed Dec 20, 2019
1 parent b87417b commit 0d6eeb2
Show file tree
Hide file tree
Showing 44 changed files with 2,637 additions and 1,027 deletions.
26 changes: 16 additions & 10 deletions src/appleseed.studio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,14 @@ source_group ("mainwindow\\pythonconsole" FILES
set (mainwindow_rendering_sources
mainwindow/rendering/cameracontroller.cpp
mainwindow/rendering/cameracontroller.h
mainwindow/rendering/glscenelayer.h
mainwindow/rendering/glscenelayer.cpp
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/lightpathslayer.cpp
mainwindow/rendering/lightpathslayer.h
mainwindow/rendering/materialdrophandler.cpp
mainwindow/rendering/materialdrophandler.h
mainwindow/rendering/pixelcolortracker.cpp
Expand All @@ -268,14 +270,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.h
mainwindow/rendering/viewportwidget.cpp
)
list (APPEND appleseed.studio_sources
${mainwindow_rendering_sources}
Expand Down Expand Up @@ -360,6 +364,8 @@ set (utility_sources
utility/doubleslider.h
utility/foldablepanelwidget.cpp
utility/foldablepanelwidget.h
utility/gl.cpp
utility/gl.h
utility/inputwidgetproxies.cpp
utility/inputwidgetproxies.h
utility/interop.h
Expand Down
2 changes: 1 addition & 1 deletion src/appleseed.studio/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,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);

Expand Down
Loading

0 comments on commit 0d6eeb2

Please sign in to comment.