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

move all MDS_3 to TMDS_3 (with T for Tetrahedral)

This commit is contained in:
Jane Tournois 2021-10-12 16:31:52 +02:00
parent 420165dbe0
commit 95b3da51cf
63 changed files with 132 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/CHANGES.md
View File

@ -34,7 +34,7 @@ Release date: December 2021
Release date:
### [Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgMDS3) (new package)
### [Tetrahedral Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgTMDS3) (new package)
- This new package wraps all the existing code that deals with a
` MeshComplex_3InTriangulation_3`, and makes the data structure independant

8
Installation/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h → Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h
View File

@ -7,8 +7,8 @@
// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
//
#ifndef CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#define CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#ifndef CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
#define CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
/// \file Mesh_complex_3_in_triangulation_3_fwd.h
/// Forward declarations of the MDS_3 package.
@ -35,7 +35,7 @@ namespace IO {
);
}
namespace MDS_3 {
namespace TMDS_3 {
template<class Tr>
bool build_triangulation_from_file(std::istream& is,
@ -47,6 +47,6 @@ namespace MDS_3 {
} // CGAL
#endif
#endif /* CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */
#endif /* CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */

20
Installation/include/CGAL/license/MDS_3.h → Installation/include/CGAL/license/TMDS_3.h
View File

@ -11,15 +11,15 @@
//
// Warning: this file is generated, see include/CGAL/licence/README.md
#ifndef CGAL_LICENSE_MDS_3_H
#define CGAL_LICENSE_MDS_3_H
#ifndef CGAL_LICENSE_TMDS_3_H
#define CGAL_LICENSE_TMDS_3_H
#include <CGAL/config.h>
#include <CGAL/license.h>
#ifdef CGAL_MDS_3_COMMERCIAL_LICENSE
#ifdef CGAL_TMDS_3_COMMERCIAL_LICENSE
# if CGAL_MDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
# if CGAL_TMDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
# if defined(CGAL_LICENSE_WARNING)
@ -33,22 +33,22 @@
You get this error, as you defined CGAL_LICENSE_ERROR."
# endif // CGAL_LICENSE_ERROR
# endif // CGAL_MDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
# endif // CGAL_TMDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE
#else // no CGAL_MDS_3_COMMERCIAL_LICENSE
#else // no CGAL_TMDS_3_COMMERCIAL_LICENSE
# if defined(CGAL_LICENSE_WARNING)
CGAL_pragma_warning("\nThe macro CGAL_MDS_3_COMMERCIAL_LICENSE is not defined."
CGAL_pragma_warning("\nThe macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined."
"\nYou use the CGAL 3D Mesh Data Structure package under "
"the terms of the GPLv3+.")
# endif // CGAL_LICENSE_WARNING
# ifdef CGAL_LICENSE_ERROR
# error "The macro CGAL_MDS_3_COMMERCIAL_LICENSE is not defined.\
# error "The macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined.\
You use the CGAL 3D Mesh Data Structure package under the terms of \
the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR."
# endif // CGAL_LICENSE_ERROR
#endif // no CGAL_MDS_3_COMMERCIAL_LICENSE
#endif // no CGAL_TMDS_3_COMMERCIAL_LICENSE
#endif // CGAL_LICENSE_MDS_3_H
#endif // CGAL_LICENSE_TMDS_3_H

2
MDS_3/package_info/MDS_3/description.txt
View File

@ -1,2 +0,0 @@
Package MDS_3 :
Mesh Data Structures for dimension <=3

2
Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Has_timestamp.h>
#include <CGAL/Regular_triangulation_cell_base_3.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <boost/type_traits/is_same.hpp>

2
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
View File

@ -33,7 +33,7 @@
#include <functional>
#include <CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h>
#include <CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h>
#include <CGAL/internal/Mesh_3/indices_management.h>
// support for `CGAL::Image_3`

2
Mesh_3/include/CGAL/Mesh_3/Mesh_surface_cell_base_3.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Mesh_3/config.h>
#include <CGAL/Regular_triangulation_cell_base_3.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#ifdef CGAL_LINKED_WITH_TBB
# include <atomic>

2
Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
View File

@ -36,7 +36,7 @@
#include <CGAL/Mesh_error_code.h>
#include <CGAL/MDS_3/Dump_c3t3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/Mesh_3/Refine_facets_3.h>
#include <CGAL/Mesh_3/Refine_facets_manifold_base.h>

6
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -28,11 +28,11 @@
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
# include <CGAL/IO/File_binary_mesh_3.h>
#endif
#include <CGAL/MDS_3/utilities.h>
#include <CGAL/TMDS_3/utilities.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/iterator.h>
#include <CGAL/Mesh_error_code.h>
@ -108,7 +108,7 @@ void debug_dump_c3t3(const std::string filename, const C3t3& c3t3)
template <typename C3T3, typename MeshDomain, typename SizingFunction>
class Protect_edges_sizing_field
: public CGAL::MDS_3::internal::Debug_messages_tools
: public CGAL::TMDS_3::internal::Debug_messages_tools
{
typedef Protect_edges_sizing_field Self;

2
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
View File

@ -38,7 +38,7 @@
#ifdef CGAL_MESH_3_PROFILING
#include <CGAL/Mesh_3/Profiling_tools.h>
#endif
#include <CGAL/MDS_3/Dump_c3t3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/Object.h>

2
Mesh_3/include/CGAL/Mesh_cell_base_3.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Regular_triangulation_cell_base_3.h>
#include <CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h>
#include <CGAL/Mesh_3/Mesh_surface_cell_base_3.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/tags.h>
#include <boost/type_traits/is_convertible.hpp>

2
Mesh_3/include/CGAL/Mesh_triangulation_3.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Mesh_vertex_base_3.h>
#include <CGAL/Compact_mesh_cell_base_3.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
namespace CGAL {

2
Mesh_3/include/CGAL/Mesh_vertex_base_3.h
View File

@ -25,7 +25,7 @@
#include <CGAL/Regular_triangulation_vertex_base_3.h>
#include <CGAL/internal/Mesh_3/indices_management.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/Has_timestamp.h>
#include <CGAL/tags.h>
#include <atomic>

2
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
View File

@ -59,7 +59,7 @@
// To handle I/O for Surface_patch_index if that is a pair of `int` (the
// default)
#include <CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h>
#include <CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h>
#include <CGAL/internal/Mesh_3/indices_management.h>

2
Mesh_3/include/CGAL/refine_mesh_3.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Mesh_3/Mesher_3.h>
#include <CGAL/Mesh_error_code.h>
#include <CGAL/optimize_mesh_3.h>
#include <CGAL/MDS_3/Dump_c3t3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <boost/parameter/preprocessor.hpp>

2
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h
View File

@ -308,7 +308,7 @@ void output_to_medit(std::ostream& os,
#endif
CGAL_precondition(c3t3.triangulation().is_1_cover());
typedef CGAL::MDS_3::Medit_pmap_generator<C3T3, rebind, no_patch> Generator;
typedef CGAL::TMDS_3::Medit_pmap_generator<C3T3, rebind, no_patch> Generator;
typedef typename Generator::Cell_pmap Cell_pmap;
typedef typename Generator::Facet_pmap Facet_pmap;
typedef typename Generator::Facet_pmap_twice Facet_pmap_twice;

6
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
View File

@ -31,12 +31,12 @@
#include <CGAL/license/Periodic_3_mesh_3.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
#include <CGAL/IO/File_binary_mesh_3.h>
#endif
#include <CGAL/Mesh_3/Protect_edges_sizing_field.h>
#include <CGAL/MDS_3/utilities.h>
#include <CGAL/TMDS_3/utilities.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/enum.h>
@ -75,7 +75,7 @@ namespace Periodic_3_mesh_3 {
template <typename C3T3, typename MeshDomain, typename SizingFunction>
class Protect_edges_sizing_field
: public CGAL::MDS_3::internal::Debug_messages_tools
: public CGAL::TMDS_3::internal::Debug_messages_tools
{
typedef Protect_edges_sizing_field Self;

2
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h
View File

@ -38,7 +38,7 @@
#include <CGAL/Cartesian_converter.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/tags.h>
#include <iostream>

2
Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
View File

@ -21,7 +21,7 @@
#include <CGAL/Periodic_3_mesh_3/config.h>
#include <CGAL/Mesh_3/C3T3_helpers.h>
#include <CGAL/MDS_3/Dump_c3t3.h>
#include <CGAL/TMDS_3/Dump_c3t3.h>
#include <CGAL/Mesh_3/Triangulation_helpers.h>
#include <CGAL/refine_mesh_3.h>
#include <CGAL/Time_stamper.h>

6
Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp
View File

@ -10,7 +10,7 @@
// Jane Tournois
//
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <QtCore/qglobal.h>
#include "Scene_surface_mesh_item.h"
@ -37,7 +37,7 @@
#include <CGAL/boost/graph/Euler_operations.h>
#include <CGAL/property_map.h>
#include <CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h>
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/IO/output_to_vtu.h>
#include <CGAL/boost/graph/io.h>
@ -421,7 +421,7 @@ public:
}
}
CGAL::MDS_3::build_triangulation(c3t3_item->c3t3().triangulation(),
CGAL::TMDS_3::build_triangulation(c3t3_item->c3t3().triangulation(),
points, finite_cells, border_facets);
for( C3t3::Triangulation::Finite_cells_iterator

6
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
View File

@ -1,6 +1,6 @@
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include "Scene_c3t3_item.h"
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/Three/Polyhedron_demo_io_plugin_interface.h>
#include <CGAL/Three/Three.h>
#include <CGAL/IO/File_avizo.h>
@ -127,7 +127,7 @@ Polyhedron_demo_c3t3_binary_io_plugin::load(
item->setName(fileinfo.baseName());
item->set_valid(false);
if(CGAL::MDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
if(CGAL::TMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
{
item->c3t3().rescan_after_load_of_triangulation();
for( C3t3::Cell_handle cit : item->c3t3().triangulation().finite_cell_handles())

0
MDS_3/doc/MDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h → TMDS_3/doc/TMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h
View File

0
MDS_3/doc/MDS_3/Concepts/MeshComplex_3InTriangulation_3.h → TMDS_3/doc/TMDS_3/Concepts/MeshComplex_3InTriangulation_3.h
View File

4
MDS_3/doc/MDS_3/Doxyfile.in → TMDS_3/doc/TMDS_3/Doxyfile.in
View File

@ -1,6 +1,6 @@
@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Mesh Data Structures"
PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Tetrahedral Mesh Data Structures"
#custom options
EXTRACT_ALL = false
@ -13,7 +13,7 @@ WARN_IF_UNDOCUMENTED = false
INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/IO
EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/internal/MDS_3
EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/internal/TMDS_3
HTML_EXTRA_FILES = ${CGAL_PACKAGE_DOC_DIR}/fig/c3t3.jpg \
# ${CGAL_PACKAGE_DOC_DIR}/fig/no-protection-complex.png

0
MDS_3/doc/MDS_3/PackageDescription.txt → TMDS_3/doc/TMDS_3/PackageDescription.txt
View File

0
MDS_3/doc/MDS_3/MDS_3.txt → TMDS_3/doc/TMDS_3/TMDS_3.txt
View File

0
MDS_3/doc/MDS_3/dependencies → TMDS_3/doc/TMDS_3/dependencies
View File

0
MDS_3/doc/MDS_3/examples.txt → TMDS_3/doc/TMDS_3/examples.txt
View File

2
MDS_3/examples/MDS_3/CMakeLists.txt → TMDS_3/examples/TMDS_3/CMakeLists.txt
View File

@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.1...3.20)
project(MDS_3_Examples)
project(TMDS_3_Examples)
# CGAL and its components
find_package(CGAL REQUIRED)

0
MDS_3/examples/MDS_3/c3t3_example.cpp → TMDS_3/examples/TMDS_3/c3t3_example.cpp
View File

0
MDS_3/examples/MDS_3/tetrahedron_soup_to_c3t3_example.cpp → TMDS_3/examples/TMDS_3/tetrahedron_soup_to_c3t3_example.cpp
View File

0
MDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h → TMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h
View File

0
MDS_3/include/CGAL/IO/File_avizo.h → TMDS_3/include/CGAL/IO/File_avizo.h
View File

4
MDS_3/include/CGAL/IO/File_binary_mesh_3.h → TMDS_3/include/CGAL/IO/File_binary_mesh_3.h
View File

@ -13,13 +13,13 @@
#ifndef CGAL_IO_FILE_BINARY_MESH_3_H
#define CGAL_IO_FILE_BINARY_MESH_3_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <iostream>
#include <string>
#include <limits>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
namespace CGAL {

2
MDS_3/include/CGAL/IO/File_maya.h → TMDS_3/include/CGAL/IO/File_maya.h
View File

@ -12,7 +12,7 @@
#ifndef CGAL_IO_FILE_MAYA_H
#define CGAL_IO_FILE_MAYA_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/Time_stamper.h>
#include <CGAL/utility.h>

27
MDS_3/include/CGAL/IO/File_medit.h → TMDS_3/include/CGAL/IO/File_medit.h
View File

@ -14,11 +14,11 @@
#ifndef CGAL_IO_FILE_MEDIT_H
#define CGAL_IO_FILE_MEDIT_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h>
#include <CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/utility.h>
#include <CGAL/basic.h>
@ -40,7 +40,7 @@
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
//-------------------------------------------------------
// Needed in verbose mode
@ -777,7 +777,9 @@ output_to_medit(std::ostream& os,
{
os << "Vertices\n" << tr.number_of_vertices() << '\n';
for (Vertex_handle vit : tr.finite_vertex_handles())
for (typename Tr::Finite_vertices_iterator vit = tr.finite_vertices_begin();
vit != tr.finite_vertices_end();
++vit)
{
V[vit] = inum++;
Point p = tr.point(vit);
@ -867,7 +869,10 @@ output_to_medit(std::ostream& os,
if (all_cells)
{
for (Cell_handle cit : c3t3.triangulation().finite_cell_handles())
for (typename C3T3::Triangulation::Finite_cells_iterator
cit = c3t3.triangulation().finite_cells_begin();
cit != c3t3.triangulation().finite_cells_end();
++cit)
{
for (int i = 0; i < 4; i++)
os << V[cit->vertex(i)] << ' ';
@ -925,19 +930,19 @@ output_to_medit(std::ostream& os,
if ( rebind )
{
if ( show_patches )
CGAL::MDS_3::output_to_medit<C3T3,true,false>(os, c3t3,
CGAL::TMDS_3::output_to_medit<C3T3,true,false>(os, c3t3,
all_vertices, all_cells);
else
CGAL::MDS_3::output_to_medit<C3T3,true,true>(os, c3t3,
CGAL::TMDS_3::output_to_medit<C3T3,true,true>(os, c3t3,
all_vertices, all_cells);
}
else
{
if ( show_patches )
CGAL::MDS_3::output_to_medit<C3T3,false,false>(os, c3t3,
CGAL::TMDS_3::output_to_medit<C3T3,false,false>(os, c3t3,
all_vertices, all_cells);
else
CGAL::MDS_3::output_to_medit<C3T3,false,true>(os, c3t3,
CGAL::TMDS_3::output_to_medit<C3T3,false,true>(os, c3t3,
all_vertices, all_cells);
}
}
@ -1114,7 +1119,7 @@ template<typename T3>
bool read_MEDIT(std::istream& in, T3& t3)
{
CGAL_assertion(!(!in));
return CGAL::MDS_3::build_triangulation_from_file(in, t3);
return CGAL::TMDS_3::build_triangulation_from_file(in, t3);
}
} // namespace IO

14
MDS_3/include/CGAL/IO/File_tetgen.h → TMDS_3/include/CGAL/IO/File_tetgen.h
View File

@ -13,7 +13,7 @@
#ifndef CGAL_IO_FILE_TETGEN_H
#define CGAL_IO_FILE_TETGEN_H
#include <CGAL/license/Mesh_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/Time_stamper.h>
#include <CGAL/IO/File_medit.h>
@ -25,7 +25,7 @@
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
template <class C3T3, bool rebind, bool no_patch>
void
@ -185,7 +185,7 @@ output_to_tetgen(std::string filename,
//-------------------------------------------------------
} // end output_to_tetgen(...)
} // end namespace Mesh_3
} // end namespace TMDS_3
namespace IO {
@ -211,16 +211,16 @@ output_to_tetgen(std::string filename,
if ( rebind )
{
if ( show_patches )
MDS_3::output_to_tetgen<C3T3,true,false>(filename,c3t3);
TMDS_3::output_to_tetgen<C3T3,true,false>(filename,c3t3);
else
MDS_3::output_to_tetgen<C3T3,true,true>(filename,c3t3);
TMDS_3::output_to_tetgen<C3T3,true,true>(filename,c3t3);
}
else
{
if ( show_patches )
MDS_3::output_to_tetgen<C3T3,false,false>(filename,c3t3);
TMDS_3::output_to_tetgen<C3T3,false,false>(filename,c3t3);
else
MDS_3::output_to_tetgen<C3T3,false,true>(filename,c3t3);
TMDS_3::output_to_tetgen<C3T3,false,true>(filename,c3t3);
}
}

2
MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h → TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h
View File

@ -14,7 +14,7 @@
#ifndef CGAL_IO_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H
#define CGAL_IO_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#ifndef CGAL_NO_DEPRECATED_CODE
#include <CGAL/facets_in_complex_3_to_triangle_mesh.h>

0
MDS_3/include/CGAL/IO/output_to_vtu.h → TMDS_3/include/CGAL/IO/output_to_vtu.h
View File

26
MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h → TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
View File

@ -18,17 +18,17 @@
#ifndef CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H
#define CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h>
#include <CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/iterator.h>
#include <CGAL/MDS_3/utilities.h>
#include <CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h>
#include <CGAL/TMDS_3/utilities.h>
#include <CGAL/internal/TMDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h>
#include <CGAL/Time_stamper.h>
#include <CGAL/Bbox_3.h>
#include <CGAL/Union_find.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/IO/File_medit.h>
#include <CGAL/IO/File_maya.h>
@ -75,7 +75,7 @@ namespace CGAL {
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
namespace details {
@ -112,8 +112,8 @@ namespace CGAL {
}
}; // end class template C3t3_helper_class
} // end namespace MDS_3::details
} //end namesapce MDS_3
} // end namespace TMDS_3::details
} //end namesapce TMDS_3
/*!
\ingroup PkgMDS3Classes
@ -160,8 +160,8 @@ template <typename Tr,
typename CurveIndex>
class Mesh_complex_3_in_triangulation_3
#ifndef DOXYGEN_RUNNING
: public CGAL::MDS_3::details::C3t3_helper_class<Tr>
, public CGAL::MDS_3::internal::Debug_messages_tools
: public CGAL::TMDS_3::details::C3t3_helper_class<Tr>
, public CGAL::TMDS_3::internal::Debug_messages_tools
#endif
{
public:
@ -170,7 +170,7 @@ public:
private:
typedef Mesh_complex_3_in_triangulation_3<
Tr,CornerIndex,CurveIndex> Self;
typedef MDS_3::details::C3t3_helper_class<Tr> Base;
typedef TMDS_3::details::C3t3_helper_class<Tr> Base;
typedef CGAL::Hash_handles_with_or_without_timestamps Hash_fct;
public:
@ -792,7 +792,7 @@ private:
}
}; // end class Cell_not_in_complex
typedef MDS_3::internal::Iterator_not_in_complex<Self> Iterator_not_in_complex;
typedef TMDS_3::internal::Iterator_not_in_complex<Self> Iterator_not_in_complex;
class Facet_iterator_not_in_complex
{
@ -856,7 +856,7 @@ private:
// Iterator type to get the first element of pair
typedef boost::transform_iterator <
MDS_3::internal::First_of<typename Vertex_map_filter_iterator::value_type>,
TMDS_3::internal::First_of<typename Vertex_map_filter_iterator::value_type>,
Vertex_map_filter_iterator > Vertex_map_iterator_first;
// Iterator type to remove a level of referencing

4
MDS_3/include/CGAL/MDS_3/Dump_c3t3.h → TMDS_3/include/CGAL/TMDS_3/Dump_c3t3.h
View File

@ -13,11 +13,11 @@
#ifndef CGAL_MESH_3_DUMP_C3T3_H
#define CGAL_MESH_3_DUMP_C3T3_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/IO/File_medit.h>
#include <CGAL/is_streamable.h>

0
MDS_3/include/CGAL/MDS_3/io_signature.h → TMDS_3/include/CGAL/TMDS_3/io_signature.h
View File

12
MDS_3/include/CGAL/MDS_3/tet_soup_to_c3t3.h → TMDS_3/include/CGAL/TMDS_3/tet_soup_to_c3t3.h
View File

@ -14,10 +14,10 @@
//
//******************************************************************************
#ifndef CGAL_MDS_3_TET_SOUP_TO_C3T3_H
#define CGAL_MDS_3_TET_SOUP_TO_C3T3_H
#ifndef CGAL_TMDS_3_TET_SOUP_TO_C3T3_H
#define CGAL_TMDS_3_TET_SOUP_TO_C3T3_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/assertions.h>
@ -32,7 +32,7 @@
namespace CGAL
{
namespace MDS_3
namespace TMDS_3
{
template<typename Vh>
std::array<Vh, 3> make_ordered_vertex_array(const Vh vh0, const Vh vh1, const Vh vh2)
@ -535,9 +535,9 @@ bool build_triangulation_from_file(std::istream& is,
replace_domain_0 && !dont_replace_domain_0);
}
} // namespace MDS_3
} // namespace TMDS_3
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MDS_3_TET_SOUP_TO_C3T3_H
#endif // CGAL_TMDS_3_TET_SOUP_TO_C3T3_H

12
MDS_3/include/CGAL/MDS_3/utilities.h → TMDS_3/include/CGAL/TMDS_3/utilities.h
View File

@ -14,10 +14,10 @@
// File Description :
//******************************************************************************
#ifndef CGAL_MDS_3_UTILITIES_H
#define CGAL_MDS_3_UTILITIES_H
#ifndef CGAL_TMDS_3_UTILITIES_H
#define CGAL_TMDS_3_UTILITIES_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/Has_timestamp.h>
#include <iterator>
@ -25,7 +25,7 @@
#include <sstream>
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
namespace internal {
struct Debug_messages_tools {
@ -115,7 +115,7 @@ public:
} // end namespace internal
} // end namespace MDS_3
} // end namespace TMDS_3
} //namespace CGAL
#endif // CGAL_MDS_3_UTILITIES_H
#endif // CGAL_TMDS_3_UTILITIES_H

10
MDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h → TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h
View File

@ -14,7 +14,7 @@
#ifndef CGAL_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H
#define CGAL_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/array.h>
#include <CGAL/boost/graph/Euler_operations.h>
@ -34,7 +34,7 @@
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
namespace internal {
@ -171,7 +171,7 @@ void set_face_patches(const Index2FaceMap& i2f,
} // end namespace internal
} // end namespace MDS_3
} // end namespace TMDS_3
/**
* @ingroup PkgMDS3Functions
@ -216,7 +216,7 @@ void set_face_patches(const Index2FaceMap& i2f,
std::vector<Surface_patch_index> patches;
std::vector<Point_3> points;
MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches);
TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches);
if (!PMP::is_polygon_soup_a_polygon_mesh(faces))
PMP::orient_polygon_soup(points, faces);
@ -229,7 +229,7 @@ void set_face_patches(const Index2FaceMap& i2f,
using parameters::choose_parameter;
using parameters::get_parameter;
MDS_3::internal::set_face_patches(i2f,
TMDS_3::internal::set_face_patches(i2f,
patches,
get_parameter(np, internal_np::face_patch));
}

6
MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h → TMDS_3/include/CGAL/internal/TMDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h
View File

@ -12,7 +12,7 @@
#ifndef CGAL_INTERNAL_MESH_3_BOUNDARY_OF_SUDDOMAIN_OF_COMPLEX_3_IN_TRIANGULATION_3_TO_OFF_H
#define CGAL_INTERNAL_MESH_3_BOUNDARY_OF_SUDDOMAIN_OF_COMPLEX_3_IN_TRIANGULATION_3_TO_OFF_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/facets_in_complex_3_to_triangle_mesh.h>
@ -64,7 +64,7 @@ output_boundary_of_c3t3_to_off(const C3T3& c3t3,
std::vector<Face> faces;
std::vector<Surface_patch_index> patches;
CGAL::MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, sd_index, points, faces,
CGAL::TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, sd_index, points, faces,
patches, normals_point_outside_of_the_subdomain);
return output_polygon_soup_to_off(points, faces, out);
@ -83,7 +83,7 @@ output_facets_in_complex_to_off(const C3T3& c3t3,
std::vector<Face> faces;
std::vector<Surface_patch_index> patches;
CGAL::MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches);
CGAL::TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches);
return output_polygon_soup_to_off(points, faces, out);
}

4
MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h → TMDS_3/include/CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h
View File

@ -13,12 +13,12 @@
#ifndef CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H
#define CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/disable_warnings.h>
#include <utility>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <ostream>
#include <istream>
#include <boost/variant.hpp>

12
MDS_3/include/CGAL/internal/MDS_3/MDS_3_helper.h → TMDS_3/include/CGAL/internal/TMDS_3/TMDS_3_helper.h
View File

@ -10,10 +10,10 @@
//
// Author(s) : Jane Tournois
#ifndef CGAL_INTERNAL_MDS_3_HELPERS_H
#define CGAL_INTERNAL_MDS_3_HELPERS_H
#ifndef CGAL_INTERNAL_TMDS_3_HELPERS_H
#define CGAL_INTERNAL_TMDS_3_HELPERS_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/enum.h>
@ -21,7 +21,7 @@
#include <array>
namespace CGAL {
namespace MDS_3 {
namespace TMDS_3 {
namespace internal {
template<typename Triangulation>
@ -63,7 +63,7 @@ namespace internal {
}
} // end namespace internal
} // end namespace MDS_3
} // end namespace TMDS_3
} // end namespace CGAL
#endif // CGAL_INTERNAL_MDS_3_HELPERS_H
#endif // CGAL_INTERNAL_TMDS_3_HELPERS_H

20
MDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h → TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h
View File

@ -15,13 +15,13 @@
// File Description :
//******************************************************************************
#ifndef CGAL_MDS_3_TETRAHEDRON_SOUP_TO_C3T3_H
#define CGAL_MDS_3_TETRAHEDRON_SOUP_TO_C3T3_H
#ifndef CGAL_TMDS_3_TETRAHEDRON_SOUP_TO_C3T3_H
#define CGAL_TMDS_3_TETRAHEDRON_SOUP_TO_C3T3_H
#include <CGAL/license/MDS_3.h>
#include <CGAL/license/TMDS_3.h>
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/internal/MDS_3/MDS_3_helper.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/internal/TMDS_3/TMDS_3_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <vector>
@ -88,9 +88,9 @@ namespace CGAL {
finite_cells.push_back(cell);
}
CGAL::MDS_3::build_triangulation(tr, points, finite_cells, border_facets);
CGAL::TMDS_3::build_triangulation(tr, points, finite_cells, border_facets);
CGAL_assertion(CGAL::MDS_3::internal::is_convex(tr));
CGAL_assertion(CGAL::TMDS_3::internal::is_convex(tr));
}
/** \ingroup PkgMDS3Functions
@ -149,9 +149,9 @@ namespace CGAL {
typename Triangulation::Cell::Surface_patch_index> empty_map;
auto facets = choose_parameter(get_parameter(np, internal_np::surface_facets), empty_map);
CGAL::MDS_3::build_triangulation(tr, points, tets, facets);
CGAL::TMDS_3::build_triangulation(tr, points, tets, facets);
CGAL_assertion(CGAL::MDS_3::internal::is_convex(tr));
CGAL_assertion(CGAL::TMDS_3::internal::is_convex(tr));
}
template<typename PointRange,
@ -167,4 +167,4 @@ namespace CGAL {
} //namespace CGAL
#endif // CGAL_MDS_3_TETRAHEDRON_SOUP_TO_C3T3_H
#endif // CGAL_TMDS_3_TETRAHEDRON_SOUP_TO_C3T3_H

0
MDS_3/package_info/MDS_3/copyright → TMDS_3/package_info/TMDS_3/copyright
View File

2
MDS_3/package_info/MDS_3/dependencies → TMDS_3/package_info/TMDS_3/dependencies
View File

@ -14,7 +14,7 @@ Intersections_3
Interval_support
Kernel_23
Kernel_d
MDS_3
TMDS_3
Modular_arithmetic
Number_types
Polygon

2
TMDS_3/package_info/TMDS_3/description.txt Normal file
View File

@ -0,0 +1,2 @@
Package TMDS_3 :
Tetrahedral Mesh Data Structures

0
MDS_3/package_info/MDS_3/license.txt → TMDS_3/package_info/TMDS_3/license.txt
View File

0
MDS_3/package_info/MDS_3/maintainer → TMDS_3/package_info/TMDS_3/maintainer
View File

2
MDS_3/test/MDS_3/CMakeLists.txt → TMDS_3/test/TMDS_3/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.20)
project( MDS_3_Tests )
project( TMDS_3_Tests )
find_package(CGAL REQUIRED)

0
MDS_3/test/MDS_3/test_c3t3.cpp → TMDS_3/test/TMDS_3/test_c3t3.cpp
View File

0
MDS_3/test/MDS_3/test_c3t3_extract_subdomains_boundaries.cpp → TMDS_3/test/TMDS_3/test_c3t3_extract_subdomains_boundaries.cpp
View File

4
MDS_3/test/MDS_3/test_c3t3_into_facegraph.cpp → TMDS_3/test/TMDS_3/test_c3t3_into_facegraph.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Mesh_triangulation_3.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/Mesh_3/Robust_intersection_traits_3.h>
#include <CGAL/Polyhedral_mesh_domain_with_features_3.h>
@ -42,7 +42,7 @@ int main (int argc, char** argv){
return 1;
}
C3t3 c3t3;
if(CGAL::MDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
if(CGAL::TMDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
{
for( C3t3::Triangulation::Finite_cells_iterator
cit = c3t3.triangulation().finite_cells_begin();

2
MDS_3/test/MDS_3/test_c3t3_io.cpp → TMDS_3/test/TMDS_3/test_c3t3_io.cpp
View File

@ -1,5 +1,5 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/MDS_3/io_signature.h>
#include <CGAL/TMDS_3/io_signature.h>
#include <CGAL/Mesh_triangulation_3.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/IO/File_binary_mesh_3.h>

0
MDS_3/test/MDS_3/test_c3t3_io_MEDIT.cpp → TMDS_3/test/TMDS_3/test_c3t3_io_MEDIT.cpp
View File

0
MDS_3/test/MDS_3/test_c3t3_with_features.cpp → TMDS_3/test/TMDS_3/test_c3t3_with_features.cpp
View File

0
MDS_3/test/MDS_3/test_utilities.h → TMDS_3/test/TMDS_3/test_utilities.h
View File

4
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
View File

@ -28,7 +28,7 @@
#include <utility>
#include <unordered_set>
#include <CGAL/MDS_3/tet_soup_to_c3t3.h>
#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
#include <CGAL/utility.h>
#include <CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h>
@ -109,7 +109,7 @@ public:
// finished
std::vector<Vertex_handle> new_vertices;
std::map<Facet, typename C3t3::Surface_patch_index> border_facets;
if (CGAL::MDS_3::build_triangulation(triangulation,
if (CGAL::TMDS_3::build_triangulation(triangulation,
points, finite_cells, border_facets,
new_vertices /*, verbose*/))
{