diff --git a/Installation/include/CGAL/license/Polygon_extrusion.h b/Installation/include/CGAL/license/Polygon_extrusion.h deleted file mode 100644 index def383e7a95..00000000000 --- a/Installation/include/CGAL/license/Polygon_extrusion.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2016 GeometryFactory SARL (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Andreas Fabri -// -// Warning: this file is generated, see include/CGAL/license/README.md - -#ifndef CGAL_LICENSE_POLYGON_EXTRUSION_H -#define CGAL_LICENSE_POLYGON_EXTRUSION_H - -#include -#include - -#ifdef CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE - -# if CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE - -# if defined(CGAL_LICENSE_WARNING) - - CGAL_pragma_warning("Your commercial license for CGAL does not cover " - "this release of the 2D Polygon Extrusion package.") -# endif - -# ifdef CGAL_LICENSE_ERROR -# error "Your commercial license for CGAL does not cover this release \ - of the 2D Polygon Extrusion package. \ - You get this error, as you defined CGAL_LICENSE_ERROR." -# endif // CGAL_LICENSE_ERROR - -# endif // CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE - -#else // no CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE - -# if defined(CGAL_LICENSE_WARNING) - CGAL_pragma_warning("\nThe macro CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE is not defined." - "\nYou use the CGAL 2D Polygon Extrusion package under " - "the terms of the GPLv3+.") -# endif // CGAL_LICENSE_WARNING - -# ifdef CGAL_LICENSE_ERROR -# error "The macro CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL 2D Polygon Extrusion package under the terms of \ - the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." -# endif // CGAL_LICENSE_ERROR - -#endif // no CGAL_POLYGON_EXTRUSION_COMMERCIAL_LICENSE - -#endif // CGAL_LICENSE_POLYGON_EXTRUSION_H diff --git a/Installation/include/CGAL/license/Straight_skeleton_extrusion_2.h b/Installation/include/CGAL/license/Straight_skeleton_extrusion_2.h new file mode 100644 index 00000000000..5b9090b21d6 --- /dev/null +++ b/Installation/include/CGAL/license/Straight_skeleton_extrusion_2.h @@ -0,0 +1,54 @@ +// Copyright (c) 2016 GeometryFactory SARL (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org) +// +// $URL$ +// $Id$ +// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial +// +// Author(s) : Andreas Fabri +// +// Warning: this file is generated, see include/CGAL/license/README.md + +#ifndef CGAL_LICENSE_STRAIGHT_SKELETON_EXTRUSION_2_H +#define CGAL_LICENSE_STRAIGHT_SKELETON_EXTRUSION_2_H + +#include +#include + +#ifdef CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE + +# if CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE + +# if defined(CGAL_LICENSE_WARNING) + + CGAL_pragma_warning("Your commercial license for CGAL does not cover " + "this release of the 2D Straight Skeleton Extrusion package.") +# endif + +# ifdef CGAL_LICENSE_ERROR +# error "Your commercial license for CGAL does not cover this release \ + of the 2D Straight Skeleton Extrusion package. \ + You get this error, as you defined CGAL_LICENSE_ERROR." +# endif // CGAL_LICENSE_ERROR + +# endif // CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE + +#else // no CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE + +# if defined(CGAL_LICENSE_WARNING) + CGAL_pragma_warning("\nThe macro CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE is not defined." + "\nYou use the CGAL 2D Straight Skeleton Extrusion package under " + "the terms of the GPLv3+.") +# endif // CGAL_LICENSE_WARNING + +# ifdef CGAL_LICENSE_ERROR +# error "The macro CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE is not defined.\ + You use the CGAL 2D Straight Skeleton Extrusion package under the terms of \ + the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." +# endif // CGAL_LICENSE_ERROR + +#endif // no CGAL_STRAIGHT_SKELETON_EXTRUSION_2_COMMERCIAL_LICENSE + +#endif // CGAL_LICENSE_STRAIGHT_SKELETON_EXTRUSION_2_H diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt index edafb745573..cd274cf329b 100644 --- a/Installation/include/CGAL/license/gpl_package_list.txt +++ b/Installation/include/CGAL/license/gpl_package_list.txt @@ -45,7 +45,6 @@ Point_set_2 2D Range and Neighbor Search Point_set_3 3D Point Set Point_set_processing_3 Point Set Processing Poisson_surface_reconstruction_3 Poisson Surface Reconstruction -Polygon_extrusion 2D Polygon Extrusion Polygon_mesh_processing Polygon Mesh Processing Polygon_mesh_processing/Compute_normal Polygon Mesh Processing - Normal Computation Polygon_mesh_processing/connected_components Polygon Mesh Processing - Connected Components @@ -78,6 +77,7 @@ Skin_surface_3 3D Skin Surface Meshing Snap_rounding_2 2D Snap Rounding Spatial_searching dD Spatial Searching Straight_skeleton_2 2D Straight Skeleton and Polygon Offsetting +Straight_skeleton_extrusion_2 2D Straight Skeleton Extrusion Stream_lines_2 2D Placement of Streamlines Surface_mesh_deformation Triangulated Surface Mesh Deformation Surface_mesher 3D Surface Mesh Generation diff --git a/Polygon_extrusion/examples/Polygon_extrusion/CMakeLists.txt b/Polygon_extrusion/examples/Polygon_extrusion/CMakeLists.txt deleted file mode 100644 index 41f945678f9..00000000000 --- a/Polygon_extrusion/examples/Polygon_extrusion/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Created by the script cgal_create_cmake_script -# This is the CMake script for compiling a CGAL application. - -cmake_minimum_required(VERSION 3.1...3.23) -project(Polygon_extrusion_Examples) - -find_package(CGAL REQUIRED COMPONENTS Qt5 Core) - -include_directories(BEFORE "include") - -# create a target per cppfile -file( - GLOB cppfiles - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) -foreach(cppfile ${cppfiles}) - create_single_source_cgal_program("${cppfile}") -endforeach() - -if(CGAL_Qt5_FOUND) - target_link_libraries(extrude_skeleton PUBLIC CGAL::CGAL_Basic_viewer) -endif() diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt b/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt index 031c2f44a87..a035d036665 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt @@ -10,7 +10,7 @@ /// \defgroup PkgStraightSkeleton2Auxiliary Auxiliary Classes /// \ingroup PkgStraightSkeleton2Ref -/// \defgroup PkgStraightSkeleton2Extrusion Polygon Extrusion +/// \defgroup PkgStraightSkeleton2Extrusion Skeleton Extrusion /// \ingroup PkgStraightSkeleton2Ref /// /// The following functions are used to construct the skeleton extrusion of a polygon. @@ -171,7 +171,7 @@ - `CGAL::create_exterior_weighted_skeleton_and_offset_polygons_with_holes_2()` - `CGAL::create_offset_polygons_2()` -\cgalCRPSection{Polygon Extrusion} +\cgalCRPSection{Skeleton Extrusion} - `CGAL::extrude_skeleton()` \cgalCRPSection{Lower Level API} diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt index a77d3cc0258..5d89655fb7f 100644 --- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt @@ -4,9 +4,10 @@ cmake_minimum_required(VERSION 3.1...3.23) project( Straight_skeleton_2_Examples ) - find_package(CGAL REQUIRED COMPONENTS Qt5 Core) +include_directories(BEFORE include) + # create a target per cppfile file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) foreach(cppfile ${cppfiles}) @@ -19,6 +20,7 @@ if(CGAL_Qt5_FOUND) target_link_libraries(Create_straight_skeleton_2 PUBLIC CGAL::CGAL_Basic_viewer) target_link_libraries(Show_offset_polygon PUBLIC CGAL::CGAL_Basic_viewer) target_link_libraries(Show_straight_skeleton PUBLIC CGAL::CGAL_Basic_viewer) + target_link_libraries(extrude_skeleton PUBLIC CGAL::CGAL_Basic_viewer) else() message(STATUS "NOTICE: The example 'draw_straight_skeleton_2' requires Qt and will not be compiled.") endif() diff --git a/Polygon_extrusion/examples/Polygon_extrusion/data/serpent.dat b/Straight_skeleton_2/examples/Straight_skeleton_2/data/serpent.dat similarity index 100% rename from Polygon_extrusion/examples/Polygon_extrusion/data/serpent.dat rename to Straight_skeleton_2/examples/Straight_skeleton_2/data/serpent.dat diff --git a/Polygon_extrusion/examples/Polygon_extrusion/data/serpent_angles.dat b/Straight_skeleton_2/examples/Straight_skeleton_2/data/serpent_angles.dat similarity index 100% rename from Polygon_extrusion/examples/Polygon_extrusion/data/serpent_angles.dat rename to Straight_skeleton_2/examples/Straight_skeleton_2/data/serpent_angles.dat diff --git a/Polygon_extrusion/examples/Polygon_extrusion/extrude_skeleton.cpp b/Straight_skeleton_2/examples/Straight_skeleton_2/extrude_skeleton.cpp similarity index 99% rename from Polygon_extrusion/examples/Polygon_extrusion/extrude_skeleton.cpp rename to Straight_skeleton_2/examples/Straight_skeleton_2/extrude_skeleton.cpp index 0e075e6f917..a8986b50fc3 100644 --- a/Polygon_extrusion/examples/Polygon_extrusion/extrude_skeleton.cpp +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/extrude_skeleton.cpp @@ -1,5 +1,3 @@ -#define CGAL_SLS_DEBUG_DRAW - #include #include #include @@ -184,4 +182,4 @@ int main(int argc, char** argv) CGAL::IO::write_polygon_mesh("extruded_skeleton.off", sm, CGAL::parameters::stream_precision(17)); return EXIT_SUCCESS; -} \ No newline at end of file +} diff --git a/Polygon_extrusion/examples/Polygon_extrusion/include/CGAL/input_helpers.h b/Straight_skeleton_2/examples/Straight_skeleton_2/include/CGAL/input_helpers.h similarity index 97% rename from Polygon_extrusion/examples/Polygon_extrusion/include/CGAL/input_helpers.h rename to Straight_skeleton_2/examples/Straight_skeleton_2/include/CGAL/input_helpers.h index c1cd45d2aeb..9602f290093 100644 --- a/Polygon_extrusion/examples/Polygon_extrusion/include/CGAL/input_helpers.h +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/include/CGAL/input_helpers.h @@ -3,8 +3,8 @@ // // This file is part of CGAL (www.cgal.org). -#ifndef CGAL_POLYGON_EXTRUSION_INPUT_HELPERS_H -# define CGAL_POLYGON_EXTRUSION_INPUT_HELPERS_H +#ifndef CGAL_STRAIGHT_SKELETON_EXTRUSION_INPUT_HELPERS_H +# define CGAL_STRAIGHT_SKELETON_EXTRUSION_INPUT_HELPERS_H #include #include @@ -253,4 +253,4 @@ void generate_random_weights(const PolygonWithHoles& p, speeds.push_back(generate_range_weights(*hit)); } -#endif // CGAL_POLYGON_EXTRUSION_INPUT_HELPERS_H +#endif // CGAL_STRAIGHT_SKELETON_EXTRUSION_INPUT_HELPERS_H diff --git a/Polygon_extrusion/include/CGAL/extrude_skeleton.h b/Straight_skeleton_extrusion_2/include/CGAL/extrude_skeleton.h similarity index 98% rename from Polygon_extrusion/include/CGAL/extrude_skeleton.h rename to Straight_skeleton_extrusion_2/include/CGAL/extrude_skeleton.h index fa3f4490d53..b0b5c2a283b 100644 --- a/Polygon_extrusion/include/CGAL/extrude_skeleton.h +++ b/Straight_skeleton_extrusion_2/include/CGAL/extrude_skeleton.h @@ -10,12 +10,12 @@ // Author(s) : Mael Rouxel-Labbé // -#ifndef CGAL_POLYGON_EXTRUSION_EXTRUDE_SKELETON_H -#define CGAL_POLYGON_EXTRUSION_EXTRUDE_SKELETON_H +#ifndef CGAL_SLS_EXTRUSION_EXTRUDE_SKELETON_H +#define CGAL_SLS_EXTRUSION_EXTRUDE_SKELETON_H #define CGAL_SLS_OUTPUT_FILES -#include +#include #ifdef CGAL_SLS_DEBUG_DRAW #include @@ -65,7 +65,7 @@ #include namespace CGAL { -namespace Polygon_extrusions { +namespace Straight_skeleton_extrusion { namespace internal { //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1048,7 +1048,7 @@ bool extrude_skeleton(const PolygonWithHoles& pwh, } } // namespace internal -} // namespace Polygon_extrusions +} // namespace Straight_skeleton_extrusion // Documented in the Straight_skeleton_2 package template ::value>* = nullptr) { - namespace PEI = Polygon_extrusions::internal; + namespace SSEI = Straight_skeleton_extrusion::internal; using Polygon_2 = typename PolygonWithHoles::General_polygon_2; using K = typename Kernel_traits::type>::type; @@ -1079,14 +1079,14 @@ bool extrude_skeleton(const PolygonWithHoles& pwh, { // not using "Angles" here is on purpose, I want to copy the range but the NP is ref only auto weights = choose_parameter(get_parameter_reference(np, internal_np::weights_param), def_speeds); - return PEI::extrude_skeleton(pwh, weights, out, np); + return SSEI::extrude_skeleton(pwh, weights, out, np); } else if(has_angles) { // not using "Weights" here is on purpose, I want to copy the range but the NP is ref only auto angles = choose_parameter(get_parameter_reference(np, internal_np::angles_param), def_speeds); - PEI::convert_angles(angles); - return PEI::extrude_skeleton(pwh, angles, out, np); + SSEI::convert_angles(angles); + return SSEI::extrude_skeleton(pwh, angles, out, np); } else // neither angles nor weights were provided { @@ -1097,7 +1097,7 @@ bool extrude_skeleton(const PolygonWithHoles& pwh, for(const auto& hole : pwh.holes()) uniform_weights.push_back(std::vector(hole.size(), FT(1))); - return PEI::extrude_skeleton(pwh, uniform_weights, out, np); + return SSEI::extrude_skeleton(pwh, uniform_weights, out, np); } } @@ -1120,4 +1120,4 @@ bool extrude_skeleton(const Polygon& p, } // namespace CGAL -#endif // CGAL_POLYGON_EXTRUSION_EXTRUDE_SKELETON_H +#endif // CGAL_SLS_EXTRUSION_EXTRUDE_SKELETON_H diff --git a/Polygon_extrusion/package_info/Polygon_extrusion/copyright b/Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/copyright similarity index 100% rename from Polygon_extrusion/package_info/Polygon_extrusion/copyright rename to Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/copyright diff --git a/Polygon_extrusion/package_info/Polygon_extrusion/dependencies b/Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/dependencies similarity index 100% rename from Polygon_extrusion/package_info/Polygon_extrusion/dependencies rename to Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/dependencies diff --git a/Polygon_extrusion/package_info/Polygon_extrusion/description.txt b/Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/description.txt similarity index 100% rename from Polygon_extrusion/package_info/Polygon_extrusion/description.txt rename to Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/description.txt diff --git a/Polygon_extrusion/package_info/Polygon_extrusion/license.txt b/Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/license.txt similarity index 100% rename from Polygon_extrusion/package_info/Polygon_extrusion/license.txt rename to Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/license.txt diff --git a/Polygon_extrusion/package_info/Polygon_extrusion/maintainer b/Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/maintainer similarity index 100% rename from Polygon_extrusion/package_info/Polygon_extrusion/maintainer rename to Straight_skeleton_extrusion_2/package_info/Straight_skeleton_extrusion_2/maintainer diff --git a/Polygon_extrusion/test/Polygon_extrusion/CMakeLists.txt b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt similarity index 92% rename from Polygon_extrusion/test/Polygon_extrusion/CMakeLists.txt rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt index b7efbcfe707..f29dcb4e929 100644 --- a/Polygon_extrusion/test/Polygon_extrusion/CMakeLists.txt +++ b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt @@ -2,7 +2,7 @@ # This is the CMake script for compiling a CGAL application. cmake_minimum_required(VERSION 3.1...3.23) -project(Polygon_extrusion_Tests) +project(Straight_skeleton_extrusion_2_Tests) find_package(CGAL REQUIRED COMPONENTS Qt5 Core) diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_000.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_000.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_000.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_000.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_001.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_001.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_001.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_001.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_002.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_002.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_002.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_002.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_003.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_003.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_003.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_003.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_004.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_004.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_004.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_004.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_005.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_005.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_005.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_005.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_006.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_006.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_006.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_006.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_007.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_007.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_007.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_007.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_008.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_008.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_008.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_008.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_009.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_009.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_009.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_009.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_010.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_010.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_010.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_010.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_011.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_011.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_011.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_011.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_012.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_012.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_012.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_012.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_013.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_013.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_013.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_013.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_014.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_014.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_014.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_014.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_015.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_015.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_015.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_015.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_016.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_016.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_016.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_016.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_017.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_017.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_017.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_017.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_018.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_018.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_018.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_018.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_019.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_019.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_019.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_019.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_020.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_020.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_020.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_020.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_021.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_021.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_021.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_021.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/angles_022.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_022.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/angles_022.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/angles_022.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_000.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_000.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_000.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_000.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_001.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_001.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_001.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_001.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_002.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_002.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_002.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_002.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_003.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_003.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_003.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_003.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_004.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_004.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_004.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_004.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_005.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_005.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_005.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_005.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_006.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_006.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_006.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_006.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_007.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_007.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_007.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_007.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_008.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_008.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_008.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_008.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_009.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_009.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_009.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_009.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_010.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_010.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_010.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_010.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_011.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_011.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_011.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_011.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_012.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_012.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_012.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_012.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_013.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_013.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_013.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_013.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_014.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_014.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_014.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_014.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_015.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_015.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_015.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_015.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_016.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_016.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_016.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_016.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_017.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_017.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_017.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_017.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_018.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_018.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_018.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_018.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_019.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_019.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_019.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_019.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_020.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_020.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_020.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_020.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_021.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_021.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_021.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_021.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/data/polygon_022.dat b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_022.dat similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/data/polygon_022.dat rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/data/polygon_022.dat diff --git a/Polygon_extrusion/test/Polygon_extrusion/test_sls_extrude.cpp b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/test_sls_extrude.cpp similarity index 100% rename from Polygon_extrusion/test/Polygon_extrusion/test_sls_extrude.cpp rename to Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/test_sls_extrude.cpp diff --git a/copyright b/copyright index 7e5ff83f2f0..68da331f820 100644 --- a/copyright +++ b/copyright @@ -109,7 +109,6 @@ R = RU Groningen Poisson_surface_reconstruction_3 I Polygon ETIMU Polygonal_surface_reconstruction Liangliang Nan - Polygon_extrusion G Polygon_mesh_processing G Polyhedron E Polyline_simplification_2 G @@ -139,6 +138,7 @@ R = RU Groningen Spatial_sorting I STL_Extension ETIMU Straight_skeleton_2 G + Straight_skeleton_extrusion_2 G Stream_lines_2 I Stream_support ETIMU Subdivision_method_3 G