commit 14b0879d4763e3d3627bb4c3d5dd2fac2b3dfdd9 parent 0b0766b91d8d4168795e7ee4776ab76fd96cfec4 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Tue, 22 Jun 2021 16:49:02 +0200 Merge branch 'release_0.5.3' Diffstat:
31 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/README.md b/README.md @@ -42,6 +42,10 @@ in star-enclosures-3d but is still present in star-enclosures-2d. Release notes ------------- +### Version 0.5.3 + +- Fix API break on filter function introduced by Star-2D 0.5. + ### Version 0.5.2 - BugFix: enclosures including multiple media could end with invalid diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) |Meso|Star> 2018-2020 +# Copyright (C) 2018-2021 |Meso|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 @@ -30,7 +30,7 @@ cmake_dependent_option(HUGE_ADDITIONAL_TESTS # Check dependencies ################################################################################ find_package(RCMake 0.4 REQUIRED) -find_package(Star2D 0.3.1 REQUIRED) +find_package(Star2D 0.5 REQUIRED) find_package(RSys 0.8.1 REQUIRED) find_package(OpenMP 2.0 REQUIRED) @@ -64,7 +64,7 @@ endif() ################################################################################ set(VERSION_MAJOR 0) set(VERSION_MINOR 5) -set(VERSION_PATCH 2) +set(VERSION_PATCH 3) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SENC2D_FILES_SRC diff --git a/src/senc2d.h b/src/senc2d.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_descriptor.c b/src/senc2d_descriptor.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_device.c b/src/senc2d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_device_c.h b/src/senc2d_device_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_enclosure.c b/src/senc2d_enclosure.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_enclosure_c.h b/src/senc2d_enclosure_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_enclosure_data.h b/src/senc2d_enclosure_data.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_internal_types.h b/src/senc2d_internal_types.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_sXd_helper.h b/src/senc2d_sXd_helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_scene.c b/src/senc2d_scene.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_scene_analyze.c b/src/senc2d_scene_analyze.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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 @@ -120,6 +120,7 @@ self_hit_filter (const struct s2d_hit* hit, const float ray_org[2], const float ray_dir[2], + const float ray_range[2], void* ray_data, void* filter_data) { @@ -127,7 +128,7 @@ self_hit_filter const component_id_t* origin_component = ray_data; const struct segment_comp* hit_seg_comp; - (void)ray_org; (void)ray_dir; + (void)ray_org; (void)ray_dir; (void)ray_range; ASSERT(hit && segments_comp && origin_component); ASSERT(hit->prim.prim_id < darray_segment_comp_size_get(segments_comp)); hit_seg_comp = darray_segment_comp_cdata_get(segments_comp) diff --git a/src/senc2d_scene_analyze_c.h b/src/senc2d_scene_analyze_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_scene_c.h b/src/senc2d_scene_c.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/senc2d_side_range.h b/src/senc2d_side_range.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/sencX2d.h b/src/sencX2d.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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/sencX2d_undefs.h b/src/sencX2d_undefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_device.c b/src/test_senc2d_device.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_enclosure.c b/src/test_senc2d_enclosure.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_inconsistant_square.c b/src/test_senc2d_inconsistant_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_sample_enclosure.c b/src/test_senc2d_sample_enclosure.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_scene.c b/src/test_senc2d_scene.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_some_enclosures.c b/src/test_senc2d_some_enclosures.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_some_segments.c b/src/test_senc2d_some_segments.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_square_behind_square.c b/src/test_senc2d_square_behind_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_square_in_square.c b/src/test_senc2d_square_in_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_square_on_square.c b/src/test_senc2d_square_on_square.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_unspecified_medium.c b/src/test_senc2d_unspecified_medium.c @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_utils.h b/src/test_senc2d_utils.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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_senc2d_utils2.h b/src/test_senc2d_utils2.h @@ -1,4 +1,4 @@ -/* Copyright (C) |Meso|Star> 2018-2020 (contact@meso-star.com) +/* Copyright (C) 2018-2021 |Meso|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