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

MAYA-104936 instanceIndices may contain duplicate indices. #575

Merged
merged 2 commits into from
Jun 11, 2020
Merged

MAYA-104936 instanceIndices may contain duplicate indices. #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4074ea
Remove duplicate instance indices.
Jun 10, 2020
ba7666d
Remove unused header.
Jun 10, 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
21 changes: 21 additions & 0 deletions lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,13 +1101,34 @@ HdVP2BasisCurves::_UpdateDrawItem(
}
}
else if (auto state = drawScene.GetPrimSelectionState(id)) {
#if USD_VERSION_NUM <= 2005
// In 20.05 and older GetPrimSelectionState may have duplicate entries
// in instanceIndices, which will cause Maya to draw that instance multiple
// times. Remove the duplicates here to avoid that problem.
std::vector<bool> selectedIndices;
selectedIndices.resize(instanceCount); // bool default ctor sets the value to false
for (const auto& indexArray : state->instanceIndices) {
for (const auto index : indexArray) {
selectedIndices[index] = true;
}
}
for (unsigned int index=0; index<instanceCount; index++)
{
if (!selectedIndices[index])
continue;
transforms[index].Get(instanceMatrix.matrix);
instanceMatrix = worldMatrix * instanceMatrix;
stateToCommit._instanceTransforms.append(instanceMatrix);
}
#else
for (const auto& indexArray : state->instanceIndices) {
for (const auto index : indexArray) {
transforms[index].Get(instanceMatrix.matrix);
instanceMatrix = worldMatrix * instanceMatrix;
stateToCommit._instanceTransforms.append(instanceMatrix);
}
}
#endif
}
}
else {
Expand Down
21 changes: 21 additions & 0 deletions lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,13 +1293,34 @@ void HdVP2Mesh::_UpdateDrawItem(
}
}
else if (auto state = drawScene.GetPrimSelectionState(id)) {
#if USD_VERSION_NUM <= 2005
// In 20.05 and older GetPrimSelectionState may have duplicate entries
// in instanceIndices, which will cause Maya to draw that instance multiple
// times. Remove the duplicates here to avoid that problem.
std::vector<bool> selectedIndices;
selectedIndices.resize(instanceCount); // bool default ctor sets the value to false
for (const auto& indexArray : state->instanceIndices) {
for (const auto index : indexArray) {
selectedIndices[index] = true;
}
}
for (unsigned int index=0; index<instanceCount; index++)
{
if (!selectedIndices[index])
continue;
transforms[index].Get(instanceMatrix.matrix);
instanceMatrix = worldMatrix * instanceMatrix;
stateToCommit._instanceTransforms.append(instanceMatrix);
}
#else
for (const auto& indexArray : state->instanceIndices) {
for (const auto index : indexArray) {
transforms[index].Get(instanceMatrix.matrix);
instanceMatrix = worldMatrix * instanceMatrix;
stateToCommit._instanceTransforms.append(instanceMatrix);
}
}
#endif
}
}
else {
Expand Down