Commit 61968240 authored by Jan Möbius's avatar Jan Möbius

OM3

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@20155 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9075b250
......@@ -131,7 +131,7 @@ void discrete_mean_curv_op( const MeshT& _m,
const typename MeshT::Point p0 = _m.point( _vh );
const typename MeshT::Point p1 = _m.point( _m.to_vertex_handle( *voh_it));
// const typename MeshT::Point p2 = _m.point( _m.to_vertex_handle( _m.next_halfedge_handle( voh_it.handle())));
// const typename MeshT::Point p2 = _m.point( _m.to_vertex_handle( _m.next_halfedge_handle( *voh_it)));
const typename MeshT::Point p2 = _m.point( _m.from_vertex_handle( _m.prev_halfedge_handle( *voh_it)));
const typename MeshT::Point p3 = _m.point( _m.to_vertex_handle( _m.next_halfedge_handle( _m.opposite_halfedge_handle(*voh_it))));
......
......@@ -157,7 +157,7 @@ bool neighbour(const MeshT& _mesh ,
const typename MeshT::FaceHandle _fh2 )
{
for ( typename MeshT::FaceFaceIter ff_it(_mesh,_fh1) ; ff_it ; ++ff_it)
if (ff_it.handle() == _fh2)
if (*ff_it == _fh2)
return true;
return false;
}
......@@ -241,13 +241,13 @@ void transformMesh(ACG::Matrix4x4d _matrix , MeshT& _mesh) {
for (; v_it != v_end; ++v_it) {
// Transform the mesh vertex
_mesh.set_point(v_it, _matrix.transform_point(_mesh.point(v_it)));
_mesh.set_point(*v_it, _matrix.transform_point(_mesh.point(*v_it)));
// Transform the vertex normal
if(_mesh.has_vertex_normals()) {
typename MeshT::Normal n = invTranspMat.transform_vector(_mesh.normal(v_it));
typename MeshT::Normal n = invTranspMat.transform_vector(_mesh.normal(*v_it));
n.normalize();
_mesh.set_normal(v_it, n);
_mesh.set_normal(*v_it, n);
}
}
......@@ -257,9 +257,9 @@ void transformMesh(ACG::Matrix4x4d _matrix , MeshT& _mesh) {
// Transform the face normal
if(_mesh.has_face_normals()) {
typename MeshT::Normal n = invTranspMat.transform_vector(_mesh.normal(f_it));
typename MeshT::Normal n = invTranspMat.transform_vector(_mesh.normal(*f_it));
n.normalize();
_mesh.set_normal(f_it, n);
_mesh.set_normal(*f_it, n);
}
}
}
......
......@@ -73,7 +73,7 @@ opposite_halfedge(MeshT& _mesh , typename MeshT::HalfedgeHandle _he) {
++opp_he;
++opp_he;
++opp_he;
return (opp_he.handle());
return (*opp_he);
}
template < typename MeshT >
......
......@@ -590,7 +590,7 @@ void growEdgeSelection(MeshT* _mesh) {
for (typename MeshT::VertexEdgeIter ve_it = _mesh->ve_begin(vhs[i]), ve_end = _mesh->ve_end(vhs[i]);
ve_it != ve_end; ++ve_it) {
selectedEhs.insert(ve_it.handle());
selectedEhs.insert(*ve_it);
}
}
......
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