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

fixes for clang 

removed warnings
This commit is contained in:
Sven Oesau 2024-03-28 17:29:33 +01:00
parent 4c520012d2
commit 55c9b036e0
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h
View File

@ -376,10 +376,11 @@ public:
typename Intersection_graph::Kinetic_interval& kinetic_interval = m_intersection_graph.kinetic_interval(edge, sp_idx);
/*
if (kinetic_interval.size() != 0) {
int a;
a = 3;
}
}*/
Point_2 s = sp.to_2d(from_exact(point_3(m_intersection_graph.source(edge))));
Point_2 t = sp.to_2d(from_exact(point_3(m_intersection_graph.target(edge))));
@ -532,12 +533,13 @@ public:
event.intersection_bary = 1;
}
/*
if (kinetic_interval.size() > 4) {
if (kinetic_interval[2].first > kinetic_interval[1].first) {
int a;
a = 2;
}
}
}*/
CGAL_assertion(0 <= event.intersection_bary && event.intersection_bary <= 1);
@ -784,8 +786,8 @@ public:
if (common_bbox_plane_idx != std::size_t(-1))
dump = true;
common_bbox_plane_idx = idx;
}
common_bbox_plane_idx = idx;
}
};
std::set_intersection(

8
Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h
View File

@ -547,15 +547,11 @@ private:
edge_constraint_maps[sp] = mesh.template add_property_map<typename Support_plane::Edge_index, bool>("e:keep", true).first;
F_component_map fcm = mesh.template add_property_map<typename Support_plane::Face_index, typename boost::graph_traits<typename Support_plane::Mesh>::faces_size_type>("f:component", 0).first;
std::size_t num = 0;
for (auto e : mesh.edges()) {
IEdge iedge = m_data.iedge(PEdge(sp, e));
if (is_occupied(iedge, sp)) {
if (is_occupied(iedge, sp))
edge_constraint_maps[sp][e] = true;
num++;
}
else
edge_constraint_maps[sp][e] = false;
}
@ -639,7 +635,7 @@ private:
//Point_3 tn2 = m_data.support_plane(sp).to_3d(mesh.point(mesh.target(h)));
visited_halfedges[n] = true;
Face_index fn = mesh.face(n);
//Face_index fn = mesh.face(n);
f_other = mesh.face(mesh.opposite(n));
if (f_other == mesh.null_face())

2
Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h
View File

@ -86,7 +86,7 @@ public:
{ }
Initializer(std::vector<std::vector<Point_3> >& input_polygons, std::vector<typename Intersection_kernel::Plane_3>& input_planes, Data_structure& data, const Parameters& parameters) :
m_input_polygons(input_polygons), m_data(data), m_input_planes(input_planes), m_parameters(parameters)
m_input_polygons(input_polygons), m_input_planes(input_planes), m_data(data), m_parameters(parameters)
{ }
void initialize(const std::array<typename Intersection_kernel::Point_3, 8>& bbox, std::vector<std::size_t>& input_polygons) {

22
Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h
View File

@ -809,8 +809,8 @@ public:
ib.add_vertex(vtx[i]);
std::size_t num_faces = 0;
std::size_t num_vols = 0;
std::size_t num_vtx = 0;
//std::size_t num_vols = 0;
//std::size_t num_vtx = 0;
typename LCC::Dart_descriptor d;
@ -834,7 +834,7 @@ public:
ib.begin_surface();
//std::cout << v << " inserting:";
num_vols++;
//num_vols++;
faces(v, std::back_inserter(faces_of_volume));
typename Intersection_kernel::Point_3 centroid = to_exact(m_partition_nodes[m_volumes[v].first].m_data->volumes()[m_volumes[v].second].centroid);
@ -927,7 +927,7 @@ public:
//std::cout << " " << mapped_vertices[v];
if (!used_vertices[mapped_vertices[v]]) {
used_vertices[mapped_vertices[v]] = true;
num_vtx++;
//num_vtx++;
}
}
@ -1461,12 +1461,12 @@ private:
}
// Generate 3D points corresponding to the intersections
std::size_t newpts = 0;
//std::size_t newpts = 0;
for (typename CDTplus::Finite_vertices_iterator vit = cdt.finite_vertices_begin(); vit != cdt.finite_vertices_end(); ++vit) {
if (!vit->info().input) {
vit->info().point_3 = plane.to_3d(vit->point());
vit->info().idA2 = vit->info().idB2 = Index(-1, -1);
newpts++;
//newpts++;
}
}
@ -1554,13 +1554,13 @@ private:
vertices.clear();
}
std::size_t newpts = 0;
//std::size_t newpts = 0;
// Generate 3D points corresponding to the intersections
for (typename CDTplus::Finite_vertices_iterator vit = cdtC.finite_vertices_begin(); vit != cdtC.finite_vertices_end(); ++vit) {
if (!vit->info().input) {
vit->info().point_3 = plane.to_3d(vit->point());
vit->info().idA2 = vit->info().idB2 = Index(-1, -1);
newpts++;
//newpts++;
}
}
@ -1861,7 +1861,7 @@ private:
-axis1.y(), axis1.x(), 0,
0, 0, 1.0);
CGAL::Aff_transformation_3<Kernel> T(CGAL::TRANSLATION, -Kernel::Vector_3((bbox[0].x() + bbox[2].x()) * 0.5, (bbox[0].y() + bbox[2].y()) * 0.5, (maxz + minz) * 0.5));
CGAL::Aff_transformation_3<Kernel> T(CGAL::TRANSLATION, -Vector_3((bbox[0].x() + bbox[2].x()) * 0.5, (bbox[0].y() + bbox[2].y()) * 0.5, (maxz + minz) * 0.5));
return R * T;
}
@ -2059,7 +2059,7 @@ private:
void adapt_internal_edges(const CDTplus& cdtC, const std::vector<Index> &faces_node, std::vector<std::vector<Constraint_info> >& c) {
assert(faces_node.size() == c.size());
std::size_t not_skipped = 0;
//std::size_t not_skipped = 0;
for (std::size_t f = 0; f < c.size(); f++) {
std::vector<Index> faces_of_volume;
@ -2090,7 +2090,7 @@ private:
if (vertices_of_edge.size() == 2)
continue;
not_skipped++;
//not_skipped++;
// Check length of constraint
// size 2 means it has not been split, thus there are no t-junctions.