Commit Graph

1036 Commits

Author SHA1 Message Date
Aymeric PELLE 9f11f46077 Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'
This small feature adds a new constructor in Labeled_mesh_domain_3 and
a new function wrapper. A Labeled_mesh_domain_3 can be built from an
Iso_cuboid_3 now.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper)
The new wrapper, Implicit_multi_domain_to_labeling_function_wrapper, is a
helping class to get a function with integer values labeling the
components of a multi-domain. This small feature was successfully tested in
the internal release CGAL-4.5-Ic-45.
Approved by the Release Manager.

Conflicts:
	Installation/changes.html
2014-05-21 18:01:42 +02:00
Laurent Rineau fd06817bd7 Fix a warning about an uninitialized variable
The warning is right, by the way.

Trivial bug-fix for master.
2014-05-21 13:00:31 +02:00
Aymeric PELLE 566ad109eb Use CGAL macros for indicating deprecated headers. 2014-05-16 13:40:49 +02:00
Aymeric PELLE b899f9f346 Fix in the CMakeLists.txt file of Mesh_3 tests. 2014-05-15 13:55:54 +02:00
Laurent Rineau 4d8d5d8123 Conditionally protect sharp features
There is now an additional checkbox in the dialog UI.
2014-05-15 12:05:38 +02:00
Laurent Rineau 9753495637 Patch_id of Polyhedron is a pair<int,int> 2014-05-15 11:32:56 +02:00
Laurent Rineau cfb1ecb2d1 Use CGAL::internal::Mesh_3::C3t3_initializer
... instead of doing the job ourselves.
2014-05-15 11:31:48 +02:00
Laurent Rineau c73f2b99a6 Useless include 2014-05-15 10:57:19 +02:00
Laurent Rineau 1ec6cd429a Be able to deal with Patch_id=pair<int,int>
So far, the files
  <CGAL/Mesh_3/Detect_features_in_polyhedra.h>
  <CGAL/Mesh_polyhedron_3.h>
were assuming that the Patch_id was an integral type. Now they assumes
that it is either an integral type, or a pair of integral types.
2014-05-15 10:57:03 +02:00
Aymeric PELLE 09e56c5bfd Fix some warnings for Windows.
In the deprecated class Implicit_vector_to_labeled_function_wrapper,
an implicit conversion from an unsigned int to a signed int caused a warning.
On windows, pragma message needs parenthesis.
2014-05-14 19:42:04 +02:00
Laurent Rineau 7889b90645 Demo: if you define
CGAL_MESH_3_DEMO_ACTIVATE_SHARP_FEATURES_IN_POLYHEDRAL_DOMAIN, the sharp
features are now detected and handled on polyhedral domains. The
drawback is that it disables the other oracles (implicit...) because
Triangulation and C3t3 are not compatible anymore (gives compilation
errors, which seem very difficult to solve).

Cherry-pick from:
  commit 416691ef8a
  Author: Clément Jamin <clement.jamin@inria.fr>
  Date:   Mon Sep 24 14:02:13 2012 +0000
from Mesh_3-parallel-cjamin
2014-05-14 15:41:54 +02:00
Aymeric PELLE 78261fcdc2 Function are wrapped into struct in two tests of Mesh_3.
Some compilers seems to not manage function reference.
2014-05-13 19:49:32 +02:00
Aymeric PELLE 0fd7474b06 Add two pragmas because the warning macro isn't available with all platforms. 2014-05-13 19:47:08 +02:00
Jane Tournois e97506adb7 Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF'
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h

This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base

It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now

Approved by the release manager
2014-05-13 14:52:13 +02:00
Laurent Rineau 80ec1ff80b Merge branch 'Mesh_3-fix_Mesh_3_CGAL_4.3-lrineau'
Fix bugs introduced in CGAL-4.3.

Tested in CGAL-4.5-Ic-35

Approved by the release manager
2014-05-12 14:42:40 +02:00
Laurent Rineau 3c3b0a013a Fix expected number of cells 2014-05-12 14:41:36 +02:00
Laurent Rineau 3224c40861 Fix the number of inserted balls
With CGAL_MESH_3_NO_PROTECTION_NON_LINEAR==1, the number of protecting
balls is higher.
2014-05-09 10:49:19 +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
Laurent Rineau bcefbcb8bd Merge remote-tracking branch 'origin/Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' into Periodic_3_mesh_3-Extended_mesh_3-MBogdanov 2014-05-07 13:56:27 +02:00
Laurent Rineau 68c367a2df Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'""
This reverts commit 2e58135751.
2014-05-07 13:56:20 +02:00
Laurent Rineau 57050c3470 Fix another bug introduced in CGAL-4.3
An assertion was added, but that assertion cannot work if the set of
initial points is collinear (dimension 1).
2014-05-07 12:05:43 +02:00
Laurent Rineau de44fdf27e Fix a bug introduced in CGAL-4.3
The Mesh_3 experimental feature "PROTECTION_NON_LINEAR" was not
correctly disabled when the development branch of Mesh_3 was merged into
CGAL-4.3.
2014-05-07 12:05:43 +02:00
Aymeric PELLE acc69fc3af Fix : modify the CMakeLists.txt file for tests of Mesh_3. 2014-04-29 21:14:57 +02:00
Aymeric PELLE 869223f06e Add an old example as a test for testing the retro-compatibility of Implicit_vector_to_labeled_function_wrapper. 2014-04-29 20:07:47 +02:00
Aymeric PELLE 0264e0a14c Add tests for old versions of Labeled_mesh_domain_3 and Implicit_vector_to_labeled_function_wrapper. 2014-04-29 19:44:09 +02:00
Aymeric PELLE 61ddfe3014 FT_to_point_function_wrapper has a new nested type : Point. 2014-04-23 19:50:07 +02:00
Aymeric PELLE d3dc9be69c Adds two compatibilty headers.
CGAL/Mesh_3/Labeled_mesh_domain_3.h
CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h

