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

remove edge map and inter pt set

This commit is contained in:
Sébastien Loriot 2021-02-09 18:43:05 +01:00
parent 81ba9da292
commit a595e529c5
1 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
View File

@ -33,6 +33,7 @@
#include <boost/property_map/property_map.hpp> #include <boost/property_map/property_map.hpp>
#include <unordered_map> #include <unordered_map>
#include <bitset>
namespace CGAL{ namespace CGAL{
namespace Polygon_mesh_processing { namespace Polygon_mesh_processing {
@ -40,24 +41,6 @@ namespace Polygon_mesh_processing {
namespace internal namespace internal
{ {
template <class Geom_traits, class Plane_3, class Point_3>
int
inter_pt_index(int i, int j,
const Plane_3& plane,
std::vector<Point_3>& points,
std::map<std::pair<int,int>, int>& id_map)
{
std::pair<std::map<std::pair<int,int>, int>::iterator, bool> res =
id_map.insert(std::make_pair(make_sorted_pair(i,j),
static_cast<int> (points.size())));
if(res.second)
points.push_back(
typename Geom_traits::Construct_plane_line_intersection_point_3()
(plane, points[i], points[j]));
return res.first->second;
}
template <class Plane_3, template <class Plane_3,
class TriangleMesh, class TriangleMesh,
class NamedParameters> class NamedParameters>
@ -98,19 +81,42 @@ clip_to_bbox(const Plane_3& plane,
}}; }};
// description of faces of the bbox // description of faces of the bbox
std::array<int, 24> face_indices = constexpr std::array<int, 24> face_indices
{{ 0, 1, 2, 3, { { 0, 1, 2, 3,
2, 1, 5, 6, 2, 1, 5, 6,
3, 2, 6, 7, 3, 2, 6, 7,
1, 0, 4, 5, 1, 0, 4, 5,
4, 0, 3, 7, 4, 0, 3, 7,
6, 5, 4, 7 }}; 6, 5, 4, 7 } };
constexpr std::array<int, 24> edge_indices
{ { 0, 1, 2, 3,
1, 4, 5, 6,
2, 6, 7, 8,
0, 9, 10, 4,
9, 3, 8, 11,
5, 10, 11, 7 } };
std::array<int, 12> edge_ipt_id;
edge_ipt_id.fill(-1);
auto inter_pt_index =
[&plane, &corners, &edge_ipt_id](int i, int j, int edge_id)
{
if (edge_ipt_id[edge_id]==-1)
{
edge_ipt_id[edge_id] = static_cast<int> (corners.size());
corners.push_back(typename Geom_traits::Construct_plane_line_intersection_point_3()
(plane, corners[i], corners[j]));
}
return edge_ipt_id[edge_id];
};
std::map<std::pair<int,int>, int> id_map;
std::vector< std::vector<int> > output_faces(6); std::vector< std::vector<int> > output_faces(6);
bool all_in = true; bool all_in = true;
bool all_out = true; bool all_out = true;
std::set<int> in_point_ids; // to collect the set of points in the clipped bbox std::bitset<14> in_point_bits; // to collect the set of points in the clipped bbox
// for each face of the bbox, we look for intersection of the plane with its edges // for each face of the bbox, we look for intersection of the plane with its edges
for(int i=0; i<6; ++i) for(int i=0; i<6; ++i)
@ -119,6 +125,7 @@ clip_to_bbox(const Plane_3& plane,
{ {
int current_id = face_indices[4*i + k]; int current_id = face_indices[4*i + k];
int next_id = face_indices[4*i + (k+1)%4]; int next_id = face_indices[4*i + (k+1)%4];
int edge_id = edge_indices[4 * i + k];
switch(orientations[ current_id ]) switch(orientations[ current_id ])
{ {
@ -127,13 +134,13 @@ clip_to_bbox(const Plane_3& plane,
all_out=false; all_out=false;
// point on or on the negative side // point on or on the negative side
output_faces[i].push_back(current_id); output_faces[i].push_back(current_id);
in_point_ids.insert(output_faces[i].back()); in_point_bits.set(output_faces[i].back());
// check for intersection of the edge // check for intersection of the edge
if(orientations[ next_id ] == ON_POSITIVE_SIDE) if(orientations[ next_id ] == ON_POSITIVE_SIDE)
{ {
output_faces[i].push_back( output_faces[i].push_back(
inter_pt_index<Geom_traits>(current_id, next_id, plane, corners, id_map)); inter_pt_index(current_id, next_id, edge_id));
in_point_ids.insert(output_faces[i].back()); in_point_bits.set(output_faces[i].back());
} }
break; break;
} }
@ -144,15 +151,15 @@ clip_to_bbox(const Plane_3& plane,
if(orientations[ next_id ] == ON_NEGATIVE_SIDE) if(orientations[ next_id ] == ON_NEGATIVE_SIDE)
{ {
output_faces[i].push_back( output_faces[i].push_back(
inter_pt_index<Geom_traits>(current_id, next_id, plane, corners, id_map)); inter_pt_index(current_id, next_id, edge_id));
in_point_ids.insert(output_faces[i].back()); in_point_bits.set(output_faces[i].back());
} }
break; break;
} }
case ON_ORIENTED_BOUNDARY: case ON_ORIENTED_BOUNDARY:
{ {
output_faces[i].push_back(current_id); output_faces[i].push_back(current_id);
in_point_ids.insert(output_faces[i].back()); in_point_bits.set(output_faces[i].back());
} }
} }
} }
@ -174,11 +181,14 @@ clip_to_bbox(const Plane_3& plane,
typedef typename graph_traits::face_descriptor face_descriptor; typedef typename graph_traits::face_descriptor face_descriptor;
std::map<int, vertex_descriptor> out_vertices; std::map<int, vertex_descriptor> out_vertices;
for(int i : in_point_ids) for(int i=0; i<14;++i)
{ {
vertex_descriptor v = add_vertex(tm_out); if (in_point_bits.test(i))
out_vertices.insert(std::make_pair(i, v)); {
put(vpm_out, v, corners[i]); vertex_descriptor v = add_vertex(tm_out);
out_vertices.insert(std::make_pair(i, v));
put(vpm_out, v, corners[i]);
}
} }
std::map< std::pair<int,int>, halfedge_descriptor> hedge_map; std::map< std::pair<int,int>, halfedge_descriptor> hedge_map;