AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-09 22:00:06 +00:00
Code Issues Releases Wiki Activity

Enabled the "triangle smoothing" option for Catmark edge vertices.

Browse Source
This commit is contained in:
barfowl 2014-12-10 19:20:03 -08:00
parent 6c6993f5b0
commit 4a3184684f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opensubdiv/sdc/catmarkScheme.h
View File

@ -67,16 +67,21 @@ Scheme<TYPE_CATMARK>::assignSmoothMaskForEdge(EDGE const& edge, MASK& mask) cons
// Determine if we need to inspect incident faces and apply alternate weighting for
// triangles -- and if so, determine which of the two are triangles.
//
// (Is this really used? Would be nice if we could deprecate this option...)
//
bool face0IsTri = false;
bool face1IsTri = false;
bool useTriangleOption = (_options.GetTriangleSubdivision() != Options::TRI_SUB_NORMAL);
if (useTriangleOption) {
if (faceCount == 2) {
//
// Need to inspect/gather valence of incident faces here...
// Ideally we want to avoid this inspection when we have already subdivided at
// least once -- need something in the Edge interface to help avoid this, e.g.
// an IsRegular() query, the subdivision level...
//
int vertsPerFace[2];
edge.GetNumVerticesPerFace(vertsPerFace);
face0IsTri = (vertsPerFace[0] == 3);
face1IsTri = (vertsPerFace[1] == 3);
useTriangleOption = face0IsTri || face1IsTri;
} else {
useTriangleOption = false;
@ -98,8 +103,7 @@ Scheme<TYPE_CATMARK>::assignSmoothMaskForEdge(EDGE const& edge, MASK& mask) cons
}
} else {
//
// This mimics the implementation in Hbr in terms of order of operations. If
// the triangle-subdivision option can be deprecated we can remove this block:
// This mimics the implementation in Hbr in terms of order of operations:
//
const Weight CATMARK_SMOOTH_TRI_EDGE_WEIGHT = 0.470f;