Permalink
Browse files

fix remaining decorator functions

  • Loading branch information...
sloriot committed Jan 18, 2013
1 parent 7b598dd commit ed9e3dc99608558e098e0bc41faca042ff2da588
@@ -24,6 +24,11 @@ if ( CGAL_FOUND )
include_directories(BEFORE patches_for_CGAL_4.0/include)
endif()
if ("${CGAL_MAJOR_VERSION}" STREQUAL "4" AND "${CGAL_MINOR_VERSION}" STRLESS "2")
MESSAGE(STATUS "Using patches from CGAL-4.2")
include_directories(BEFORE patches_in_CGAL_4.2/include)
endif()
if (${CMAKE_BUILD_TYPE} STREQUAL Release)
if(CMAKE_COMPILER_IS_GNUCXX)
message (STATUS "Release mode with g++: using -fno-strict-aliasing flags")
@@ -27,7 +27,6 @@ class HalfedgeDS_decorator_wrapper
const cpp_base& get_data() const {return data;}
cpp_base& get_data() {return data;}
//~ HalfedgeDS_wrapper(const cpp_base& base):data(base){}
#endif
// Creation
HalfedgeDS_decorator_wrapper(HDS_wrapper& hds)
@@ -55,21 +54,21 @@ class HalfedgeDS_decorator_wrapper
SWIG_CGAL_FORWARD_CALL_0(void, vertices_pop_front)
SWIG_CGAL_FORWARD_CALL_0(void, vertices_pop_back)
SWIG_CGAL_FORWARD_CALL_1(void, vertices_erase, Vertex_wrapper)
//~ SWIG_CGAL_FORWARD_CALL_2(void, vertices_erase, Vertex_wrapper, Vertex_wrapper)
SWIG_CGAL_FORWARD_CALL_2(void, vertices_erase, Vertex_wrapper, Vertex_wrapper)
SWIG_CGAL_FORWARD_CALL_0(void, faces_pop_front)
SWIG_CGAL_FORWARD_CALL_0(void, faces_pop_back)
SWIG_CGAL_FORWARD_CALL_1(void, faces_erase, Face_wrapper)
//~ SWIG_CGAL_FORWARD_CALL_2(void, faces_erase, Face_wrapper , Face_wrapper)
SWIG_CGAL_FORWARD_CALL_2(void, faces_erase, Face_wrapper , Face_wrapper)
SWIG_CGAL_FORWARD_CALL_1(void, erase_face, Hedge_wrapper)
SWIG_CGAL_FORWARD_CALL_1(void, erase_connected_component, Hedge_wrapper)
//~ SWIG_CGAL_FORWARD_CALL_1(int, keep_largest_connected_components, int)
SWIG_CGAL_FORWARD_CALL_1(int, keep_largest_connected_components, int)
// Modifying Functions (For Border Halfedges)
SWIG_CGAL_FORWARD_CALL_1(void, make_hole, Hedge_wrapper)
SWIG_CGAL_FORWARD_CALL_1(Hedge_wrapper, fill_hole, Hedge_wrapper)
// Halfedge_handle fill_hole( Halfedge_handle h, const Face& f)
// Halfedge_handle fill_hole( Halfedge_handle h, const Face& f) not enabled as Face is not exposed
SWIG_CGAL_FORWARD_CALL_2(Hedge_wrapper, add_face_to_border, Hedge_wrapper, Hedge_wrapper)
// Halfedge_handle add_face_to_border( Halfedge_handle h, Halfedge_handle g, const Face& f)
// Halfedge_handle add_face_to_border( Halfedge_handle h, Halfedge_handle g, const Face& f) not enabled as Face is not exposed
// Modifying Functions (Euler Operators)
SWIG_CGAL_FORWARD_CALL_AND_REF_2(Hedge_wrapper, split_face, Hedge_wrapper, Hedge_wrapper)
@@ -878,6 +878,11 @@ class HalfedgeDS_decorator : public HalfedgeDS_items_decorator<p_HDS> {
hds->vertices_erase( v);
}
void vertices_erase( Vertex_handle , Vertex_handle , Tag_false) {}
void vertices_erase( Vertex_handle v1, Vertex_handle v2, Tag_true) {
hds->vertices_erase( v1, v2);
}
void vertices_pop_front( Tag_false) {}
void vertices_pop_front( Tag_true) {
hds->vertices_pop_front();
@@ -893,6 +898,11 @@ class HalfedgeDS_decorator : public HalfedgeDS_items_decorator<p_HDS> {
hds->faces_erase( f);
}
void faces_erase( Face_handle , Face_handle , Tag_false) {}
void faces_erase( Face_handle f1, Face_handle f2, Tag_true) {
hds->faces_erase( f1, f2);
}
void faces_pop_front( Tag_false) {}
void faces_pop_front( Tag_true) {
hds->faces_pop_front();
@@ -962,9 +972,8 @@ class HalfedgeDS_decorator : public HalfedgeDS_items_decorator<p_HDS> {
number_of_vertices++;
// Add vertex's "free" neighbors to the list
Halfedge_around_vertex_circulator neighbor_cir, neighbor_end;
neighbor_cir = pVertex->vertex_begin();
neighbor_end = neighbor_cir;
Halfedge_around_vertex_circulator neighbor_cir(pVertex->halfedge()),
neighbor_end = neighbor_cir;
CGAL_For_all(neighbor_cir,neighbor_end)
{
Vertex_handle neighbor = neighbor_cir->opposite()->vertex();

0 comments on commit ed9e3dc

Please sign in to comment.