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

Jump to bottom

BakeSkinning: add support for skinning normals with faceVarying interpolation #1695

Merged
merged 2 commits into from
Jan 25, 2022
Merged

BakeSkinning: add support for skinning normals with faceVarying interpolation #1695

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
464df7a
BakeSkinning: support linear blend skinning for normals with faceVary…
cameronwhite Nov 25, 2021
ef3445f
BakeSkinning: address review feedback for UsdSkelSkinFaceVaryingNorma…
cameronwhite Jan 18, 2022
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
80 changes: 70 additions & 10 deletions pxr/usd/usdSkel/bakeSkinning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ struct _SkinningAdapter

bool _ComputeRestPoints(const UsdTimeCode time);
bool _ComputeRestNormals(const UsdTimeCode time);
bool _ComputeFaceVertexIndices(const UsdTimeCode time);
bool _ComputeGeomBindXform(const UsdTimeCode time);
bool _ComputeJointInfluences(const UsdTimeCode time);

Expand Down Expand Up @@ -917,6 +918,11 @@ struct _SkinningAdapter
VtVec3fArray _restNormals;
UsdAttributeQuery _restNormalsQuery;

// Topology for face-varying normals.
_Task _faceVertexIndicesTask;
VtIntArray _faceVertexIndices;
UsdAttributeQuery _faceVertexIndicesQuery;

