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

Replaced all .handle() calls

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@904 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 10:43:06 +00:00
parent ea099b1437
commit e21e113b50
23 changed files with 238 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
View File

@@ -79,7 +79,7 @@ bool CompositeT<MeshType,RealType>::prepare( MeshType& _m )
typename MeshType::VertexIter v_it(_m.vertices_begin());
for (; v_it != _m.vertices_end(); ++v_it)
_m.data(v_it).set_position(_m.point(v_it.handle()));
_m.data(v_it).set_position(_m.point(*v_it()));
return true;
}
@@ -121,7 +121,7 @@ void CompositeT<MeshType,RealType>::Tvv3()
mesh_.data(vh).set_position(zero_point);
mesh_.split(f_it.handle(), vh);
mesh_.split(*f_it(), vh);
++f_it;
}
@@ -132,10 +132,10 @@ void CompositeT<MeshType,RealType>::Tvv3()
e_it = mesh_.edges_begin();
for (j = 0; j < n_edges; ++j) {
if (mesh_.is_flip_ok(e_it.handle())) {
mesh_.flip(e_it.handle());
if (mesh_.is_flip_ok(*e_it())) {
mesh_.flip(*e_it());
} else {
edge_vector.push_back(e_it.handle());
edge_vector.push_back(*e_it());
}
++e_it;
}
@@ -181,7 +181,7 @@ void CompositeT<MeshType,RealType>::Tvv4()
e_it = mesh_.edges_begin();
for (j = 0; j < n_edges; ++j) {
vh = split_edge(mesh_.halfedge_handle(e_it.handle(), 0));
vh = split_edge(mesh_.halfedge_handle(*e_it(), 0));
mesh_.data(vh).set_position(zero_point);
++e_it;
@@ -190,7 +190,7 @@ void CompositeT<MeshType,RealType>::Tvv4()
// Corner Cutting of Each Face
f_it = mesh_.faces_begin();
for (j = 0; j < n_faces; ++j) {
typename MeshType::HalfedgeHandle heh1(mesh_.halfedge_handle(f_it.handle()));
typename MeshType::HalfedgeHandle heh1(mesh_.halfedge_handle(*f_it()));
typename MeshType::HalfedgeHandle heh2(mesh_.next_halfedge_handle(mesh_.next_halfedge_handle(heh1)));
typename MeshType::HalfedgeHandle heh3(mesh_.next_halfedge_handle(mesh_.next_halfedge_handle(heh2)));
@@ -233,7 +233,7 @@ void CompositeT<MeshType,RealType>::Tfv()
for (j = 0; j < n_vertices; ++j) {
valence = 0;
cog = zero_point;
for (vf_it = mesh_.vf_iter(v_it.handle()); vf_it; ++vf_it) {
for (vf_it = mesh_.vf_iter(*v_it); vf_it; ++vf_it) {
++valence;
cog += vf_it->position();
}
@@ -251,13 +251,13 @@ void CompositeT<MeshType,RealType>::Tfv()
valence = 0;
cog = zero_point;
for (ff_it = mesh_.ff_iter(f_it.handle()); ff_it; ++ff_it) {
for (ff_it = mesh_.ff_iter(*f_it()); ff_it; ++ff_it) {
++valence;
cog += ff_it->position();
}
cog /= valence;
mesh_.split(f_it.handle(), vh);
mesh_.split(*f_it(), vh);
for (vf_it = mesh_.vf_iter(vh); vf_it; ++vf_it) {
vf_it->set_position(f_it->position());
@@ -273,8 +273,8 @@ void CompositeT<MeshType,RealType>::Tfv()
// Flip each old edge
e_it = mesh_.edges_begin();
for (j = 0; j < n_edges; ++j) {
if (mesh_.is_flip_ok(e_it.handle()))
mesh_.flip(e_it.handle());
if (mesh_.is_flip_ok(*e_it()))
mesh_.flip(*e_it());
++e_it;
}
}
@@ -297,7 +297,7 @@ void CompositeT<MeshType,RealType>::VF()
valence = 0;
cog = zero_point;
for (fv_it = mesh_.fv_iter(f_it.handle()); fv_it.is_valid(); ++fv_it) {
for (fv_it = mesh_.fv_iter(*f_it()); fv_it.is_valid(); ++fv_it) {
cog += mesh_.data(fv_it).position();
++valence;
}
@@ -324,7 +324,7 @@ void CompositeT<MeshType,RealType>::VFa(Coeff& _coeff)
for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) {
heh = mesh_.halfedge_handle(f_it.handle());
heh = mesh_.halfedge_handle(*f_it());
for (i = 0; i <= 2; ++i) {
valence[i] = 0;
@@ -352,11 +352,11 @@ void CompositeT<MeshType,RealType>::VFa(Coeff& _coeff)
cog = zero_point;
for (fv_it = mesh_.fv_iter(f_it.handle()); fv_it.is_valid(); ++fv_it) {
if (fv_it.handle() == vh[i]) {
cog += fv_it->position() * alpha;
for (fv_it = mesh_.fv_iter(*f_it()); fv_it.is_valid(); ++fv_it) {
if (*fv_it == vh[i]) {
cog += fv_it->position() * alpha;
} else {
cog += fv_it->position() * (1.0 - alpha) / 2.0;
cog += fv_it->position() * (1.0 - alpha) / 2.0;
}
}
@@ -372,7 +372,7 @@ void CompositeT<MeshType,RealType>::VFa(scalar_t _alpha)
unsigned int valence[3], i;
typename MeshType::Point cog,
zero_point(0.0, 0.0, 0.0);
zero_point(0.0, 0.0, 0.0);
typename MeshType::FaceIter f_it;
typename MeshType::HalfedgeHandle heh;
typename MeshType::VertexHandle vh[3];
@@ -381,14 +381,14 @@ void CompositeT<MeshType,RealType>::VFa(scalar_t _alpha)
for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it) {
heh = mesh_.halfedge_handle(f_it.handle());
heh = mesh_.halfedge_handle(*f_it());
for (i = 0; i <= 2; ++i) {
valence[i] = 0;
vh[i] = mesh_.to_vertex_handle(heh);
for (voh_it = mesh_.voh_iter(vh[i]); voh_it; ++voh_it) {
++valence[i];
++valence[i];
}
heh = mesh_.next_halfedge_handle(heh);
@@ -396,22 +396,22 @@ void CompositeT<MeshType,RealType>::VFa(scalar_t _alpha)
if (valence[0] <= valence[1])
if (valence[0] <= valence[2])
i = 0;
i = 0;
else
i = 2;
i = 2;
else
if (valence[1] <= valence[2])
i = 1;
i = 1;
else
i = 2;
i = 2;
cog = zero_point;
for (fv_it = mesh_.fv_iter(f_it.handle()); fv_it.is_valid(); ++fv_it) {
if (fv_it.handle() == vh[i]) {
cog += fv_it->position() * _alpha;
for (fv_it = mesh_.fv_iter(*f_it()); fv_it.is_valid(); ++fv_it) {
if (*fv_it == vh[i]) {
cog += fv_it->position() * _alpha;
} else {
cog += fv_it->position() * (1.0 - _alpha) / 2.0;
cog += fv_it->position() * (1.0 - _alpha) / 2.0;
}
}
@@ -439,7 +439,7 @@ void CompositeT<MeshType,RealType>::FF()
valence = 0;
cog = zero_point;
for (ff_it = mesh_.ff_iter(f_it.handle()); ff_it; ++ff_it)
for (ff_it = mesh_.ff_iter(*f_it()); ff_it; ++ff_it)
{
cog += mesh_.data(ff_it).position();
++valence;
@@ -475,7 +475,7 @@ void CompositeT<MeshType,RealType>::FFc(Coeff& _coeff)
valence = 0;
cog = zero_point;
for (ff_it = mesh_.ff_iter(f_it.handle()); ff_it; ++ff_it) {
for (ff_it = mesh_.ff_iter(*f_it()); ff_it; ++ff_it) {
cog += ff_it->position();
++valence;
}
@@ -515,7 +515,7 @@ void CompositeT<MeshType,RealType>::FFc(scalar_t _c)
valence = 0;
cog = zero_point;
for (ff_it = mesh_.ff_iter(f_it.handle()); ff_it; ++ff_it) {
for (ff_it = mesh_.ff_iter(*f_it()); ff_it; ++ff_it) {
cog += ff_it->position();
++valence;
}
@@ -551,7 +551,7 @@ void CompositeT<MeshType,RealType>::FV()
valence = 0;
cog = zero_point;
for (vf_it = mesh_.vf_iter(v_it.handle()); vf_it; ++vf_it) {
for (vf_it = mesh_.vf_iter(*v_it); vf_it; ++vf_it) {
cog += vf_it->position();
++valence;
}
@@ -578,13 +578,13 @@ void CompositeT<MeshType,RealType>::FVc(Coeff& _coeff)
valence = 0;
cog = zero_point;
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
++valence;
}
c = _coeff(valence);
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
if (mesh_.face_handle(*voh_it).is_valid()) {
@@ -623,11 +623,11 @@ void CompositeT<MeshType,RealType>::FVc(scalar_t _c)
valence = 0;
cog = zero_point;
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
++valence;
}
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
if (mesh_.face_handle(*voh_it).is_valid()) {
@@ -666,7 +666,7 @@ void CompositeT<MeshType,RealType>::VdE()
cog = zero_point;
valence = 2;
heh1 = mesh_.halfedge_handle(e_it.handle(), 0);
heh1 = mesh_.halfedge_handle(*e_it(), 0);
heh2 = mesh_.opposite_halfedge_handle(heh1);
cog += mesh_.data(mesh_.to_vertex_handle(heh1)).position();
cog += mesh_.data(mesh_.to_vertex_handle(heh2)).position();
@@ -704,7 +704,7 @@ void CompositeT<MeshType,RealType>::VdEc(scalar_t _c)
for (int i = 0; i <= 1; ++i) {
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
if (!mesh_.is_boundary(heh))
{
cog += mesh_.point(mesh_.to_vertex_handle(mesh_.next_halfedge_handle(heh))) * (0.5 - _c);
@@ -739,7 +739,7 @@ void CompositeT<MeshType,RealType>::VdEg(scalar_t _gamma)
for (i = 0; i <= 1; ++i)
{
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
valence[i] = 0;
// look for lowest valence vertex
@@ -754,7 +754,7 @@ void CompositeT<MeshType,RealType>::VdEg(scalar_t _gamma)
else
i = 1;
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
if (!mesh_.is_boundary(heh)) {
cog += mesh_.point(mesh_.to_vertex_handle(mesh_.next_halfedge_handle(heh))) * (_gamma);
@@ -764,7 +764,7 @@ void CompositeT<MeshType,RealType>::VdEg(scalar_t _gamma)
}
heh = mesh_.halfedge_handle(e_it.handle(), 1-i);
heh = mesh_.halfedge_handle(*e_it(), 1-i);
if (!mesh_.is_boundary(heh))
{
@@ -800,7 +800,7 @@ void CompositeT<MeshType,RealType>::VdEg(Coeff& _coeff)
for (i = 0; i <= 1; ++i) {
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
valence[i] = 0;
// look for lowest valence vertex
@@ -817,7 +817,7 @@ void CompositeT<MeshType,RealType>::VdEg(Coeff& _coeff)
gamma = _coeff(valence[i]);
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
if (!mesh_.is_boundary(heh))
{
@@ -830,7 +830,7 @@ void CompositeT<MeshType,RealType>::VdEg(Coeff& _coeff)
}
heh = mesh_.halfedge_handle(e_it.handle(), 1-i);
heh = mesh_.halfedge_handle(*e_it(), 1-i);
if (!mesh_.is_boundary(heh)) {
cog += mesh_.point(mesh_.to_vertex_handle(mesh_.next_halfedge_handle(heh))) * (gamma);
@@ -860,7 +860,7 @@ void CompositeT<MeshType,RealType>::EV()
valence = 0;
cog = zero_point;
for (ve_it = mesh_.ve_iter(v_it.handle()); ve_it; ++ve_it) {
for (ve_it = mesh_.ve_iter(*v_it()); ve_it; ++ve_it) {
cog += mesh_.data(ve_it).position();
++valence;
}
@@ -889,14 +889,14 @@ void CompositeT<MeshType,RealType>::EVc(Coeff& _coeff)
valence = 0;
cog = zero_point;
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it)
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it)
{
++valence;
}
c = _coeff(valence);
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
cog += mesh_.data(mesh_.edge_handle(*voh_it)).position() * c;
cog += mesh_.data(mesh_.edge_handle(mesh_.next_halfedge_handle(*voh_it))).position() * (1.0 - c);
}
@@ -922,11 +922,11 @@ void CompositeT<MeshType,RealType>::EVc(scalar_t _c)
valence = 0;
cog = zero_point;
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
++valence;
}
for (voh_it = mesh_.voh_iter(v_it.handle()); voh_it; ++voh_it) {
for (voh_it = mesh_.voh_iter(*v_it()); voh_it; ++voh_it) {
cog += mesh_.data(mesh_.edge_handle(*voh_it)).position() * _c;
cog += mesh_.data(mesh_.edge_handle(mesh_.next_halfedge_handle(*voh_it))).position() * (1.0 - _c);
}
@@ -953,7 +953,7 @@ void CompositeT<MeshType,RealType>::EF()
valence = 0;
cog = zero_point;
for (fe_it = mesh_.fe_iter(f_it.handle()); fe_it; ++fe_it) {
for (fe_it = mesh_.fe_iter(*f_it()); fe_it; ++fe_it) {
++valence;
cog += mesh_.data(fe_it).position();
}
@@ -978,13 +978,13 @@ void CompositeT<MeshType,RealType>::FE()
valence = 0;
cog = zero_point;
if (mesh_.face_handle(mesh_.halfedge_handle(e_it.handle(), 0)).is_valid()) {
cog += mesh_.data(mesh_.face_handle(mesh_.halfedge_handle(e_it.handle(), 0))).position();
if (mesh_.face_handle(mesh_.halfedge_handle(*e_it(), 0)).is_valid()) {
cog += mesh_.data(mesh_.face_handle(mesh_.halfedge_handle(*e_it(), 0))).position();
++valence;
}
if (mesh_.face_handle(mesh_.halfedge_handle(e_it.handle(), 1)).is_valid()) {
cog += mesh_.data(mesh_.face_handle(mesh_.halfedge_handle(e_it.handle(), 1))).position();
if (mesh_.face_handle(mesh_.halfedge_handle(*e_it(), 1)).is_valid()) {
cog += mesh_.data(mesh_.face_handle(mesh_.halfedge_handle(*e_it(), 1))).position();
++valence;
}
@@ -1004,8 +1004,8 @@ void CompositeT<MeshType,RealType>::VE()
for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it)
{
cog = mesh_.data(mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it.handle(), 0))).position();
cog += mesh_.data(mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it.handle(), 1))).position();
cog = mesh_.data(mesh_.to_vertex_handle(mesh_.halfedge_handle(*e_it(), 0))).position();
cog += mesh_.data(mesh_.to_vertex_handle(mesh_.halfedge_handle(*e_it(), 1))).position();
cog /= 2.0;
mesh_.data(e_it).set_position(cog);
}
@@ -1031,7 +1031,7 @@ void CompositeT<MeshType,RealType>::VV()
valence = 0;
cog = zero_point;
for (vv_it = mesh_.vv_iter(v_it.handle()); vv_it; ++vv_it) {
for (vv_it = mesh_.vv_iter(*v_it()); vv_it; ++vv_it) {
cog += vv_it->position();
++valence;
}
@@ -1066,7 +1066,7 @@ void CompositeT<MeshType,RealType>::VVc(Coeff& _coeff)
valence = 0;
cog = zero_point;
for (vv_it = mesh_.vv_iter(v_it.handle()); vv_it; ++vv_it)
for (vv_it = mesh_.vv_iter(*v_it()); vv_it; ++vv_it)
{
cog += vv_it->position();
++valence;
@@ -1102,7 +1102,7 @@ void CompositeT<MeshType,RealType>::VVc(scalar_t _c)
valence = 0;
cog = zero_point;
for (vv_it = mesh_.vv_iter(v_it.handle()); vv_it; ++vv_it) {
for (vv_it = mesh_.vv_iter(*v_it()); vv_it; ++vv_it) {
cog += mesh_.data(vv_it).position();
++valence;
}
@@ -1143,7 +1143,7 @@ void CompositeT<MeshType,RealType>::EdE()
cog = zero_point;
for (int i = 0; i <= 1; ++i) {
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
if (mesh_.face_handle(heh).is_valid())
{
cog += mesh_.data(mesh_.edge_handle(mesh_.next_halfedge_handle(heh))).position();
@@ -1186,7 +1186,7 @@ void CompositeT<MeshType,RealType>::EdEc(scalar_t _c)
cog = zero_point;
for (int i = 0; i <= 1; ++i) {
heh = mesh_.halfedge_handle(e_it.handle(), i);
heh = mesh_.halfedge_handle(*e_it(), i);
if (mesh_.face_handle(heh).is_valid())
{
cog += mesh_.data(mesh_.edge_handle(mesh_.next_halfedge_handle(heh))).position() * (1.0 - _c);