Commit Graph

50 Commits

Author SHA1 Message Date
Jane Tournois 4ebbe922bd Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	BGL/include/CGAL/boost/parameter.h
#	Installation/CHANGES.md
#	Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h

+ fix compilation
+ prepare for using detect_features
2022-11-08 16:17:33 +01:00
Sébastien Loriot 8c7a1d756f use backticks instead of \c 2022-10-04 19:24:30 +02:00
Jane Tournois bca99f4a18 add detect_features named parameter for create_labeled_image_mesh_domain_with_features
todo : move it to create_labeled_image_mesh_domain and remove
create_labeled_image_mesh_domain_with_features as soon as PR on named
parameters is merged
2022-09-27 16:17:25 +02:00
GYuvanShankar 530d6e0f78 Fixed tests not running in Mesh_3 2022-08-23 14:58:15 +05:30
GYuvanShankar 4457b05350 Removed _new prefix from named parameters 2022-06-29 17:38:54 +05:30
GYuvanShankar 60f7a5c7cf New API support and docs for Labeled_mesh_domain_3.h 2022-06-27 20:26:35 +05:30
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e4aaf2447c Fix the use of offset in Labeled_mesh_domain_3 2019-06-18 15:50:15 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 30ff350986 Deprecate Implicit_mesh_domain_3 as well 2018-05-15 15:13:04 +02:00
Laurent Rineau 82f900bcb6 Add Labeled_mesh_domain_3<K>::create_labeled_image_mesh_domain
... and deprecate `CGAL::Labeled_image_mesh_domain_3`.
2018-05-15 14:56:22 +02:00
Laurent Rineau a2a5c6ed6a Cleaning of impl. details in <CGAL/Mesh_3/Image_to_labeled_function_wrapper.h>
Now that wrapper class:
 - uses `std::function`,
 - is not longer templated by the kernel,
 - or by the image type.
2018-05-15 14:56:22 +02:00
Laurent Rineau 0d839ce60a Correct usage of Boost Parameters 2018-05-15 14:56:21 +02:00
Laurent Rineau 7e9165d78a WIP: Change the template parameters of Labeled_image_mesh_domain_3 (TODO)
TODO: document the changes, once that is over.
2018-05-15 14:56:21 +02:00
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Jane Tournois 6fc0c6c083 fix the bounding box of image domain
-1 is arbitrary and can be a lot too high compared to the scale of the image
2017-04-20 17:05:03 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Laurent Rineau 16d18351ce Add example showing how to initialize components 2016-06-15 18:10:14 +02:00
Laurent Rineau 4d38c931ce Improve the API of <CGAL/Mesh_3/polylines_to_protect.h>
Now the word type and the null functor are passed as parameters.
2016-05-20 16:52:35 +02:00
Laurent Rineau 683fa43b69 Fix -Wconversion warnings (g++-5.3.1 Fedora 23) 2016-04-21 16:41:14 +02:00
Laurent Rineau 62d1cfecbe Fix compilation errors (in the Polyhedron Demo) 2016-04-20 15:26:49 +02:00
Laurent Rineau 9eefbf3e6e Fix the ambiguous matching 2016-04-14 20:00:33 +02:00
Laurent Rineau 6e874352a9 Improve Labeled_image_mesh_domain_3
- Allow to specify which `Subdomain_index` must be considered as outside
  the domain, for `Is_in_domain`.
2016-04-14 19:45:00 +02:00
Sébastien Loriot dd8f33adc5 Merge pull request #559 from lrineau/Mesh_3-remove_estimated_bbox-lrineau
Add bbox() to MeshDomain_3
2016-01-06 14:35:01 +01:00
Laurent Rineau 2af8d42ed3 Add bbox() to MeshDomain_3 2015-12-16 11:52:52 +01:00
Jane Tournois 3f308a48af Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 2015-11-17 11:16:53 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois 039ddb0e4f Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau
Conflicts:
	.gitignore
2015-10-12 08:49:52 +01:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
Laurent Rineau cd94d98168 Revert "Revert an incorrect push I did"
This reverts commit 33cb60cc29.
2014-05-07 15:24:25 +02:00
Laurent Rineau 33cb60cc29 Revert an incorrect push I did 2014-05-07 15:18:53 +02:00
Aymeric PELLE a12fe7b728 Some classes are moved from the namespace CGAL::Mesh_3 to the namespace CGAL.
Labeled_mesh_domain_3.
Implicit_to_labeling_function_wrapper.
Implicit_vector_to_labeling_function_wrapper.
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-16 19:57:21 +02:00
Aymeric PELLE 30e71be043 Labeled_mesh_domain_3.h and Implicit_to_labeling_function_wrapper are moved.
These files are moved to Mesh_3/include/CGAL/ because they are documented,
so they can be used by users.
2014-04-07 19:12:30 +02:00
Jane Tournois 533fa556d6 reorder parameters to keep old code valid (error_bound is documented) 2014-03-25 18:21:11 +01:00
Jane Tournois 215b463812 use CGAL::Random* as member variable
it avoids using temporary CGAL::Random(0) that would be deleted
as soon as we get out of the constructor

+ make examples deterministic and tests not (all but test_meshing_determinism)
2014-03-25 17:47:15 +01:00
Jane Tournois 6521f8d474 Revert "replace CGAL::Random& by mutable CGAL::Random for member variable type"
This reverts commit 1c1b65ae39.
The random generator member variable should be a CGAL::Random&, as in generators.h and
in the STL.

Also fix two constructors
2014-03-25 12:43:53 +01:00
Jane Tournois 1c1b65ae39 replace CGAL::Random& by mutable CGAL::Random for member variable type
and make use of const everywhere else
2014-03-25 11:39:12 +01:00
Jane Tournois 6566c592c2 remove new template parameter RNG
using CGAL::Random everywhere is simpler and definitely enough
note we are using CGAL::Random& as in Random_generator_base
(see CGAL/generators.h)
2014-03-24 12:50:18 +01:00
Jane Tournois 61c245e0ea add a random number generator (RNG) template parameter to mesh domains
a default value (CGAL::Random(0)) is given to avoid non-determinism
2014-03-21 10:35:01 +01:00
Laurent Rineau e0475c4d7d Mesh_3 can now mesh 3D gray images!
Do to:
  - better testing,
  - documentation,
  - submit a small feature.
2012-03-23 14:36:40 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Andreas Fabri 480ddb54f5 Remove ';' 2010-05-14 09:46:02 +00:00
Stéphane Tayeb 1f3332bf63 Move Mesh_3 from candidate-packages to trunk (2/2) 2010-01-06 13:46:02 +00:00
Stéphane Tayeb 313a28d9a2 Move Mesh_3 from candidate-packages to trunk (1/2) 2010-01-06 13:44:50 +00:00
Stéphane Tayeb 1d8a06d401 * Code cleanup
* Minor fix in Polyhedral_mesh_domain_3: internal AABB kd-tree is now built
* Minor fix in mesh_standard_facet_criteria.h: check dimension with >2 instead of ==2 & add some assertions
* Add internal(undocumented) usefull genericity:
  + add Wrapper template parameter (with default value) in Implicit_mesh_domain_3
  + add Wrapper template parameter (with default value) in Labeled_Image_mesh_domain_3
  + add two template parameters (with defaults) in Mesh_criteria_3
2009-08-05 15:40:23 +00:00
Stéphane Tayeb fe60ae5f4e Move Mesh_3 from branches/experimental-packages to trunk. 2009-06-26 15:29:26 +00:00