// Geom bind transform.
_Task _geomBindXformTask;
GfMatrix4d _geomBindXform;
Expand Down Expand Up @@ -1003,10 +1009,26 @@ _SkinningAdapter::_SkinningAdapter(
UsdSkelBakeSkinningParms::ModifiesNormals) {
_restNormalsQuery = UsdAttributeQuery(pointBased.GetNormalsAttr());
const TfToken& normalsInterp = pointBased.GetNormalsInterpolation();
// Can only process vertex/varying normals.
if (!_restNormalsQuery.HasAuthoredValue() ||
(normalsInterp != UsdGeomTokens->vertex &&
normalsInterp != UsdGeomTokens->varying)) {

// Face-varying normals are supported for mesh prims and require
// the faceVertexIndices attribute.
// Otherwise, can only process vertex/varying normals.
if (normalsInterp == UsdGeomTokens->faceVarying &&
skinningQuery.GetPrim().IsA<UsdGeomMesh>()) {

const UsdGeomMesh mesh(skinningQuery.GetPrim());
_faceVertexIndicesQuery =
UsdAttributeQuery(mesh.GetFaceVertexIndicesAttr());

if (!_restNormalsQuery.HasAuthoredValue() ||
!_faceVertexIndicesQuery.HasAuthoredValue()) {
_faceVertexIndicesQuery = UsdAttributeQuery();
_restNormalsQuery = UsdAttributeQuery();
}

} else if (!_restNormalsQuery.HasAuthoredValue() ||
(normalsInterp != UsdGeomTokens->vertex &&
normalsInterp != UsdGeomTokens->varying)) {
_restNormalsQuery = UsdAttributeQuery();
}
}
Expand Down Expand Up @@ -1066,9 +1088,12 @@ _SkinningAdapter::_SkinningAdapter(
UsdSkelBakeSkinningParms::DeformPointsWithBlendShapes;
}
}
// Only vertex/varying normals are supported for blendshapes.
// Supporting faceVarying normals would require extending the
// schema.
if ((parms.deformationFlags &
UsdSkelBakeSkinningParms::DeformNormalsWithBlendShapes) &&
_restNormalsQuery) {
_restNormalsQuery && !_faceVertexIndicesQuery) {

_subShapeNormalOffsets =
_blendShapeQuery->ComputeSubShapeNormalOffsets();
Expand Down Expand Up @@ -1165,6 +1190,12 @@ _SkinningAdapter::_SkinningAdapter(
_restNormalsTask.SetActive(true);
_restNormalsTask.SetMightBeTimeVarying(
_restNormalsQuery.ValueMightBeTimeVarying());

if (_faceVertexIndicesQuery.IsValid()) {
_faceVertexIndicesTask.SetActive(true);
_faceVertexIndicesTask.SetMightBeTimeVarying(
_faceVertexIndicesQuery.ValueMightBeTimeVarying());
}
}

if (_flags & RequiresGeomBindXform) {
Expand Down Expand Up @@ -1228,6 +1259,7 @@ _SkinningAdapter::_SkinningAdapter(
"[UsdSkelBakeSkinning]\n Computation state for skinnable prim <%s>:\n"
" _restPointsTask: %s\n"
" _restNormalsTask: %s\n"
" _faceVertexIndicesTask: %s\n"
" _geomBindXformTask: %s\n"
" _geomBindInvTransposeXformTask: %s\n"
" _jointInfluencesTask: %s\n"
Expand All @@ -1237,6 +1269,7 @@ _SkinningAdapter::_SkinningAdapter(
_skinningQuery.GetPrim().GetPath().GetText(),
_restPointsTask.GetDescription().c_str(),
_restNormalsTask.GetDescription().c_str(),
_faceVertexIndicesTask.GetDescription().c_str(),
_geomBindXformTask.GetDescription().c_str(),
_geomBindInvTransposeXformTask.GetDescription().c_str(),
_jointInfluencesTask.GetDescription().c_str(),
Expand All @@ -1263,6 +1296,12 @@ _SkinningAdapter::ExtendTimeSamples(const GfInterval& interval,
times->insert(times->end(), tmpTimes.begin(), tmpTimes.end());
}
}
if (_faceVertexIndicesTask) {
if (_faceVertexIndicesQuery.GetTimeSamplesInInterval(
interval, &tmpTimes)) {
times->insert(times->end(), tmpTimes.begin(), tmpTimes.end());
}
}
if (_geomBindXformTask && _geomBindXformQuery) {
if (_geomBindXformQuery.GetTimeSamplesInInterval(
interval, &tmpTimes)) {
Expand Down Expand Up @@ -1376,6 +1415,17 @@ _SkinningAdapter::_ComputeRestNormals(const UsdTimeCode time)
}


bool
_SkinningAdapter::_ComputeFaceVertexIndices(const UsdTimeCode time)
{
return _faceVertexIndicesTask.Run(
time, GetPrim(), "compute face vertex indices",
[&](UsdTimeCode time) {
return _faceVertexIndicesQuery.Get(&_faceVertexIndices, time);
});
}


bool
_SkinningAdapter::_ComputeGeomBindXform(const UsdTimeCode time)
{
Expand Down Expand Up @@ -1598,11 +1648,20 @@ _SkinningAdapter::_DeformNormalsWithLBS(const GfMatrix4d& skelToGprimXf)
_normals.value = _restNormals;
}

_normals.hasSampleAtCurrentTime =
UsdSkelSkinNormalsLBS(_geomBindInvTransposeXform, xformsForPrim,
_jointIndices, _jointWeights,
_skinningQuery.GetNumInfluencesPerComponent(),
_normals.value);
if (_faceVertexIndicesTask) {
_normals.hasSampleAtCurrentTime =
UsdSkelSkinFaceVaryingNormalsLBS(_geomBindInvTransposeXform,
xformsForPrim, _jointIndices, _jointWeights,
_skinningQuery.GetNumInfluencesPerComponent(),
_faceVertexIndices, _normals.value);
} else {
_normals.hasSampleAtCurrentTime =
UsdSkelSkinNormalsLBS(_geomBindInvTransposeXform, xformsForPrim,
_jointIndices, _jointWeights,
_skinningQuery.GetNumInfluencesPerComponent(),
_normals.value);
}

if (!_normals.hasSampleAtCurrentTime) {
return;
}
Expand Down Expand Up @@ -1700,6 +1759,7 @@ _SkinningAdapter::Update(const UsdTimeCode time, const size_t timeIndex)
// Compute inputs.
_ComputeRestPoints(time);
_ComputeRestNormals(time);
_ComputeFaceVertexIndices(time);

// Blend shapes precede LBS skinning.
if (_flags & UsdSkelBakeSkinningParms::DeformWithBlendShapes) {
Expand Down
Loading