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

Fixed tagged excluded prims to update correctly when changed #1791

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Fixed tagged excluded prims to update correctly when changed #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,12 +1315,6 @@ MStatus TranslatePrim::redoIt()
m_proxy->processChangedMetaData(SdfPathVector(), newImportPaths);
}

// construct locks and selectability for imported prims
if (m_proxy->isLockPrimFeatureActive()) {
m_proxy->removeMetaData(m_teardownPaths);
m_proxy->processChangedMetaData(SdfPathVector(), newImportPaths);
}

if (!m_updatePaths.empty()) {

// check paths refer to valid prims for this stage
Expand Down
40 changes: 28 additions & 12 deletions plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/ProxyShapeMetaData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "AL/usdmaya/nodes/ProxyShape.h"
#include "AL/usdmaya/nodes/Transform.h"

#include <mayaUsd/nodes/proxyShapePlugin.h>

#include <maya/MProfiler.h>
namespace {
const int _proxyShapeMetadataProfilerCategory = MProfiler::addCategory(
Expand Down Expand Up @@ -100,13 +102,14 @@ void ProxyShape::processChangedMetaData(
m_lockManager.setInherited(path);
}
}
m_lockManager.sort();
} else {
}
bool excludedPrimsModified = false;
{
auto& unselectablePaths = m_selectabilityDB.m_unselectablePaths;

// figure out whether selectability has changed.
for (const SdfPath& path : resyncedPaths) {
UsdPrim syncPrimRoot = m_stage->GetPrimAtPath(path);
const UsdPrim syncPrimRoot = m_stage->GetPrimAtPath(path);
if (!syncPrimRoot) {
// TODO : Ensure elements have been removed from selectabilityDB, excludeGeom, and
// lock prims
Expand Down Expand Up @@ -141,27 +144,31 @@ void ProxyShape::processChangedMetaData(
// from the resync prim, traverse downwards through the child prims
for (fileio::TransformIterator it(syncPrimRoot, parentTransform(), true); !it.done();
it.next()) {
auto prim = it.prim();
auto path = prim.GetPath();
const auto prim = it.prim();
const auto path = prim.GetPath();

// first check to see if the excluded geom has changed
{
bool excludeGeo = false;
if (prim.GetMetadata(Metadata::excludeFromProxyShape, &excludeGeo)
&& excludeGeo) {
auto last = m_excludedTaggedGeometry.begin() + lastTaggedPrim;
auto it = std::lower_bound(m_excludedTaggedGeometry.begin(), last, path);
const auto last = m_excludedTaggedGeometry.begin() + lastTaggedPrim;
const auto it
= std::lower_bound(m_excludedTaggedGeometry.begin(), last, path);
if (it != last && *it == path) {
// we already have an entry for this prim
} else {
// add to back of list
excludedPrimsModified = true;
m_excludedTaggedGeometry.emplace_back(path);
}
} else {
// if we aren't excluding the geom, but have an existing entry, remove it.
auto last = m_excludedTaggedGeometry.begin() + lastTaggedPrim;
auto it = std::lower_bound(m_excludedTaggedGeometry.begin(), last, path);
const auto last = m_excludedTaggedGeometry.begin() + lastTaggedPrim;
const auto it
= std::lower_bound(m_excludedTaggedGeometry.begin(), last, path);
if (it != last && *it == path) {
excludedPrimsModified = true;
m_excludedTaggedGeometry.erase(it);
--lastTaggedPrim;
}
Expand Down Expand Up @@ -220,6 +227,14 @@ void ProxyShape::processChangedMetaData(
{
constructLockPrims();
}

if (excludedPrimsModified) {
if (MayaUsdProxyShapePlugin::useVP2_NativeUSD_Rendering()) {
_IncreaseExcludePrimPathsVersion();
} else {
constructGLImagingEngine();
}
}
}

//----------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -363,9 +378,10 @@ SdfPathVector ProxyShape::getExcludePrimPaths() const
{
TF_DEBUG(ALUSDMAYA_EVALUATION).Msg("ProxyShape::getExcludePrimPaths\n");

SdfPathVector paths = getPrimPathsFromCommaJoinedString(excludePrimPathsPlug().asString());
SdfPathVector temp
= getPrimPathsFromCommaJoinedString(excludedTranslatedGeometryPlug().asString());
SdfPathVector paths = m_excludedTaggedGeometry;
SdfPathVector temp = getPrimPathsFromCommaJoinedString(excludePrimPathsPlug().asString());
paths.insert(paths.end(), temp.begin(), temp.end());
temp = getPrimPathsFromCommaJoinedString(excludedTranslatedGeometryPlug().asString());
paths.insert(paths.end(), temp.begin(), temp.end());

const auto& translatedGeo = m_context->excludedGeometry();
Expand Down