HYDRA-1102 : Fix instances selections being all wiped on an instancer when only one is removed #158
Conversation
| @@ -39,4 +40,19 @@ PXR_NS::HdDataSourceBaseHandle createFullySelectedDataSource() | |||
| return PXR_NS::HdDataSourceBase::Cast(selectionBuilder.Build()); | |||
| } | |||
|
|
|||
| PXR_NS::HdDataSourceBaseHandle createInstanceSelectionDataSource(const PXR_NS::SdfPath& instancerPrimPath, int instanceIndex) | |||
There was a problem hiding this comment.
Moved over as-is from registration.cpp
| std::optional<int> instanceIndex; | ||
|
|
||
| inline bool operator==(const PrimSelection &rhs) const { | ||
| return primPath == rhs.primPath | ||
| && instanceIndex == rhs.instanceIndex; | ||
| } |
There was a problem hiding this comment.
Fundamental design change of the pull request : PrimSelection objects, returned by the different data producers, no longer return selection data sources directly, as data sources can't be efficiently compared. This posed problems when wanting to remove only specific selections (such as instance selections) on a prim in Fvp::Selection::Remove.
PrimSelections now only contain the core data required to create the selection data sources, which are now created by the Fvp::Selection. The information stored in PrimSelection is based off the HdSelectionSchema class, which currently only specifies full prim and instance selections.
| @@ -184,7 +184,7 @@ void SelectionSceneIndex::RemoveSelection(const Ufe::Path& appPath) | |||
|
|
|||
| HdSceneIndexObserver::DirtiedPrimEntries dirtiedPrims; | |||
| for (const auto& primSelection : primSelections) { | |||
| if (_selection->Remove(primSelection.primPath)) { | |||
| if (_selection->Remove(primSelection)) { | |||
There was a problem hiding this comment.
Core change : we now only remove the specific selections corresponding to the deselected UFE path, rather than all selections on the prim.
| // source at locator selections. | ||
| std::map<PXR_NS::SdfPath, _PrimSelectionState> _pathToState; | ||
| std::map<PXR_NS::SdfPath, std::vector<PrimSelection>> _pathToSelections; |
There was a problem hiding this comment.
Now only stores the PrimSelection objects directly, which are fairly small, and which each correspond to a selection data source, constructed in GetVectorDataSource.
debloip-adsk
added
the
ready-for-merge
roopavr-adsk
deleted the
debloip/HYDRA-1102/instance-selection-mishandling
branch
No description provided.