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

Merge pull request #3379 from lrineau/Mesh_3-fix_Index-GF 

Mesh_3: Allow `Subdomain_index` to be `short`
This commit is contained in:
Laurent Rineau 2018-10-29 10:27:33 +01:00
parent 7e9de72e9c d50e70eee8
commit e54b036516
7 changed files with 171 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis/build_package.sh
View File

@ -2,12 +2,12 @@
set -e
[ -n "$CGAL_DEBUG_TRAVIS" ] && set -x
CXX_FLAGS="-DCGAL_NDEBUG"
CXX_FLAGS="-DCGAL_NDEBUG -ftemplate-backtrace-limit=0"
function build_examples {
mkdir -p build-travis
cd build-travis
cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCMAKE_CXX_FLAGS_RELEASE="${CXX_FLAGS}" ..
cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ..
make -j2
}
@ -45,7 +45,7 @@ function build_demo {
QGLVIEWERROOT=$PWD/qglviewer
export QGLVIEWERROOT
fi
cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" ..
cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" ..
make -j2
}
old_IFS=$IFS

40
Mesh_3/include/CGAL/Mesh_3/io_signature.h
View File

@ -109,6 +109,46 @@ struct Get_io_signature<unsigned int>
}
};
template <>
struct Get_io_signature<char>
{
std::string operator()() {
return "c";
}
};
template <>
struct Get_io_signature<unsigned char>
{
std::string operator()() {
return "uc";
}
};
template <>
struct Get_io_signature<signed char>
{
std::string operator()() {
return "sc";
}
};
template <>
struct Get_io_signature<short int>
{
std::string operator()() {
return "s";
}
};
template <>
struct Get_io_signature<unsigned short int>
{
std::string operator()() {
return "us";
}
};
template <>
struct Get_io_signature<double>
{

56
Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
View File

@ -38,6 +38,7 @@
#include <CGAL/is_streamable.h>
#include <CGAL/Real_timer.h>
#include <CGAL/property_map.h>
#include <CGAL/internal/Mesh_3/indices_management.h>
#include <vector>
#include <set>
@ -546,15 +547,19 @@ class Mesh_domain_with_polyline_features_3
public:
/// \name Types
/// @{
typedef typename MeshDomain_3::Index Index;
typedef typename MeshDomain_3::Surface_patch_index Surface_patch_index;
typedef typename MeshDomain_3::Subdomain_index Subdomain_index;
typedef int Curve_index;
typedef int Corner_index;
typedef typename MeshDomain_3::Surface_patch_index
Surface_patch_index;
typedef typename Mesh_3::internal::Index_generator_with_features<
typename MeshDomain_3::Subdomain_index,
Surface_patch_index,
Curve_index,
Corner_index>::type Index;
typedef int Curve_index;
typedef int Corner_index;
typedef CGAL::Tag_true Has_features;
typedef typename MeshDomain_3::R::FT FT;
typedef CGAL::Tag_true Has_features;
typedef typename MeshDomain_3::R::FT FT;
/// @}
#ifndef DOXYGEN_RUNNING
@ -777,18 +782,47 @@ public:
const Point_3& c1, const Point_3& c2,
const FT sq_r1, const FT sq_r2) const;
/**
* Returns the index to be stored in a vertex lying on the surface identified
* by \c index.
*/
Index index_from_surface_patch_index(const Surface_patch_index& index) const
{ return Index(index); }
/**
* Returns the index to be stored in a vertex lying in the subdomain
* identified by \c index.
*/
Index index_from_subdomain_index(const Subdomain_index& index) const
{ return Index(index); }
/// Returns an `Index` from a `Curve_index`
Index index_from_curve_index(const Curve_index& index) const
{ return Index(index); }
/// Returns a `Curve_index` from an `Index`
Curve_index curve_index(const Index& index) const
{ return boost::get<Curve_index>(index); }
/// Returns an `Index` from a `Corner_index`
Index index_from_corner_index(const Corner_index& index) const
{ return Index(index); }
/**
* Returns the \c Surface_patch_index of the surface patch
* where lies a vertex with dimension 2 and index \c index.
*/
Surface_patch_index surface_patch_index(const Index& index) const
{ return boost::get<Surface_patch_index>(index); }
/**
* Returns the index of the subdomain containing a vertex
* with dimension 3 and index \c index.
*/
Subdomain_index subdomain_index(const Index& index) const
{ return boost::get<Subdomain_index>(index); }
/// Returns a `Curve_index` from an `Index`
Curve_index curve_index(const Index& index) const
{ return boost::get<Curve_index>(index); }
/// Returns a `Corner_index` from an `Index`
Corner_index corner_index(const Index& index) const
{ return boost::get<Corner_index>(index); }

72
Mesh_3/include/CGAL/internal/Mesh_3/indices_management.h
View File

