USDScene : Fix writing of UsdLux lights #1376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This still needs a review before I can make a Cortex release @danieldresser-ie. |
| // | ||
| // - The output shader is written as a UsdLight-derived prim rather than a UsdShadeShader. | ||
| // - The other shaders are parented inside the light. | ||
| // - We don't need to create a UsdShadeOutput to return. |
There was a problem hiding this comment.
This comment seems to belong with writeLight, not readShaderNetwork?
There was a problem hiding this comment.
Thanks for spotting that - fixed in f174f8d.
We were writing them as regular material assignments before, which might have round-tripped back into Gaffer OK, but which were not what other USD clients needed. We need to make sure that the primary shader is written as a `UsdLux*Light` prim, and that any input shaders are stored as children of that prim. We still share most of the implementation with the generic material-writing code, but with differences in orchestration. It would have been possible to continue to do this with one `writeShaderNetwork()` uber-function internally with a bunch of conditionals depending on whether or not we were writing lights. But I felt that it was clearer and more maintainable to have two small top-level functions that each made appropriate calls to a set of shared utility functions.
These cases occur when writing to UsdLuxLight types where the inputs already exist, and don't need to be defined by us.
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Companion to GafferHQ/gaffer#5400, allowing Gaffer to author and export UsdLux lights.