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

Unified Viewport #2648

Closed
wants to merge 4 commits into from
Closed

Unified Viewport #2648

wants to merge 4 commits into from

Conversation

fu5ha
Copy link
Contributor

@fu5ha fu5ha commented Jun 20, 2019

Initial unified viewport PR. Also see #2651

@fu5ha fu5ha mentioned this pull request Jun 24, 2019
3 tasks
@fu5ha fu5ha force-pushed the unified-viewport branch 2 times, most recently from 64481de to 75de908 Compare June 24, 2019 22:16
@fu5ha fu5ha changed the title [WIP] Unified viewport Unified viewport part 3: Light paths overlay Jun 24, 2019
@fu5ha fu5ha force-pushed the unified-viewport branch 4 times, most recently from a7e6a16 to bf27aaf Compare July 2, 2019 03:17
@fu5ha fu5ha changed the title Unified viewport part 3: Light paths overlay Unified Viewport Jul 9, 2019
@oktomus oktomus removed the WIP ⚠ label Sep 21, 2019
@dictoon dictoon force-pushed the unified-viewport branch 2 times, most recently from 795bf2e to 3e77168 Compare September 22, 2019 09:45
Copy link
Member

@dictoon dictoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent work! There are some regressions in the cameras that will need to be addressed before we can merge this.

sandbox/settings/appleseed.studio.xml Show resolved Hide resolved
src/appleseed.studio/CMakeLists.txt Show resolved Hide resolved
src/appleseed.studio/CMakeLists.txt Show resolved Hide resolved
src/appleseed.studio/mainwindow/rendering/glscenelayer.cpp Outdated Show resolved Hide resolved
@@ -80,6 +80,15 @@ namespace
const ParamArray& params)
: Camera(name, params)
{
// Extract the film dimensions from the camera parameters.
m_film_dimensions = extract_film_dimensions();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in this file introduced functional regressions: it's no longer possible to change camera parameters during interactive rendering. They should be reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I believe it just needs to be in both places. This is also why the variable that @oktomus noticed was there: originally I was going to factor this code out into a dedicated function but didn't realize that the params could change between the creation and when on_render_begin is called. I'll just do that now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe in this specific case you might be able to execute this code in the constructor, but this isn't true in general as at this point, inputs aren't bound to the entity. Why exactly do you need to do this?

@@ -54,6 +54,18 @@ namespace renderer
PerspectiveCamera::PerspectiveCamera(const char* name, const ParamArray& params)
: Camera(name, params)
{
// Extract the film dimensions from the camera parameters.
m_film_dimensions = extract_film_dimensions();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same problem here.

Copy link
Member

@oktomus oktomus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for this amazing work !

I reviewed half of your code and i will continue once you have addressed this first part :)

Most of the comments apply to the files I haven't read yet.

@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cpp file first :)

mainwindow/rendering/viewporttab.cpp
mainwindow/rendering/viewporttab.h
mainwindow/rendering/viewportwidget.h
mainwindow/rendering/viewportwidget.cpp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cpp first also here

@@ -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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this

, m_selected_light_path_index(-1)
, m_gl_initialized(false)
{

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line

@oktomus oktomus closed this Oct 19, 2019
@oktomus oktomus reopened this Oct 19, 2019
@oktomus
Copy link
Member

oktomus commented Oct 21, 2019

Closed in favor of #2661

@oktomus oktomus closed this Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants