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

Merge branch 'fix_opposite_face_handle' into 'master'

Browse Source 
Fix opposite face handle

See merge request OpenMesh/OpenMesh!252
This commit is contained in:
Jan Möbius
2020-03-17 20:52:44 +01:00
parent 481175b712 b50d9668b7
commit 45387a95bd
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenMesh/Core/Mesh/PolyConnectivity.cc
View File

@@ -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)

8
src/OpenMesh/Core/Mesh/PolyConnectivity.hh
View File

@@ -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 ---

5
src/OpenMesh/Core/Mesh/PolyConnectivity_inline_impl.hh
View File

@@ -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.