AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-27 02:10:24 +00:00
Code Issues Releases Wiki Activity

- change adaptive refinement in FarMeshFactory to not refine inside holes,

Browse Source 
while retaining a necessary 1-ring on the inside of a hole edge

- add IsInsideHole() function to HbrHalfEdge

- add HasChild() function to HbrVertex and HbrHalfedge

- add a regression shape with adjacent holes and creases (tests dart, crease & boundaries)

Note : this does not address hierarchical edits inside holes or hole tags in hierarchical edits

fixes #78
This commit is contained in:
manuelk 2013-02-20 14:12:09 -08:00
parent a1040e80d4
commit 25f79e7ff2
6 changed files with 239 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/glViewer/viewer.cpp
View File

@ -403,6 +403,9 @@ initializeShapes( ) {
#include <shapes/catmark_hole_test1.h>
g_defaultShapes.push_back(SimpleShape(catmark_hole_test1, "catmark_hole_test1", kCatmark));
#include <shapes/catmark_hole_test2.h>
g_defaultShapes.push_back(SimpleShape(catmark_hole_test2, "catmark_hole_test2", kCatmark));
#include <shapes/catmark_pyramid_creases0.h>
g_defaultShapes.push_back(SimpleShape(catmark_pyramid_creases0, "catmark_pyramid_creases0", kCatmark));

63
opensubdiv/far/meshFactory.h
View File

@ -241,7 +241,7 @@ FarMeshFactory<T,U>::refine( HbrMesh<T> * mesh, int maxlevel ) {
HbrHalfedge<T> * e = f->GetFirstEdge();
for (int i=0; i<f->GetNumVertices(); ++i) {
assert(e);
if ((not e->IsBoundary()) and (not e->GetOpposite()->GetFace()->IsHole())) {
if (e->GetRightFace() and (not e->GetRightFace()->IsHole())) {
// RefineFaceAtVertex only creates a single child face
// centered on the passed vertex
@ -340,29 +340,35 @@ template <class T, class U> void
FarMeshFactory<T,U>::refineVertexNeighbors(HbrVertex<T> * v) {
assert(v);
HbrHalfedge<T> * start = v->GetIncidentEdge(),
* next=start;
do {
if (next->GetRightFace())
next->GetRightFace()->_adaptiveFlags.isTagged=true;
if (next->GetLeftFace())
next->GetLeftFace()->_adaptiveFlags.isTagged=true;
HbrFace<T> * lft = next->GetLeftFace(),
* rgt = next->GetRightFace();
HbrHalfedge<T> * istart = next,
* inext = istart;
do {
inext->GetOrgVertex()->Refine();
inext = inext->GetNext();
} while (istart != inext);
if (not ((lft and lft->IsHole()) and
(rgt and rgt->IsHole()) ) ) {
if (rgt)
rgt->_adaptiveFlags.isTagged=true;
if (lft)
lft->_adaptiveFlags.isTagged=true;
HbrHalfedge<T> * istart = next,
* inext = istart;
do {
if (not inext->IsInsideHole() )
inext->GetOrgVertex()->Refine();
inext = inext->GetNext();
} while (istart != inext);
}
next = v->GetNextEdge( next );
} while (next and next!=start);
}
// XXXX manuelk : std::sets are slow.
// with the "isTagged" flag on verts we can prob. ditch verts / nextverts !!!
template <class T> struct VertCompare {
bool operator()(HbrVertex<T> const * v1, HbrVertex<T> const * v2 ) const {
//return v1->GetID() < v2->GetID();
@ -399,6 +405,10 @@ FarMeshFactory<T,U>::refineAdaptive( HbrMesh<T> * mesh, int maxIsolate ) {
for (int i=0; i<ncoarsefaces; ++i) {
HbrFace<T> * f = mesh->GetFace(i);
if (f->IsHole())
continue;
for (int j=0; j<f->GetNumVertices(); ++j) {
HbrHalfedge<T> * e = f->GetEdge(j);
@ -429,39 +439,44 @@ FarMeshFactory<T,U>::refineAdaptive( HbrMesh<T> * mesh, int maxIsolate ) {
verts = nextverts;
nextverts.clear();
// Refine vertices
for (typename VertSet::iterator i=verts.begin(); i!=verts.end(); ++i) {
HbrVertex<T> * v = *i;
assert(v);
if (level>0)
v->_adaptiveFlags.isTagged=true;
else
v->_adaptiveFlags.wasTagged=true;
refineVertexNeighbors(v);
// Tag non-BSpline vertices for refinement
if (not vertexIsBSpline(v, true))
nextverts.insert(v->Subdivide());
// Refine edges with creases or edits
int valence = v->GetValence();
_maxValence = std::max(_maxValence, valence);
HbrHalfedge<T> * e = v->GetIncidentEdge();
for (int j=0; j<valence; ++j) {
if (e->IsSharp(false) and (not e->IsBoundary())) {
nextverts.insert( e->Subdivide() );
nextverts.insert( e->GetOrgVertex()->Subdivide() );
nextverts.insert( e->GetDestVertex()->Subdivide() );
// Skip edges that have already been processed (HasChild())
if ((not e->HasChild()) and e->IsSharp(false) and (not e->IsBoundary())) {
if (not e->IsInsideHole()) {
nextverts.insert( e->Subdivide() );
nextverts.insert( e->GetOrgVertex()->Subdivide() );
nextverts.insert( e->GetDestVertex()->Subdivide() );
}
}
HbrHalfedge<T> * next = v->GetNextEdge(e);
e = next ? next : e->GetPrev();
}
// Flag verts with hierarchical edits for neighbor refinement at the next level
HbrVertex<T> * childvert = v->Subdivide();
HbrHalfedge<T> * childedge = childvert->GetIncidentEdge();

26
opensubdiv/far/patchTablesFactory.h
View File

@ -212,7 +212,7 @@ FarPatchTablesFactory<T>::FarPatchTablesFactory( HbrMesh<T> const * mesh, int nf
HbrFace<T> * f = mesh->GetFace(i);
if (f->_adaptiveFlags.isTagged) {
if (f->_adaptiveFlags.isTagged and (not f->IsHole())) {
HbrVertex<T> * v = f->Subdivide();
assert(v);
v->_adaptiveFlags.wasTagged=true;
@ -241,23 +241,31 @@ FarPatchTablesFactory<T>::FarPatchTablesFactory( HbrMesh<T> const * mesh, int nf
if (not (left and right))
continue;
if (left->_adaptiveFlags.isTagged ^ right->_adaptiveFlags.isTagged) {
// a tagged edge w/ no children is inside a hole
if (e->HasChild() and (left->_adaptiveFlags.isTagged ^ right->_adaptiveFlags.isTagged)) {
e->_adaptiveFlags.isTransition = true;
HbrVertex<T> * child = e->Subdivide();
assert( child );
assert(child);
// These edges will require extra rows of CVs to maintain water-tightness
HbrHalfedge<T> * org = child->GetEdge(e->GetOrgVertex()->Subdivide()),
* dst = child->GetEdge(e->GetDestVertex()->Subdivide());
assert( org and dst );
// Note : vertices inside holes have no children
if (e->GetOrgVertex()->HasChild()) {
HbrHalfedge<T> * org = child->GetEdge(e->GetOrgVertex()->Subdivide());
if (org)
org->_adaptiveFlags.isWatertightCritical=true;
}
org->_adaptiveFlags.isWatertightCritical=true;
dst->_adaptiveFlags.isWatertightCritical=true;
if (e->GetDestVertex()->HasChild()) {
HbrHalfedge<T> * dst = child->GetEdge(e->GetDestVertex()->Subdivide());
if (dst)
dst->_adaptiveFlags.isWatertightCritical=true;
}
}
}
}
// Second pass : count boundaries / identify transition constellation
for (int i=0; i<nfaces; ++i) {

16
opensubdiv/hbr/halfedge.h
View File

@ -252,6 +252,9 @@ public:
// Make sure the edge has its opposite face
void GuaranteeNeighbor();
// True if the edge has a subdivided child vertex
bool HasChild() const { return vchild!=-1; }
// Remove the reference to subdivided vertex
void RemoveChild() { vchild = -1; }
@ -481,6 +484,19 @@ public:
adaptiveFlags _adaptiveFlags;
bool IsInsideHole() const {
HbrFace<T> * left = GetLeftFace();
if (left and (not left->IsHole()))
return false;
HbrFace<T> * right = GetRightFace();
if (right and (not right->IsHole()))
return false;
return true;
}
bool IsTransition() const { return _adaptiveFlags.isTransition; }
bool IsTriangleHead() const { return _adaptiveFlags.isTriangleHead; }

3
opensubdiv/hbr/vertex.h
View File

@ -275,6 +275,9 @@ public:
validmask = 0;
}
// True if the edge has a subdivided child vertex
bool HasChild() const { return vchild!=-1; }
// Remove the reference to subdivided vertex
void RemoveChild() { vchild = -1; }

161
regression/shapes/catmark_hole_test2.h Normal file
View File

@ -0,0 +1,161 @@
//
// Copyright (C) Pixar. All rights reserved.
//
// This license governs use of the accompanying software. If you
// use the software, you accept this license. If you do not accept
// the license, do not use the software.
//
// 1. Definitions
// The terms "reproduce," "reproduction," "derivative works," and
// "distribution" have the same meaning here as under U.S.
// copyright law. A "contribution" is the original software, or
// any additions or changes to the software.
// A "contributor" is any person or entity that distributes its
// contribution under this license.
// "Licensed patents" are a contributor's patent claims that read
// directly on its contribution.
//
// 2. Grant of Rights
// (A) Copyright Grant- Subject to the terms of this license,
// including the license conditions and limitations in section 3,
// each contributor grants you a non-exclusive, worldwide,
// royalty-free copyright license to reproduce its contribution,
// prepare derivative works of its contribution, and distribute
// its contribution or any derivative works that you create.
// (B) Patent Grant- Subject to the terms of this license,
// including the license conditions and limitations in section 3,
// each contributor grants you a non-exclusive, worldwide,
// royalty-free license under its licensed patents to make, have
// made, use, sell, offer for sale, import, and/or otherwise
// dispose of its contribution in the software or derivative works
// of the contribution in the software.
//
// 3. Conditions and Limitations
// (A) No Trademark License- This license does not grant you
// rights to use any contributor's name, logo, or trademarks.
// (B) If you bring a patent claim against any contributor over
// patents that you claim are infringed by the software, your
// patent license from such contributor to the software ends
// automatically.
// (C) If you distribute any portion of the software, you must
// retain all copyright, patent, trademark, and attribution
// notices that are present in the software.
// (D) If you distribute any portion of the software in source
// code form, you may do so only under this license by including a
// complete copy of this license with your distribution. If you
// distribute any portion of the software in compiled or object
// code form, you may only do so under a license that complies
// with this license.
// (E) The software is licensed "as-is." You bear the risk of
// using it. The contributors give no express warranties,
// guarantees or conditions. You may have additional consumer
// rights under your local laws which this license cannot change.
// To the extent permitted under your local laws, the contributors
// exclude the implied warranties of merchantability, fitness for
// a particular purpose and non-infringement.
//
static char const * catmark_hole_test2 =
"# This file uses centimeters as units for non-parametric coordinates.\n"
"\n"
"v -0.250000 -0.000000 0.250000\n"
"v -0.125000 -0.000000 0.250000\n"
"v 0.000000 -0.000000 0.250000\n"
"v 0.125000 -0.000000 0.250000\n"
"v 0.250000 -0.000000 0.250000\n"
"v -0.250000 -0.000000 0.125000\n"
"v -0.125000 0.125000 0.125000\n"
"v 0.000000 0.125000 0.125000\n"
"v 0.125000 -0.000000 0.125000\n"
"v 0.250000 -0.000000 0.125000\n"
"v -0.250000 0.000000 0.000000\n"
"v -0.125000 0.000000 0.000000\n"
"v 0.000000 0.000000 0.000000\n"
"v 0.125000 0.000000 0.000000\n"
"v 0.250000 0.000000 0.000000\n"
"v -0.250000 0.000000 -0.125000\n"
"v -0.125000 0.000000 -0.125000\n"
"v 0.000000 0.000000 -0.125000\n"
"v 0.125000 0.000000 -0.125000\n"
"v 0.250000 0.000000 -0.125000\n"
"v -0.250000 0.000000 -0.250000\n"
"v -0.125000 0.000000 -0.250000\n"
"v 0.000000 0.000000 -0.250000\n"
"v 0.125000 0.000000 -0.250000\n"
"v 0.250000 0.000000 -0.250000\n"
"vt 0.000000 0.000000\n"
"vt 0.250000 0.000000\n"
"vt 0.500000 0.000000\n"
"vt 0.750000 0.000000\n"
"vt 1.000000 0.000000\n"
"vt 0.000000 0.250000\n"
"vt 0.250000 0.250000\n"
"vt 0.500000 0.250000\n"
"vt 0.750000 0.250000\n"
"vt 1.000000 0.250000\n"
"vt 0.000000 0.500000\n"
"vt 0.250000 0.500000\n"
"vt 0.500000 0.500000\n"
"vt 0.750000 0.500000\n"
"vt 1.000000 0.500000\n"
"vt 0.000000 0.750000\n"
"vt 0.250000 0.750000\n"
"vt 0.500000 0.750000\n"
"vt 0.750000 0.750000\n"
"vt 1.000000 0.750000\n"
"vt 0.000000 1.000000\n"
"vt 0.250000 1.000000\n"
"vt 0.500000 1.000000\n"
"vt 0.750000 1.000000\n"
"vt 1.000000 1.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"vn 0.000000 1.000000 0.000000\n"
"s off\n"
"f 1/1/1 2/2/2 7/7/3 6/6/4\n"
"f 2/2/2 3/3/5 8/8/6 7/7/3\n"
"f 3/3/5 4/4/7 9/9/8 8/8/6\n"
"f 4/4/7 5/5/9 10/10/10 9/9/8\n"
"f 6/6/4 7/7/3 12/12/11 11/11/12\n"
"f 7/7/3 8/8/6 13/13/13 12/12/11\n"
"f 8/8/6 9/9/8 14/14/14 13/13/13\n"
"f 9/9/8 10/10/10 15/15/15 14/14/14\n"
"f 11/11/12 12/12/11 17/17/16 16/16/17\n"
"f 12/12/11 13/13/13 18/18/18 17/17/16\n"
"f 13/13/13 14/14/14 19/19/19 18/18/18\n"
"f 14/14/14 15/15/15 20/20/20 19/19/19\n"
"f 16/16/17 17/17/16 22/22/21 21/21/22\n"
"f 17/17/16 18/18/18 23/23/23 22/22/21\n"
"f 18/18/18 19/19/19 24/24/24 23/23/23\n"
"f 19/19/19 20/20/20 25/25/25 24/24/24\n"
"t hole 4/0/0 5 6 9 10\n"
"t interpolateboundary 1/0/0 1\n"
"t crease 2/1/0 6 7 7.5\n"
;