Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next change set for the new interface

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@902 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 10:26:50 +00:00
parent 29335262e4
commit 50dc9e8478
13 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh
View File

@@ -224,11 +224,11 @@ protected:
if (_m.is_boundary(fit))
{
if(gen%2)
_m.property(fp_pos_, fit.handle()).invalidate();
_m.property(fp_pos_, *fit).invalidate();
else
{
//find the interior boundary halfedge
for( heh = _m.halfedge_handle(fit.handle()); !_m.is_boundary( _m.opposite_halfedge_handle(heh) ); heh = _m.next_halfedge_handle(heh) )
for( heh = _m.halfedge_handle(*fit); !_m.is_boundary( _m.opposite_halfedge_handle(heh) ); heh = _m.next_halfedge_handle(heh) )
;
assert(_m.is_boundary( _m.opposite_halfedge_handle(heh) ));
pos = zero;
@@ -303,7 +303,7 @@ protected:
}
}
vh = _m.add_vertex( pos );
_m.property(fp_pos_, fit.handle()) = vh;
_m.property(fp_pos_, *fit) = vh;
}
}
else
@@ -312,16 +312,16 @@ protected:
int nOrdinary = 0;
//check number of extraordinary vertices
for(fvit = _m.fv_iter( fit ); fvit; ++fvit)
if( (_m.valence(fvit.handle())) == 6 || _m.is_boundary(fvit.handle()) )
for(fvit = _m.fv_iter( fit ); fvit.is_valid(); ++fvit)
if( (_m.valence(*fvit)) == 6 || _m.is_boundary(*fvit) )
++nOrdinary;
if(nOrdinary==3)
{
for(fheit = _m.fh_iter( fit ); fheit; ++fheit)
for(fheit = _m.fh_iter( fit ); fheit.is_valid(); ++fheit)
{
//one ring vertex has weight 32/81
heh = fheit.handle();
heh = *fheit;
assert(_m.to_vertex_handle(heh).is_valid());
pos += real_t(32.0/81) * _m.point(_m.to_vertex_handle(heh));
//tip vertex has weight -1/81
@@ -346,14 +346,14 @@ protected:
else
{
//only use irregular vertices:
for(fheit = _m.fh_iter( fit ); fheit; ++fheit)
for(fheit = _m.fh_iter( fit ); fheit.is_valid(); ++fheit)
{
vh = _m.to_vertex_handle(fheit);
if( (_m.valence(vh) != 6) && (!_m.is_boundary(vh)) )
{
unsigned int K = _m.valence(vh);
pos += weights_[K][K]*_m.point(vh);
heh = _m.opposite_halfedge_handle( fheit.handle() );
heh = _m.opposite_halfedge_handle( *fheit );
for(unsigned int i = 0; i<K; ++i, heh = _m.opposite_halfedge_handle(_m.prev_halfedge_handle(heh)) )
{
pos += weights_[K][i]*_m.point(_m.to_vertex_handle(heh));
@@ -364,7 +364,7 @@ protected:
}
vh = _m.add_vertex( pos );
_m.property(fp_pos_, fit.handle()) = vh;
_m.property(fp_pos_, *fit) = vh;
}
}
@@ -377,8 +377,8 @@ protected:
}
else
{
assert(_m.property(fp_pos_, fit.handle()).is_valid());
_m.split( fit, _m.property(fp_pos_, fit.handle()) );
assert(_m.property(fp_pos_, *fit).is_valid());
_m.split( fit, _m.property(fp_pos_, *fit) );
}
}

12
src/OpenMesh/Tools/Utils/MeshCheckerT.cc
View File

@@ -84,7 +84,7 @@ check(unsigned int _targets, std::ostream& _os)
{
if (!is_deleted(v_it))
{
vh = v_it.handle();
vh = *v_it;
/* The outgoing halfedge of a boundary vertex has to be a
@@ -95,7 +95,7 @@ check(unsigned int _targets, std::ostream& _os)
for (typename Mesh::ConstVertexOHalfedgeIter vh_it(mesh_, vh);
vh_it; ++vh_it)
{
if (mesh_.is_boundary(vh_it.handle()))
if (mesh_.is_boundary(*vh_it))
{
_os << "MeshChecker: vertex " << vh
<< ": outgoing halfedge not on boundary error\n";
@@ -150,9 +150,9 @@ check(unsigned int _targets, std::ostream& _os)
for (; h_it != h_end; ++h_it)
{
if (!is_deleted(mesh_.edge_handle(h_it.handle())))
if (!is_deleted(mesh_.edge_handle(*h_it)))
{
hh = h_it.handle();
hh = *h_it;
// degenerated halfedge ?
@@ -206,11 +206,11 @@ check(unsigned int _targets, std::ostream& _os)
{
if (!is_deleted(f_it))
{
fh = f_it.handle();
fh = *f_it;
for (fh_it=mesh_.cfh_iter(fh); fh_it; ++fh_it)
{
if (mesh_.face_handle(fh_it.handle()) != fh)
if (mesh_.face_handle(*fh_it) != fh)
{
_os << "MeshChecker: face " << fh
<< ": its halfedge does not reference face\n";

2
src/OpenMesh/Tools/Utils/StripifierT.cc
View File

@@ -142,7 +142,7 @@ build_strips()
// collect starting halfedges
h[0] = mesh_.halfedge_handle(f_it.handle());
h[0] = mesh_.halfedge_handle(*f_it);
h[1] = mesh_.next_halfedge_handle(h[0]);
h[2] = mesh_.next_halfedge_handle(h[1]);