Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter light paths using Light Path Expressions #2682

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
2 changes: 1 addition & 1 deletion cmake/config/win-vs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ endif ()

# Release configuration.
set (c_compiler_flags_release
/WX # Treat Warnings As Errors
/WX- # Treat Warnings As Errors
/Zi # set Debug Information Format to Program Database
/O2 # Maximum Optimization (Favor Speed)
/Ob2 # set Inline Function Expansion to Any Suitable
Expand Down
2 changes: 1 addition & 1 deletion sandbox/settings/appleseed.studio.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<parameter name="autosave" value="false" />
<parameter name="message_verbosity" value="info" />
<parameter name="message_verbosity" value="debug" />
<parameter name="print_final_average_luminance" value="false" />
<parameter name="rendering_threads" value="auto" />
<parameter name="sampling_mode" value="qmc" />
Expand Down
28 changes: 18 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 @@ -269,14 +271,16 @@ set (mainwindow_rendering_sources
mainwindow/rendering/renderingmanager.cpp
mainwindow/rendering/renderingmanager.h
mainwindow/rendering/renderingtimer.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 @@ -361,9 +365,13 @@ 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
utility/lpevalidator.cpp
utility/lpevalidator.h
utility/miscellaneous.cpp
utility/miscellaneous.h
utility/mousecoordinatestracker.cpp
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 @@ -329,7 +329,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