commit f11bf2c0090a48843acb2456da34c83c44f57c14
parent f575562b53d37e452db8df6054a89f0ac64ce54e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 25 Apr 2023 11:40:32 +0200
Merge branch 'release_0.1.1'
Diffstat:
28 files changed, 46 insertions(+), 53 deletions(-)
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-Star-geometry-3d
-================
+# Star-geometry-3d
The purpose of this library is to help create clean and decorated 3D
geometries. These geometries are suitable to be partitioned into
@@ -8,8 +7,7 @@ mechanisms to construct triangle-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-3d relies on the [CMake](http://www.cmake.org) and the
[RCMake](https://gitlab.com/vaplv/rcmake/) package to build and
@@ -23,23 +21,24 @@ 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 compilation warnings detected by GCC 11.
### Version 0.1
First version and implementation of the star-geometry-3d 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-3d is Copyright (C) 2019-2020 |Meso|Star>
-(<a href="mailto:contact@meso-star.com" class="email">contact@meso-star.com</a>).
-Itis 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
@@ -62,7 +62,7 @@ endif()
################################################################################
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(SG3D_FILES_SRC
@@ -141,7 +141,7 @@ if(NOT NO_TEST)
build_test(${_name} ${ARGN})
register_test(${_name} ${_name})
endfunction()
-
+
new_test(test_sg3d_device)
new_test(test_sg3d_geometry)
new_test(test_sg3d_geometry_2)
diff --git a/src/sg3d.h b/src/sg3d.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/sg3d_device.c b/src/sg3d_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/sg3d_device.h b/src/sg3d_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/sg3d_geometry.c b/src/sg3d_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/sg3d_geometry.h b/src/sg3d_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/sg3d_misc.h b/src/sg3d_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/sg3d_sXd_helper.h b/src/sg3d_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
@@ -52,6 +52,4 @@ sg3d_sXd_geometry_get_position
FOR_EACH(i, 0, SG3D_GEOMETRY_DIMENSION) coord[i] = (float)tmp[i];
}
-END_DECLS
-
#endif /* SG3D_S3D_HELPER_H__ */
diff --git a/src/sg3d_sdisXd_helper.h b/src/sg3d_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 @@ sg3d_sdisXd_geometry_get_interface
*bound = ctx->app_interface_getter(itri, ctx->app_interface_data);
}
-END_DECLS
-
#endif /* SG3D_SDIS3D_HELPER_H__ */
diff --git a/src/sg3d_sencXd_helper.h b/src/sg3d_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 @@ sg3d_sencXd_geometry_get_position
SG3D(geometry_get_unique_vertex(geometry, ivert, coord));
}
-END_DECLS
-
#endif /* SG2_SENC3D_HELPER_H__ */
diff --git a/src/sgX3d.h b/src/sgX3d.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/sgX3d_undefs.h b/src/sgX3d_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_sg3d_cube_behind_cube.c b/src/test_sg3d_cube_behind_cube.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_sg3d_cube_in_cube.c b/src/test_sg3d_cube_in_cube.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_sg3d_cube_on_cube.c b/src/test_sg3d_cube_on_cube.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_sg3d_device.c b/src/test_sg3d_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_sg3d_geometry.c b/src/test_sg3d_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_sg3d_geometry_2.c b/src/test_sg3d_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_sg3d_invalid_models.c b/src/test_sg3d_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_sg3d_many_enclosures.c b/src/test_sg3d_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_sg3d_many_triangles.c b/src/test_sg3d_many_triangles.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_sg3d_multi_media.c b/src/test_sg3d_multi_media.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_sg3d_some_enclosures.c b/src/test_sg3d_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_sg3d_some_triangles.c b/src/test_sg3d_some_triangles.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_sg3d_unspecified_properties.c b/src/test_sg3d_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_sg3d_utils.h b/src/test_sg3d_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
@@ -54,7 +54,7 @@ static const double cube_vertices[8/*#vertices*/ * 3/*#coords per vertex*/] = {
0.0, 1.0, 1.0,
1.0, 1.0, 1.0
};
-static const unsigned nvertices = sizeof(cube_vertices) / sizeof(double[3]);
+static const unsigned nvertices = sizeof(cube_vertices) / (3*sizeof(double));
/* Distorded cube */
static const double box_vertices[8/*#vertices*/ * 3/*#coords per vertex*/] = {
0.1, 0.0, 0.0,
diff --git a/src/test_sg3d_utils2.h b/src/test_sg3d_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
