AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-05 06:21:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #328 from nathan-at-digitalfish/fix_compare_vertices

Browse Source 
Fix for FarCatmarkSubdivisionTablesFactory::CompareVertices function
This commit is contained in:
Manuel Kraemer 2014-06-27 07:14:13 -07:00
commit 87d9b2814b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opensubdiv/far/catmarkSubdivisionTablesFactory.h
View File

@ -74,7 +74,7 @@ FarCatmarkSubdivisionTablesFactory<T,U>::Create( FarMeshFactory<T,U> * meshFacto
std::vector<int> & remap = meshFactory->getRemappingTable();
FarSubdivisionTablesFactory<T,U> tablesFactory( meshFactory->GetHbrMesh(), maxlevel, remap );
FarSubdivisionTablesFactory<T,U> tablesFactory( meshFactory->GetHbrMesh(), maxlevel, remap, CompareVertices );
FarSubdivisionTables * result = new FarSubdivisionTables(maxlevel, FarSubdivisionTables::CATMARK);
@ -454,14 +454,14 @@ FarCatmarkSubdivisionTablesFactory<T,U>::CompareVertices( HbrVertex<T> const * x
HbrVertex<T> * px=x->GetParentVertex(),
* py=y->GetParentVertex();
int rankx = GetMaskRanking(px->GetMask(false), px->GetMask(true) );
int ranky = GetMaskRanking(py->GetMask(false), py->GetMask(true) );
int rankx = FarSubdivisionTablesFactory<T,U>::GetMaskRanking(px->GetMask(false), px->GetMask(true) );
int ranky = FarSubdivisionTablesFactory<T,U>::GetMaskRanking(py->GetMask(false), py->GetMask(true) );
assert( rankx!=0xFF and ranky!=0xFF );
// Arrange regular vertices before irregular vertices within the same kernel
if ((rankx <= 2 and ranky <= 2) or (rankx >= 3 and rankx <= 7 and ranky >= 3 and ranky <= 7) or (rankx >= 8 and ranky >= 8))
return px->GetValence() == 4 and py->GetValence() != 4;
return x->GetValence() == 4 and y->GetValence() != 4;
else
return rankx < ranky;
}