songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
65,850 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
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