Commit 04183f21 authored by Jan Möbius's avatar Jan Möbius
Browse files

Adapt to OM 3.0

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17207 383ad7c9-94d9-4d36-a494-682f7c89f535
parent abb2f2ed
...@@ -126,7 +126,7 @@ void LaplaceLengthPlugin::computeLaplaceLength(MeshT* _mesh) { ...@@ -126,7 +126,7 @@ void LaplaceLengthPlugin::computeLaplaceLength(MeshT* _mesh) {
std::vector< typename MeshT::VertexHandle > handles; std::vector< typename MeshT::VertexHandle > handles;
handles.reserve(_mesh->n_vertices()); handles.reserve(_mesh->n_vertices());
for ( typename MeshT::VertexIter v_it = _mesh->vertices_begin() ; v_it != _mesh->vertices_end(); ++v_it) for ( typename MeshT::VertexIter v_it = _mesh->vertices_begin() ; v_it != _mesh->vertices_end(); ++v_it)
handles.push_back( v_it.handle() ); handles.push_back( *v_it );
#ifdef USE_OPENMP #ifdef USE_OPENMP
#pragma omp parallel for #pragma omp parallel for
...@@ -135,8 +135,8 @@ void LaplaceLengthPlugin::computeLaplaceLength(MeshT* _mesh) { ...@@ -135,8 +135,8 @@ void LaplaceLengthPlugin::computeLaplaceLength(MeshT* _mesh) {
const typename MeshT::VertexHandle handle = handles[i]; const typename MeshT::VertexHandle handle = handles[i];
ACG::Vec3d laplace(0.0,0.0,0.0); ACG::Vec3d laplace(0.0,0.0,0.0);
for ( typename MeshT::VertexVertexIter vv_it(*_mesh , handle) ; vv_it ; ++vv_it ) for ( typename MeshT::VertexVertexIter vv_it(*_mesh , handle) ; vv_it.is_valid() ; ++vv_it )
laplace += _mesh->point(vv_it) - _mesh->point(handle); laplace += _mesh->point(*vv_it) - _mesh->point(handle);
laplace = 1.0 /(double)_mesh->valence(handle) * laplace; laplace = 1.0 /(double)_mesh->valence(handle) * laplace;
_mesh->property(laplace_vector_property,handle) = laplace; _mesh->property(laplace_vector_property,handle) = laplace;
...@@ -171,7 +171,7 @@ void LaplaceLengthPlugin::computeLaplaceSquaredLength(MeshT* _mesh) { ...@@ -171,7 +171,7 @@ void LaplaceLengthPlugin::computeLaplaceSquaredLength(MeshT* _mesh) {
std::vector< typename MeshT::VertexHandle > handles; std::vector< typename MeshT::VertexHandle > handles;
handles.reserve(_mesh->n_vertices()); handles.reserve(_mesh->n_vertices());
for ( typename MeshT::VertexIter v_it = _mesh->vertices_begin() ; v_it != _mesh->vertices_end(); ++v_it) for ( typename MeshT::VertexIter v_it = _mesh->vertices_begin() ; v_it != _mesh->vertices_end(); ++v_it)
handles.push_back( v_it.handle() ); handles.push_back( *v_it );
#ifdef USE_OPENMP #ifdef USE_OPENMP
#pragma omp parallel for #pragma omp parallel for
...@@ -180,8 +180,8 @@ void LaplaceLengthPlugin::computeLaplaceSquaredLength(MeshT* _mesh) { ...@@ -180,8 +180,8 @@ void LaplaceLengthPlugin::computeLaplaceSquaredLength(MeshT* _mesh) {
const typename MeshT::VertexHandle handle = handles[i]; const typename MeshT::VertexHandle handle = handles[i];
ACG::Vec3d laplace(0.0,0.0,0.0); ACG::Vec3d laplace(0.0,0.0,0.0);
for ( typename MeshT::VertexVertexIter vv_it(*_mesh , handle) ; vv_it ; ++vv_it ) for ( typename MeshT::VertexVertexIter vv_it(*_mesh , handle) ; vv_it.is_valid() ; ++vv_it )
laplace += _mesh->property(laplace_property,vv_it) - _mesh->property(laplace_property,handle); laplace += _mesh->property(laplace_property,*vv_it) - _mesh->property(laplace_property,handle);
laplace = 1.0 /(double)_mesh->valence(handle) * laplace; laplace = 1.0 /(double)_mesh->valence(handle) * laplace;
_mesh->property(laplace_squared,handle) = laplace.norm(); _mesh->property(laplace_squared,handle) = laplace.norm();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment