updates for building with latest post-21.02 dev branch commit of core USD #1199
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
…butes in testUsdImportRfMLight UsdLuxShapingAPI and UsdLuxShadowAPI are now connectable, so all attributes on these APIs have been given the "inputs:" prefix. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@3738719 (Internal change: 2148852)
mattyjams
commented
Feb 19, 2021
Comment on lines
-158
to
-159
| taskParams.camera = _cameraId; | ||
| taskParams.viewport = _viewport; |
There was a problem hiding this comment.
These parameters were not used by the task at least as far back as USD 20.02 and most likely were never used.
Comment on lines
+84
to
+88
| std::vector<GfMatrix4d> | ||
| Compute(const CameraUtilFraming& framing, CameraUtilConformWindowPolicy policy) override | ||
| { | ||
| return _shadowMatrices; | ||
| } |
There was a problem hiding this comment.
Both overloads of Compute() will exist for a while during a transition period until the old one that takes a GfVec4f is eventually removed.
Comment on lines
-97
to
+102
| float shaping:cone:angle = 92 | ||
| float shaping:cone:softness = 0.2 | ||
| float shaping:focus = 0.2 | ||
| color3f shaping:focusTint = (0.2, 0.2, 0.2) | ||
| float shaping:ies:angleScale = 1.2 | ||
| asset shaping:ies:file = @./DiskLight_profile.ies@ | ||
| float inputs:shaping:cone:angle = 92 | ||
| float inputs:shaping:cone:softness = 0.2 | ||
| float inputs:shaping:focus = 0.2 | ||
| color3f inputs:shaping:focusTint = (0.2, 0.2, 0.2) | ||
| float inputs:shaping:ies:angleScale = 1.2 | ||
| asset inputs:shaping:ies:file = @./DiskLight_profile.ies@ |
There was a problem hiding this comment.
Technically, this might actually break the test if you tried to run it in older versions of USD, but we do not actually run the RenderMan for Maya tests in this repo:
…es CameraUtilFraming This new version of Compute() will ultimately replace the original one that takes a GfVec4f viewport, and the original will be removed. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@0eac446 (Internal changes: 2149169, 2149173)
The framing is computed in HdxSimpleLightTask per shadow-casting light, so the camera and viewport params have not been used in the HdxShadowTask since at least core USD 20.02. This change corresponds to core USD commit PixarAnimationStudios/OpenUSD@8bd9d50 (Internal change: 2149197)
This identifies core USD commit 09ff5b7 (post 21.02 release) as the most recent supported version of USD: PixarAnimationStudios/OpenUSD@09ff5b7
mattyjams
force-pushed
the
pr/update_to_current_core_USD_dev
branch
from
53f50e7 to
c1b6753
Compare
|
Forgot to |
kxl-adsk
approved these changes
Feb 19, 2021
kxl-adsk
added
the
ready-for-merge
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.
A few small changes to go along with commits pushed to the dev branch of core USD today.
All supported releases of USD should continue to work with these changes.