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

Finished except unittests

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@910 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 12:24:09 +00:00
parent e30da7ea10
commit 959d80bb07
16 changed files with 117 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc
View File

@@ -83,25 +83,25 @@ initialize( void )
// ---------------------------------------- Init Vertices
for (v_it = mesh_.vertices_begin(); v_it != mesh_.vertices_end(); ++v_it)
{
mesh_.data(v_it).set_state(0);
mesh_.data(v_it).set_final();
mesh_.data(v_it).set_position(0, mesh_.point(*v_it));
mesh_.data(*v_it).set_state(0);
mesh_.data(*v_it).set_final();
mesh_.data(*v_it).set_position(0, mesh_.point(*v_it));
}
// ---------------------------------------- Init Faces
for (f_it = mesh_.faces_begin(); f_it != mesh_.faces_end(); ++f_it)
{
mesh_.data(f_it).set_state(0);
mesh_.data(f_it).set_final();
mesh_.data(f_it).set_position(0, zero_point);
mesh_.data(*f_it).set_state(0);
mesh_.data(*f_it).set_final();
mesh_.data(*f_it).set_position(0, zero_point);
}
// ---------------------------------------- Init Edges
for (e_it = mesh_.edges_begin(); e_it != mesh_.edges_end(); ++e_it)
{
mesh_.data(e_it).set_state(0);
mesh_.data(e_it).set_final();
mesh_.data(e_it).set_position(0, zero_point);
mesh_.data(*e_it).set_state(0);
mesh_.data(*e_it).set_final();
mesh_.data(*e_it).set_position(0, zero_point);
}

20
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View File

@@ -845,7 +845,7 @@ void VF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
for (fv_it = Base::mesh_.fv_iter(_fh); fv_it.is_valid(); ++fv_it) {
++valence;
position += Base::mesh_.data(fv_it).position(_target_state - 1);
position += Base::mesh_.data(*fv_it).position(_target_state - 1);
}
position /= valence;
@@ -917,7 +917,7 @@ void FF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state) {
++valence;
position += Base::mesh_.data(ff_it).position(_target_state - 1);
position += Base::mesh_.data(*ff_it).position(_target_state - 1);
}
position /= valence;
@@ -975,7 +975,7 @@ void FFc<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
for (ff_it = Base::mesh_.ff_iter(_fh); ff_it.is_valid(); ++ff_it)
{
++valence;
position += Base::mesh_.data(ff_it).position(_target_state - 1);
position += Base::mesh_.data(*ff_it).position(_target_state - 1);
}
position /= valence;
@@ -1045,7 +1045,7 @@ void FV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
for (vf_it = Base::mesh_.vf_iter(_vh); vf_it.is_valid(); ++vf_it) {
++valence;
position += Base::mesh_.data(vf_it).position(_target_state - 1);
position += Base::mesh_.data(*vf_it).position(_target_state - 1);
}
position /= valence;
@@ -1289,7 +1289,7 @@ void VV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
++valence;
position += Base::mesh_.data(vv_it).position(_target_state - 1);
position += Base::mesh_.data(*vv_it).position(_target_state - 1);
}
position /= valence;
@@ -1359,7 +1359,7 @@ void VVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
for (vv_it = Base::mesh_.vv_iter(_vh); vv_it.is_valid(); ++vv_it)
{
++valence;
position += Base::mesh_.data(vv_it).position(_target_state - 1);
position += Base::mesh_.data(*vv_it).position(_target_state - 1);
}
position /= valence;
@@ -1627,11 +1627,11 @@ void EV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
for (ve_it = Base::mesh_.ve_iter(_vh); ve_it.is_valid(); ++ve_it) {
if (Base::mesh_.data(ve_it).final()) {
if (Base::mesh_.data(*ve_it).final()) {
++valence;
position += Base::mesh_.data(ve_it).position(_target_state - 1);
position += Base::mesh_.data(*ve_it).position(_target_state - 1);
}
}
@@ -1825,11 +1825,11 @@ EF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state) {
for (fe_it = Base::mesh_.fe_iter(_fh); fe_it.is_valid(); ++fe_it) {
if (Base::mesh_.data(fe_it).final()) {
if (Base::mesh_.data(*fe_it).final()) {
++valence;
position += Base::mesh_.data(fe_it).position(_target_state - 1);
position += Base::mesh_.data(*fe_it).position(_target_state - 1);
}
}