Commit 45387a95 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix_opposite_face_handle' into 'master'

Fix opposite face handle

See merge request !252
parents 481175b7 b50d9668
Pipeline #13798 failed with stages
in 148 minutes and 46 seconds
......@@ -99,13 +99,6 @@ bool PolyConnectivity::is_manifold(VertexHandle _vh) const
//-----------------------------------------------------------------------------
SmartFaceHandle PolyConnectivity::opposite_face_handle(HalfedgeHandle _heh) const
{
return face_handle(make_smart(opposite_halfedge_handle(_heh), this));
}
//-----------------------------------------------------------------------------
void PolyConnectivity::adjust_outgoing_halfedge(VertexHandle _vh)
{
for (ConstVertexOHalfedgeIter vh_it=cvoh_iter(_vh); vh_it.is_valid(); ++vh_it)
......
......@@ -611,6 +611,9 @@ public:
inline SmartEdgeHandle edge_handle(SmartHalfedgeHandle _heh) const;
inline SmartFaceHandle face_handle(SmartHalfedgeHandle _heh) const;
/// returns the face handle of the opposite halfedge
inline SmartFaceHandle opposite_face_handle(HalfedgeHandle _heh) const;
//@}
/** \name Begin and end iterators
......@@ -1354,11 +1357,6 @@ public:
bool is_manifold(VertexHandle _vh) const;
/** @} */
// --- shortcuts ---
/// returns the face handle of the opposite halfedge
inline SmartFaceHandle opposite_face_handle(HalfedgeHandle _heh) const;
// --- misc ---
......
......@@ -58,8 +58,8 @@ inline SmartHalfedgeHandle PolyConnectivity::opposite_halfedge_handle(SmartHalfe
inline SmartHalfedgeHandle PolyConnectivity::ccw_rotated_halfedge_handle(SmartHalfedgeHandle _heh) const { return make_smart(ccw_rotated_halfedge_handle(HalfedgeHandle(_heh)), *this); }
inline SmartHalfedgeHandle PolyConnectivity::cw_rotated_halfedge_handle(SmartHalfedgeHandle _heh) const { return make_smart(cw_rotated_halfedge_handle(HalfedgeHandle(_heh)), *this); }
inline SmartHalfedgeHandle PolyConnectivity::s_halfedge_handle(SmartEdgeHandle _eh, unsigned int _i) { return make_smart(ArrayKernel::s_halfedge_handle(EdgeHandle(_eh), _i), _eh.mesh()); }
inline SmartEdgeHandle PolyConnectivity::s_edge_handle(SmartHalfedgeHandle _heh) { return make_smart(ArrayKernel::s_edge_handle(HalfedgeHandle(_heh)), _heh.mesh()); }
inline SmartHalfedgeHandle PolyConnectivity::s_halfedge_handle(SmartEdgeHandle _eh, unsigned int _i) { return make_smart(ArrayKernel::s_halfedge_handle(EdgeHandle(_eh), _i), _eh.mesh()); }
inline SmartEdgeHandle PolyConnectivity::s_edge_handle(SmartHalfedgeHandle _heh) { return make_smart(ArrayKernel::s_edge_handle(HalfedgeHandle(_heh)), _heh.mesh()); }
inline SmartHalfedgeHandle PolyConnectivity::halfedge_handle(SmartEdgeHandle _eh, unsigned int _i) const { return make_smart(halfedge_handle(EdgeHandle(_eh), _i), *this); }
inline SmartEdgeHandle PolyConnectivity::edge_handle(SmartHalfedgeHandle _heh) const { return make_smart(edge_handle(HalfedgeHandle(_heh)), *this); }
......@@ -68,6 +68,7 @@ inline SmartHalfedgeHandle PolyConnectivity::halfedge_handle(SmartVertexHandle _
inline SmartFaceHandle PolyConnectivity::face_handle(SmartHalfedgeHandle _heh) const { return make_smart(face_handle(HalfedgeHandle(_heh)), *this); }
inline SmartFaceHandle PolyConnectivity::opposite_face_handle(HalfedgeHandle _heh) const { return make_smart(face_handle(opposite_halfedge_handle(_heh)), *this); }
/// Generic class for vertex/halfedge/edge/face ranges.
......
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