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

Misc minor changes

This commit is contained in:
Mael Rouxel-Labbé 2024-02-23 16:19:19 +01:00
parent aa3925d829
commit 7d3406a462
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Isosurfacing_3/examples/Isosurfacing_3/contouring_implicit_data.cpp
View File

@ -11,8 +11,8 @@
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
#include <CGAL/IO/polygon_soup_io.h> #include <CGAL/IO/polygon_soup_io.h>
#include <vector>
#include <array> #include <array>
#include <vector>
using Kernel = CGAL::Simple_cartesian<double>; using Kernel = CGAL::Simple_cartesian<double>;
using FT = typename Kernel::FT; using FT = typename Kernel::FT;

1
Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h
View File

@ -376,7 +376,6 @@ public:
out_edge_intersections << "2 " << x_coord(p) << " " << y_coord(p) << " " << z_coord(p) << " " << x_coord(p) + x_coord(g) << " " << y_coord(p) + y_coord(g) << " " << z_coord(p) + z_coord(g) << std::endl; out_edge_intersections << "2 " << x_coord(p) << " " << y_coord(p) << " " << z_coord(p) << " " << x_coord(p) + x_coord(g) << " " << y_coord(p) + y_coord(g) << " " << z_coord(p) + z_coord(g) << std::endl;
} }
#endif #endif
if(!do_not_triangulate_faces) if(!do_not_triangulate_faces)

22
Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/partition_traits_Cartesian_grid.h
View File

@ -61,14 +61,14 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
using Cell_edges = std::array<Edge_descriptor, EDGES_PER_CELL>; using Cell_edges = std::array<Edge_descriptor, EDGES_PER_CELL>;
static decltype(auto) /*Point_3*/ point(const Vertex_descriptor& v, static decltype(auto) /*Point_3*/ point(const Vertex_descriptor& v,
const Self& g) const Grid& g)
{ {
return g.point(v[0], v[1], v[2]); return g.point(v[0], v[1], v[2]);
} }
// returns a container with the two vertices incident to edge e // returns a container with the two vertices incident to edge e
static Vertices_incident_to_edge incident_vertices(const Edge_descriptor& e, static Vertices_incident_to_edge incident_vertices(const Edge_descriptor& e,
const Self&) const Grid&)
{ {
Vertices_incident_to_edge ev; Vertices_incident_to_edge ev;
ev[0] = { e[0], e[1], e[2] }; // start vertex ev[0] = { e[0], e[1], e[2] }; // start vertex
@ -79,7 +79,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// returns a container with all cells incident to edge e // returns a container with all cells incident to edge e
static Cells_incident_to_edge incident_cells(const Edge_descriptor& e, static Cells_incident_to_edge incident_cells(const Edge_descriptor& e,
const Self&) const Grid&)
{ {
// lookup the neighbor cells relative to the edge // lookup the neighbor cells relative to the edge
const int local = internal::Cube_table::edge_store_index[e[3]]; const int local = internal::Cube_table::edge_store_index[e[3]];
@ -99,7 +99,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// returns a container with all vertices of cell c // returns a container with all vertices of cell c
static Cell_vertices cell_vertices(const Cell_descriptor& c, static Cell_vertices cell_vertices(const Cell_descriptor& c,
const Self&) const Grid&)
{ {
Cell_vertices cv; Cell_vertices cv;
for(std::size_t i=0; i<cv.size(); ++i) { for(std::size_t i=0; i<cv.size(); ++i) {
@ -115,7 +115,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// returns a container with all edges of cell c // returns a container with all edges of cell c
static Cell_edges cell_edges(const Cell_descriptor& c, static Cell_edges cell_edges(const Cell_descriptor& c,
const Self&) const Grid&)
{ {
Cell_edges ce; Cell_edges ce;
for(std::size_t i=0; i<ce.size(); ++i) { for(std::size_t i=0; i<ce.size(); ++i) {
@ -136,7 +136,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates sequentially over all vertices v calling f(v) on every one // iterates sequentially over all vertices v calling f(v) on every one
template <typename Functor> template <typename Functor>
static void for_each_vertex(Functor& f, static void for_each_vertex(Functor& f,
const Self& g, const Grid& g,
const CGAL::Sequential_tag) const CGAL::Sequential_tag)
{ {
for(std::size_t i=0; i<g.xdim(); ++i) for(std::size_t i=0; i<g.xdim(); ++i)
@ -148,7 +148,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates sequentially over all edges e calling f(e) on every one // iterates sequentially over all edges e calling f(e) on every one
template <typename Functor> template <typename Functor>
static void for_each_edge(Functor& f, static void for_each_edge(Functor& f,
const Self& g, const Grid& g,
const CGAL::Sequential_tag) const CGAL::Sequential_tag)
{ {
for(std::size_t i=0; i<g.xdim()-1; ++i) { for(std::size_t i=0; i<g.xdim()-1; ++i) {
@ -167,7 +167,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates sequentially over all cells c calling f(c) on every one // iterates sequentially over all cells c calling f(c) on every one
template <typename Functor> template <typename Functor>
static void for_each_cell(Functor& f, static void for_each_cell(Functor& f,
const Self& g, const Grid& g,
const CGAL::Sequential_tag) const CGAL::Sequential_tag)
{ {
for(std::size_t i=0; i<g.xdim()-1; ++i) for(std::size_t i=0; i<g.xdim()-1; ++i)
@ -180,7 +180,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates in parallel over all vertices v calling f(v) on every one // iterates in parallel over all vertices v calling f(v) on every one
template <typename Functor> template <typename Functor>
static void for_each_vertex(Functor& f, static void for_each_vertex(Functor& f,
const Self& g, const Grid& g,
const CGAL::Parallel_tag) const CGAL::Parallel_tag)
{ {
const std::size_t sj = g.ydim(); const std::size_t sj = g.ydim();
@ -201,7 +201,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates in parallel over all edges e calling f(e) on every one // iterates in parallel over all edges e calling f(e) on every one
template <typename Functor> template <typename Functor>
static void for_each_edge(Functor& f, static void for_each_edge(Functor& f,
const Self& g, const Grid& g,
const CGAL::Parallel_tag) const CGAL::Parallel_tag)
{ {
const std::size_t sj = g.ydim(); const std::size_t sj = g.ydim();
@ -228,7 +228,7 @@ struct partition_traits<Cartesian_grid_3<GeomTraits, MemoryPolicy> >
// iterates in parallel over all cells c calling f(c) on every one // iterates in parallel over all cells c calling f(c) on every one
template <typename Functor> template <typename Functor>
static void for_each_cell(Functor& f, static void for_each_cell(Functor& f,
const Self& g, const Grid& g,
const CGAL::Parallel_tag) const CGAL::Parallel_tag)
{ {
const std::size_t sj = g.ydim(); const std::size_t sj = g.ydim();