So, some branches in development using theses features won't be broken.
2014-04-16 20:05: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
Laurent Rineau 2e58135751 Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'"
This reverts commit 2ec2fb3c8e, reversing
changes made to 2ed7784521.
2014-04-16 17:37:04 +02:00
Aymeric PELLE 2ec2fb3c8e Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'
- This small feature adds a method to locate point with inexact predicates in
  Periodic_3_triangulation_3.
  (cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3)
- Tested in CGAL-4.5-Ic-12
- Approved by the Release Manager.
2014-04-16 16:22:31 +02:00
Aymeric PELLE 57a709ef09 Fix for windows : Polyline is renamed Polyline_3 in a example. 2014-04-16 13:45:59 +02:00
Aymeric PELLE 3de04a47de We construct explictly wrappers in test_labeled_mesh_domain_3. 2014-04-15 17:22:10 +02:00
Aymeric PELLE f008c28f7f The implicit wrapper had bad template parameter in test_labeled_mesh_domain_3.
Fix a warning : explicit conversion for the return value in
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-14 18:41:16 +02:00
Laurent Rineau 5a05ba0577 Fix Doxygen bug in the documentation of Mesh_triangulation_3 2014-04-14 15:22:41 +02:00
Laurent Rineau 60016bec63 Remove an extra ';', added by error in previous commits 2014-04-14 14:13:11 +02:00
Laurent Rineau e8134e5f25 Merge branch 'Mesh_3-fix_warnings-lrineau'
Fix warnings about unused variables/parameters

Use pragmas, when that is needed (for Boost named parameters)

Tested in CGAL-4.5-Ic-7.

Approved by the Release Manager.
2014-04-11 11:33:11 +02:00
Laurent Rineau cf5d6e041e Use pragmas to fix warnings 2014-04-10 20:06:04 +02:00
Aymeric PELLE 260a4b1bf3 Fix : Use CGAL::cpp11::get<> instead of the tuple::get<> method.
Indeed, tuple::get<> doen't exist for all configurations. (c++11, ...)
2014-04-09 14:18:12 +02:00
Aymeric PELLE 8ae6dd8ad4 Fix : Remove 'typename' in the test of the wrapper for multi domain. 2014-04-09 13:35:41 +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
Aymeric PELLE 477f0a4ac1 Add a test for Implicit_multi_domain_to_labeling_function_wrapper.
Fix a bug with the constructor taking one parameter only.
2014-04-01 16:30:32 +02:00
Laurent Rineau ba05c364a6 Tweak the values of the test 2014-04-01 11:51:39 +02:00
Aymeric PELLE 0e9e80b872 Point type is deduced from the ImplicitFunction in the new wrapper.
In Implicit_multi_domain_to_labeling_function_wrapper, the point
type is deduced if ImplicitFunction is a pointer function, else it must
be a nested type of ImplicitFunction.
BGT isn't required anymore for this wrapper.
The constructor of Implicit_multi_domain_to_labeling_function_wrapper taking
only one argument has a new way for auto-making the vector of vector of
positions. In this case, the union of the components equals to the union
of the functions.
2014-03-31 18:42:47 +02:00
Laurent Rineau b2dd650449 Add a new test 2014-03-31 17:52:15 +02:00
Laurent Rineau 6649036c80 Fix a bug in Mesh_3
Benjamin Kehlet reported on CGAL-discuss (Tue, 25 Mar 2014 13:45:24
+0100) that Mesh_3 was not able to mesh the simple following OFF:

OFF
4 4 0

0 0 0
0 0 1
0 1 0
1 0 0
3  3 1 2
3  0 1 3
3  0 3 2
3  0 2 1

The unit tetrahedron!!

The bug was in the robust weighted circumcenter traits. The traits
checks that the circumcenter of four points is at least in the circum
sphere of the four points. But for weighted points, that is
"power_test" that must be tested, instead of "side_of_oriented_sphere".
2014-03-31 15:44:59 +02:00
Aymeric PELLE d41b708958 Add some precision in the documentation. 2014-03-28 15:39:56 +01:00
Aymeric PELLE ae84316d52 Some correction in the documentation.
Labeled_mesh_domain_3 : LabelingFunction template parameter.
Implicit_multi_domain_to_labeling_function_wrapper :
Function template parameter.
2014-03-27 14:24:52 +01:00
Jane Tournois 673d1f03cd Merge branch 'Mesh_3-fix_set_facet_surface_center-jtournois'
This branch fixes a potential bug, that the facet surface center
is sometimes not updated properly in mirror_facet(f) when it is in f.

Tested in testsuite CGAL-4.4-Ic-155

Approved by the release manager
2014-03-27 11:16:36 +01:00
Aymeric PELLE c15ff1c19c New implementation of Implicit_multi_domain_to_labeling_function_wrapper.
The user can indicate more precisely which components he wants.
For each component that the user want, he must provide the matching
vector of signs. All these vector of positions must be put in a vector
passed as second parameter to the constructor of that wrapper.
Doc and examples are updated.
2014-03-26 19:02:27 +01:00