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

Fixed max-valence assignment in refinement to account for non-manifold edges:

Browse Source 
- consider the vertex from the edge with the maximum number of faces
This commit is contained in:
barry 2019-05-16 14:42:23 -07:00
parent 6fa58d1879
commit 5aa10c8f55
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opensubdiv/vtr/refinement.cpp
View File

@ -815,7 +815,7 @@ Refinement::subdivideTopology(Relations const& applyTo) {
// than the parent if that maximal parent vertex was not included in the sparse
// refinement (possible when sparse refinement is more general).
// - it may also be more if the base level was fairly trivial, i.e. less
// than the regular valence.
// than the regular valence, or contains non-manifold edges with many faces.
// - NOTE that when/if we support N-gons for tri-splitting, that the valence
// of edge-vertices introduced on the N-gon may be 7 rather than 6, while N may
// be less than both.
@ -824,9 +824,13 @@ Refinement::subdivideTopology(Relations const& applyTo) {
// each topology relation is independent/optional complicates the issue of
// where to keep track of it...
//
int maxRegularValence = (_splitType == Sdc::SPLIT_TO_QUADS) ? 4 : 6;
_child->_maxValence = std::max(_parent->_maxValence, maxRegularValence);
if (_splitType == Sdc::SPLIT_TO_QUADS) {
_child->_maxValence = std::max(_parent->_maxValence, 4);
_child->_maxValence = std::max(_child->_maxValence, 2 + _parent->_maxEdgeFaces);
} else {
_child->_maxValence = std::max(_parent->_maxValence, 6);
_child->_maxValence = std::max(_child->_maxValence, 2 + _parent->_maxEdgeFaces * 2);
}
}