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.

Sign up for GitHub

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

Updates to support core USD release 20.08 #617

Merged
merged 3 commits into from
Jul 28, 2020
+27 −7
Merged

Updates to support core USD release 20.08 #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd6eace
use UsdImagingGLEngine engine accessor for USDIMAGINGGL_API_VERSION 6…
mattyjams Jun 30, 2020
f41cd0f
pass interpolateMissingClipValues=True when stitching clips in USD ve…
mattyjams Jul 7, 2020
3feb8b6
update build.md to reflect support for core USD release 20.08
mattyjams Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ See Pixar's official github page for instructions on how to build USD: https://g

| | ![](images/pxr.png) |
|:------------: |:---------------: |
| CommitID/Tags | master: [v19.07](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.07) or [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) <br> dev: [e7ff8e8](https://github.com/PixarAnimationStudios/USD/commit/e7ff8e85b422b04a6d685908a32e4b394ef04504) |
| CommitID/Tags | release: [v19.07](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.07) or [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02) or [v20.05](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.05) or [v20.08](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.08) <br> dev: [238d0f4](https://github.com/PixarAnimationStudios/USD/commit/238d0f4b09d595955d3b5819db427e270756cc24) |

For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below.

Expand Down Expand Up @@ -79,13 +79,13 @@ There are four arguments that must be passed to the script:

```
Linux:
➜ maya-usd python build.py --maya-location /usr/autodesk/maya2020 --pxrusd-location /usr/local/USD-Master --devkit-location /usr/local/devkitBase /usr/local/workspace
➜ maya-usd python build.py --maya-location /usr/autodesk/maya2020 --pxrusd-location /usr/local/USD-Release --devkit-location /usr/local/devkitBase /usr/local/workspace

MacOSX:
➜ maya-usd python build.py --maya-location /Applications/Autodesk/maya2020 --pxrusd-location /opt/local/USD-Master --devkit-location /opt/local/devkitBase /opt/local/workspace
➜ maya-usd python build.py --maya-location /Applications/Autodesk/maya2020 --pxrusd-location /opt/local/USD-Release --devkit-location /opt/local/devkitBase /opt/local/workspace

Windows:
c:\maya-usd> python build.py --maya-location "C:\Program Files\Autodesk\Maya2020" --pxrusd-location C:\USD-Master --devkit-location C:\devkitBase C:\workspace
c:\maya-usd> python build.py --maya-location "C:\Program Files\Autodesk\Maya2020" --pxrusd-location C:\USD-Release --devkit-location C:\devkitBase C:\workspace
```

##### Build Arguments
Expand Down
11 changes: 9 additions & 2 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/Engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <vector>
#include "AL/usdmaya/nodes/Engine.h"

#include <pxr/imaging/hd/engine.h>
#include <pxr/imaging/hdx/pickTask.h>
#include <pxr/imaging/hdx/taskController.h>
#include <pxr/usdImaging/usdImaging/delegate.h>
Expand Down Expand Up @@ -78,9 +79,15 @@ bool Engine::TestIntersectionBatch(
pickParams.outHits = &allHits;
VtValue vtPickParams(pickParams);

_engine.SetTaskContextData(HdxPickTokens->pickParams, vtPickParams);
#if defined(USDIMAGINGGL_API_VERSION) && USDIMAGINGGL_API_VERSION >= 6
HdEngine* hdEngine = _GetHdEngine();
#else
HdEngine* hdEngine = &_engine;
#endif

hdEngine->SetTaskContextData(HdxPickTokens->pickParams, vtPickParams);
auto pickingTasks = _taskController->GetPickingTasks();
_engine.Execute(_taskController->GetRenderIndex(), &pickingTasks);
hdEngine->Execute(_taskController->GetRenderIndex(), &pickingTasks);

if (allHits.size() == 0) {
return false;
Expand Down
15 changes: 14 additions & 1 deletion test/lib/usd/translators/testUsdExportAsClip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,20 @@ def testExportAsClip(self):

stitchedPath = os.path.abspath('result.usda')
stitchedLayer = Sdf.Layer.CreateNew(stitchedPath)
self.assertTrue(UsdUtils.StitchClips(stitchedLayer, clipFiles, '/world', 1, 20, 'default'))

# Clip stitching behavior changed significantly between core USD 20.05
# and 20.08. Beginning with 20.08, we need to pass an additional option
# to ensure that authored time samples are held across gaps in value
# clips.
if Usd.GetVersion() > (0, 20, 5):
self.assertTrue(
UsdUtils.StitchClips(stitchedLayer, clipFiles, '/world',
startFrame=1, endFrame=20,
interpolateMissingClipValues=True, clipSet='default'))
else:
self.assertTrue(
UsdUtils.StitchClips(stitchedLayer, clipFiles, '/world',
startFrame=1, endFrame=20, clipSet='default'))

# export a non clip version for comparison
canonicalUsdFile = os.path.abspath('canonical.usda')
Expand Down