@ -48,7 +48,7 @@ template < typename Subdomain_index, typename Surface_patch_index >
struct Index_generator
{
typedef boost::variant<Subdomain_index,Surface_patch_index> Index;
typedef Index type;
typedef Index type;
};
template < typename T >
@ -58,6 +58,76 @@ struct Index_generator<T, T>
typedef Index type;
};
// Nasty meta-programming to get a boost::variant of four types that
// may not be all different.
template <typename T0> struct seq1 {
typedef T0 type;
};
template <typename T0, typename T1> struct seq2 {
typedef boost::variant<T0, T1> type;
};
template <typename T0, typename T1, typename T2> struct seq3 {
typedef boost::variant<T0, T1, T2> type;
};
template <typename T0, typename T1, typename T2, typename T3> struct seq4 {
typedef boost::variant<T0, T1, T2, T3> type;
};
template <typename T, typename U> struct insert;
template <typename T, typename U> struct insert<seq1<T>, U> {
typedef seq2<T, U> type;
};
template <typename T, typename U, typename V> struct insert<seq2<T, U>, V> {
typedef seq3<T, U, V> type;
};
template <typename T, typename U, typename V, typename W>
struct insert<seq3<T, U, V>, W> {
typedef seq4<T, U, V, W> type;
};
template <typename T> struct insert<seq1<T>, T> {
typedef seq1<T> type;
};
template <typename T, typename U> struct insert<seq2<T, U>, T> {
typedef seq2<T, U> type;
};
template <typename T, typename U> struct insert<seq2<T, U>, U> {
typedef seq2<T, U> type;
};
template <typename T, typename U, typename V> struct insert<seq3<T, U, V>, T> {
typedef seq3<T, U, V> type;
};
template <typename T, typename U, typename V> struct insert<seq3<T, U, V>, U> {
typedef seq3<T, U, V> type;
};
template <typename T, typename U, typename V> struct insert<seq3<T, U, V>, V> {
typedef seq3<T, U, V> type;
};
template < typename Subdomain_index,
typename Surface_patch_index,
typename Curves_index,
typename Corner_index>
struct Index_generator_with_features
{
typedef typename insert<
typename insert<
typename insert<seq1<Subdomain_index>,
Surface_patch_index
>::type,
Curves_index
>::type,
Corner_index>::type seq;
typedef typename seq::type Index;
typedef Index type;
};
template < typename T>
struct Index_generator_with_features<T, T, T, T>
{
typedef T Index;
typedef Index type;
};
template <typename T, typename Boost_variant>
const T& get_index(const Boost_variant& x,
typename boost::disable_if<boost::is_same<T, Boost_variant> >::type * = 0)

1
Mesh_3/test/Mesh_3/test_domain_with_polyline_features.cpp
View File

@ -38,6 +38,7 @@ struct Dummy_domain
typedef typename K::FT FT;
typedef int Index;
typedef int Surface_patch_index;
typedef unsigned short Subdomain_index;
};
typedef Dummy_domain<K_e_i> Smooth_domain;

7
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
View File

@ -39,8 +39,11 @@ struct Polyhedron_with_features_tester : public Tester<K>
void operator()() const
{
typedef CGAL::Mesh_3::Robust_intersection_traits_3<K> Gt;
typedef typename CGAL::Mesh_polyhedron_3<Gt>::type Polyhedron;
typedef CGAL::Polyhedral_mesh_domain_with_features_3<Gt> Mesh_domain;
typedef typename CGAL::Mesh_polyhedron_3<Gt, short>::type Polyhedron;
typedef CGAL::Polyhedral_mesh_domain_with_features_3<Gt,
Polyhedron,
CGAL::Default,
short> Mesh_domain;
typedef typename CGAL::Mesh_triangulation_3<
Mesh_domain,

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h
View File

@ -97,14 +97,16 @@ template <typename PatchIdMap, typename Handle_type, typename Int>
typename PatchIdMapWrapper<PatchIdMap, Int>::value_type
get(PatchIdMapWrapper<PatchIdMap, Int>& map, Handle_type h)
{
return get(map.map, h) - map.offset;
typedef typename PatchIdMapWrapper<PatchIdMap, Int>::value_type value_type;
return value_type(get(map.map, h) - map.offset);
}
template <typename PatchIdMap, typename Handle_type, typename Int>
void put(PatchIdMapWrapper<PatchIdMap, Int>& map, Handle_type h,
typename PatchIdMapWrapper<PatchIdMap, Int>::value_type pid)
{
put(map.map, h, pid + map.offset);
typedef typename PatchIdMapWrapper<PatchIdMap, Int>::value_type value_type;
put(map.map, h, value_type(pid + map.offset));
}
@ -127,14 +129,14 @@ template <typename PatchIdMap, typename Handle_type, typename Int>
typename PatchIdMapWrapper<PatchIdMap, std::pair<Int, Int> >::value_type
get(PatchIdMapWrapper<PatchIdMap, std::pair<Int, Int> >& map, Handle_type h)
{
return get(map.map, h).first - map.offset;
return Int(get(map.map, h).first - map.offset);
}
template <typename PatchIdMap, typename Handle_type, typename Int>
void put(PatchIdMapWrapper<PatchIdMap, std::pair<Int, Int> >& map, Handle_type h,
typename PatchIdMapWrapper<PatchIdMap, std::pair<Int, Int> >::value_type pid)
{
put(map.map, h, std::pair<Int, Int>(pid+map.offset, 0));
put(map.map, h, std::pair<Int, Int>(Int(pid+map.offset), 0));
}
template <typename PolygonMesh, typename PatchIdMap,