songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc cleaning

This commit is contained in:
Mael Rouxel-Labbé 2017-01-17 17:01:15 +01:00
parent b428d743f8
commit cd75d44204
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Subdivision_method_3/include/CGAL/Subdivision_mask_3.h
View File

@ -1,6 +1,6 @@
// ====================================================================== // ======================================================================
// //
// Copyright (c) 2005-20176 GeometryFactory (France). All Rights Reserved. // Copyright (c) 2005-2017 GeometryFactory (France). All Rights Reserved.
// //
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as // modify it under the terms of the GNU Lesser General Public License as
@ -21,8 +21,8 @@
// //
// ====================================================================== // ======================================================================
#ifndef CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H_01292002 #ifndef CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H
#define CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H_01292002 #define CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/Origin.h> #include <CGAL/Origin.h>
@ -382,7 +382,7 @@ public:
}; };
// ====================================================================== // ======================================================================
// The geometry mask of Sqrt(3) subdivision /// The geometry mask of Sqrt(3) subdivision
template <class Poly, class VertexPointMap = typename boost::property_map<Poly, vertex_point_t>::type > template <class Poly, class VertexPointMap = typename boost::property_map<Poly, vertex_point_t>::type >
class Sqrt3_mask_3 : public Linear_mask_3<Poly,VertexPointMap> { class Sqrt3_mask_3 : public Linear_mask_3<Poly,VertexPointMap> {
typedef Linear_mask_3<Poly,VertexPointMap> Base; typedef Linear_mask_3<Poly,VertexPointMap> Base;
@ -459,4 +459,4 @@ public:
} //namespace CGAL } //namespace CGAL
#endif //CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H_01292002 #endif //CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H

6
Subdivision_method_3/include/CGAL/Subdivision_method_3.h
View File

@ -21,8 +21,8 @@
// //
// ====================================================================== // ======================================================================
#ifndef CGAL_POLYHEDRON_SUBDIVISION_H_01292002 #ifndef CGAL_POLYHEDRON_SUBDIVISION_H
#define CGAL_POLYHEDRON_SUBDIVISION_H_01292002 #define CGAL_POLYHEDRON_SUBDIVISION_H
#include <CGAL/basic.h> #include <CGAL/basic.h>
@ -219,4 +219,4 @@ namespace Subdivision_method_3 {
} //namespace CGAL } //namespace CGAL
#endif //CGAL_POLYHEDRON_SUBDIVISION_H_01292002 #endif //CGAL_POLYHEDRON_SUBDIVISION_H

37
Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h
View File

@ -49,15 +49,15 @@ namespace Private {
template <class Poly, class VertexPointMap, class Mask> template <class Poly, class VertexPointMap, class Mask>
void PQQ_1step(Poly& p, VertexPointMap vpm, Mask mask) { void PQQ_1step(Poly& p, VertexPointMap vpm, Mask mask) {
typedef Polyhedron_decorator_3<Poly> PD; typedef Polyhedron_decorator_3<Poly> PD;
typedef typename boost::graph_traits<Poly>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<Poly>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<Poly>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<Poly>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<Poly>::edge_descriptor edge_descriptor; typedef typename boost::graph_traits<Poly>::edge_descriptor edge_descriptor;
typedef typename boost::graph_traits<Poly>::vertex_iterator vertex_iterator; typedef typename boost::graph_traits<Poly>::vertex_iterator vertex_iterator;
typedef typename boost::graph_traits<Poly>::edge_iterator edge_iterator; typedef typename boost::graph_traits<Poly>::edge_iterator edge_iterator;
typedef typename boost::graph_traits<Poly>::face_iterator face_iterator; typedef typename boost::graph_traits<Poly>::face_iterator face_iterator;
typedef Halfedge_around_face_circulator<Poly> Halfedge_around_facet_circulator; typedef Halfedge_around_face_circulator<Poly> Halfedge_around_facet_circulator;
@ -165,6 +165,7 @@ namespace Private {
for (size_t i = 0; i < num_vertex; i++, ++vitr) for (size_t i = 0; i < num_vertex; i++, ++vitr)
put(vpm, *vitr, vertex_point_buffer[i]); put(vpm, *vitr, vertex_point_buffer[i]);
CGAL_postcondition(p.is_valid());
delete []vertex_point_buffer; delete []vertex_point_buffer;
} }
@ -174,13 +175,13 @@ namespace Private {
typedef Polyhedron_decorator_3<Poly> PD; typedef Polyhedron_decorator_3<Poly> PD;
typedef typename boost::graph_traits<Poly>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<Poly>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<Poly>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<Poly>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<Poly>::edge_descriptor edge_descriptor; typedef typename boost::graph_traits<Poly>::edge_descriptor edge_descriptor;
typedef typename boost::graph_traits<Poly>::vertex_iterator vertex_iterator; typedef typename boost::graph_traits<Poly>::vertex_iterator vertex_iterator;
typedef typename boost::graph_traits<Poly>::edge_iterator edge_iterator; typedef typename boost::graph_traits<Poly>::edge_iterator edge_iterator;
typedef typename boost::graph_traits<Poly>::face_iterator face_iterator; typedef typename boost::graph_traits<Poly>::face_iterator face_iterator;
typedef Halfedge_around_face_circulator<Poly> Halfedge_around_face_circulator; typedef Halfedge_around_face_circulator<Poly> Halfedge_around_face_circulator;
@ -301,7 +302,7 @@ namespace Private {
} }
Point* point_buffer = new Point[num_e*2]; Point* point_buffer = new Point[num_e*2];
// build the point_buffer // Build the point_buffer
vertex_iterator vitr, vitr_end; vertex_iterator vitr, vitr_end;
boost::tie(vitr,vitr_end) = vertices(p); boost::tie(vitr,vitr_end) = vertices(p);
int pi = 0; int pi = 0;
@ -313,8 +314,7 @@ namespace Private {
} }
} }
// If Polyhedron is using vector, we need to reserve the memory to prevent // Reserve to avoid rellocations during insertions
// the CGAL_assertion. This function for polyhedron using list is VOID.
p.reserve(num_v+num_e+num_f, 2*num_e, (2+4+2)*num_e); p.reserve(num_v+num_e+num_f, 2*num_e, (2+4+2)*num_e);
// Build the connectivity using insert_vertex() and insert_edge() // Build the connectivity using insert_vertex() and insert_edge()
@ -343,9 +343,10 @@ namespace Private {
halfedge_descriptor e2 = opposite(*vcir,p); halfedge_descriptor e2 = opposite(*vcir,p);
PD::insert_edge(p, e1, e2); PD::insert_edge(p, e1, e2);
} }
} else ++vcir; } else {
++vcir;
}
} }
//p.erase_center_vertex(vh->vertex_begin());
} }
edge_iterator eitr = edges(p).first; edge_iterator eitr = edges(p).first;
@ -365,21 +366,17 @@ namespace Private {
PD::insert_edge(p, prev(prev(eh,p),p), eh); PD::insert_edge(p, prev(prev(eh,p),p), eh);
} }
} }
// after this point, the original border edges are in front!
//eitr = edges(p).first; // After this point, the original border edges are in front!
//for (size_t i = 0; i < num_be; ++i) {
//halfedge_descriptor eh = halfedge(*eitr,p);
//++eitr;
BOOST_FOREACH(halfedge_descriptor eeh, border_halfedges){ BOOST_FOREACH(halfedge_descriptor eeh, border_halfedges){
halfedge_descriptor eh = eeh; halfedge_descriptor eh = eeh;
if (is_border(eh,p)){ if (is_border(eh,p)){
eh = opposite(eh,p); eh = opposite(eh,p);
} }
assert(is_border(eh,p));
halfedge_descriptor ehe = eh; halfedge_descriptor ehe = eh;
eh = opposite(prev(eh,p),p); eh = opposite(prev(eh,p),p);
while (! is_border(eh,p)) { while (! is_border(eh,p)) {
std::cerr << "before remove_face"<< std::endl;
Euler::remove_face(ehe,p); Euler::remove_face(ehe,p);
ehe = eh; ehe = eh;
eh = opposite(prev(eh,p),p); eh = opposite(prev(eh,p),p);
@ -569,7 +566,7 @@ namespace Private {
// reserve enough size for the new points // reserve enough size for the new points
typename boost::graph_traits<Poly>::faces_size_type new_pts_size = num_f; typename boost::graph_traits<Poly>::faces_size_type new_pts_size = num_f;
if(refine_border) { if(refine_border) {
BOOST_FOREACH(edge_descriptor ed, CGAL::edges(p)){ BOOST_FOREACH(edge_descriptor ed, edges(p)){
if(is_border(ed, p)) if(is_border(ed, p))
++new_pts_size; ++new_pts_size;
} }