commit 1065ebe3df6676cbf17abdc03c97c499953b0ecc parent 7a1ab421139b82d08edbcb6d2cd1138800bf95bc Author: Vincent Forest <vincent.forest@meso-star.com> Date: Tue, 25 Apr 2023 12:01:18 +0200 Merge branch 'release_0.1.1' Diffstat:
49 files changed, 66 insertions(+), 73 deletions(-)
diff --git a/README.md b/README.md @@ -1,5 +1,4 @@ -Star-geometry-2d -================ +# Star-geometry-2d The purpose of this library is to help create clean and decorated 2D geometries. These geometries are suitable to be partitioned into @@ -8,8 +7,7 @@ mechanisms to construct segment-related app data, detect inconsistencies and dump the resulting geometry in various formats (OBJ, VTK, C code chunks). -How to build ------------- +## How to build Star-geometry-2d relies on the [CMake](http://www.cmake.org) and the [RCMake](https://gitlab.com/vaplv/rcmake/) package to build. It also @@ -21,23 +19,25 @@ the aforementioned prerequisites. Finally generate the project from the `cmake/CMakeLists.txt` file by appending to the `CMAKE_PREFIX_PATH` variable the install directories of its dependencies. -Release notes -------------- +## Release notes + +### Version 0.1.1 + +- Fixed help headers failing to compile when included in C++ files. +- Fixed a typo in the `sgX2d.h` header apparently due to fingers getting + tangled on the keyboard. ### Version 0.1 First version and implementation of the star-geometry-2d API. -- Creation of geometries in multiple steps, allowing advanced - deduplication and application-data management - -- Dump of geometries as OBJ or VTK files or as C code chunks +- Creation of geometries in multiple steps, allowing advanced + deduplication and application-data management +- Dump of geometries as OBJ or VTK files or as C code chunks -License -------- +## License -Star-geometry-2d is Copyright (C) 2019-2020 |Meso|Star> -(<a href="mailto:contact@meso-star.com" class="email">contact@meso-star.com</a>). -It is free software released under the GPLv3+ license: GNU GPL -version 3 or later. You are welcome to redistribute it under certain -conditions; refer to the COPYING files for details. +Copyright © 2019, 2020, 2023 [|Méso|Star>](https://www.meso-star.com) +(<contact@meso-star.com>). It is free software released under the GPLv3+ +license: GNU GPL version 3 or later. You are welcome to redistribute it under +certain conditions; refer to the COPYING files for details. diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2020 |Meso|Star> +# Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys StarEnc) ################################################################################ set(VERSION_MAJOR 0) set(VERSION_MINOR 1) -set(VERSION_PATCH 0) +set(VERSION_PATCH 1) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SG2D_FILES_SRC diff --git a/src/sg2.h b/src/sg2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_device.c b/src/sg2_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_device.h b/src/sg2_device.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_geometry.c b/src/sg2_geometry.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_geometry.h b/src/sg2_geometry.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_misc.h b/src/sg2_misc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_s2d_helper.h b/src/sg2_s2d_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2_senc2d_helper.h b/src/sg2_senc2d_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d.h b/src/sg2d.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_device.c b/src/sg2d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_device.h b/src/sg2d_device.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_geometry.c b/src/sg2d_geometry.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_geometry.h b/src/sg2d_geometry.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_misc.h b/src/sg2d_misc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sg2d_sXd_helper.h b/src/sg2d_sXd_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,6 +60,4 @@ sg2d_sXd_geometry_get_position FOR_EACH(i, 0, SG2D_GEOMETRY_DIMENSION) coord[i] = (float)tmp[i]; } -END_DECLS - #endif /* SG2D_S2D_HELPER_H__ */ diff --git a/src/sg2d_sdisXd_helper.h b/src/sg2d_sdisXd_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -70,6 +70,4 @@ sg2d_sdisXd_geometry_get_interface *bound = ctx->app_interface_getter(itri, ctx->app_interface_data); } -END_DECLS - #endif /* SG2D_SDISXD_HELPER_H__ */ diff --git a/src/sg2d_sencXd_helper.h b/src/sg2d_sencXd_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,6 +65,4 @@ sg2d_sencXd_geometry_get_position SG2D(geometry_get_unique_vertex(geometry, ivert, coord)); } -END_DECLS - #endif /* SG2D_SENC2D_HELPER_H__ */ diff --git a/src/sgX2.h b/src/sgX2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sgX2d.h b/src/sgX2d.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,7 +31,6 @@ #endif #ifndef SGXD_ #define SGXD_(Name) CONCAT(CONCAT(CONCAT(SGX, SGXD_DIM), D_), Name) -#endif), D_), Name) #endif /* Function names that require dedicated macros */ diff --git a/src/sgX2d_undefs.h b/src/sgX2d_undefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_device.c b/src/test_sg2_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_geometry.c b/src/test_sg2_geometry.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_geometry_2.c b/src/test_sg2_geometry_2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_many_enclosures.c b/src/test_sg2_many_enclosures.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_many_segments.c b/src/test_sg2_many_segments.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_some_enclosures.c b/src/test_sg2_some_enclosures.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_some_segments.c b/src/test_sg2_some_segments.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_square_behind_square.c b/src/test_sg2_square_behind_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_square_in_square.c b/src/test_sg2_square_in_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_square_on_square.c b/src/test_sg2_square_on_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_unspecified_properties.c b/src/test_sg2_unspecified_properties.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_utils.h b/src/test_sg2_utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2_utils2.h b/src/test_sg2_utils2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_device.c b/src/test_sg2d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_geometry.c b/src/test_sg2d_geometry.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_geometry_2.c b/src/test_sg2d_geometry_2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_invalid_models.c b/src/test_sg2d_invalid_models.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_many_enclosures.c b/src/test_sg2d_many_enclosures.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_many_segments.c b/src/test_sg2d_many_segments.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_some_enclosures.c b/src/test_sg2d_some_enclosures.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_some_segments.c b/src/test_sg2d_some_segments.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_square_behind_square.c b/src/test_sg2d_square_behind_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_square_in_square.c b/src/test_sg2d_square_in_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_square_on_square.c b/src/test_sg2d_square_on_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_unspecified_properties.c b/src/test_sg2d_unspecified_properties.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_utils.h b/src/test_sg2d_utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test_sg2d_utils2.h b/src/test_sg2d_utils2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 |Meso|Star> (contact@meso-star.com) +/* Copyright (C) 2019, 2020, 2023 |Méso|Star> (contact@meso-star.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by