e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
88a66a5780
Remove get_ prefix
2014-05-22 19:10:50 +02:00
157cd0465f
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
Mesh_3/include/CGAL/Mesh_3/config.h
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/include/CGAL/exude_mesh_3.h
Mesh_3/test/Mesh_3/test_meshing_utilities.h
Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
777b7e8800
Fix whitespace, in three lines
2014-02-03 17:44:27 +01:00
9fd6f2c539
Fix a compilation error
...
When CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3 is not defined (it is
defined by default by <CGAL/Mesh_3/config.h>), there was a compilation
error.
2014-02-03 17:40:41 +01:00
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
3f88b4d746
Merge remote-tracking branch 'origin/Mesh_3-fix_perturber-GF'
...
- In Mesh_3, fix the sliver perturber
- the invalidatation of caches,
- the topological check (in check_surface_mesh) was not enough.
Tested in CGAL-4.3-Ic-194
2013-10-09 14:51:32 +02:00
f06d2057d6
Uniformize my uses of std::setprecision
2013-09-27 17:58:00 +02:00
a05c50e83a
fix backward compatibility of Mesh_3 with intersection API v1
2013-09-25 18:13:11 +02:00
41929ed520
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/dont_submit
Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
838439b038
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d.h
Installation/cmake/modules/FindTBB.cmake
Installation/cmake/modules/UseTBB.cmake
Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h
Mesh_3/doc/Mesh_3/Mesh_3.txt
Mesh_3/include/CGAL/Mesh_triangulation_3.h
Surface_mesher/doc/Surface_mesher/Surface_mesher.txt
2013-07-11 09:58:51 +02:00
2dbf0b4bf7
the grid to do inside-test is no longer needed, a better version is now used
...
the old code can still be accessed in the file:
Operations_on_polyhedra/include/CGAL/Point_inside_polyhedron_3_old.h
2013-07-10 10:42:07 +02:00
20446fa777
Merge branch 'Mesh_3-using_new_inside_polyhedron-local'
...
Successfully tested in CGAL-4.3-Ic-85
Approved by the release manager
Conflicts:
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-07-09 17:34:15 +02:00
206b20bc15
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-07-02 17:37:50 +02:00
4620b38ffd
update include path
2013-06-24 17:27:41 +02:00
5411669c88
Integrate point inside query to Polyhedral_mesh_domain_3
2013-06-24 13:38:44 +02:00
02bdcc8603
Revert "remove Robust_intersection_traits_new"
...
This reverts commit 77b6b2e008
2013-06-21 12:42:12 +02:00
77b6b2e008
remove Robust_intersection_traits_new
2013-06-21 12:39:52 +02:00
483440c8f2
use new return type of intersection
2013-06-21 12:39:20 +02:00
404f2e0e3c
merge
2013-06-21 10:01:19 +01:00
75ebdeaeeb
update the replacement of Object_and_primitive_id ...
...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >
The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
3eae2927e7
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-03-04 15:50:57 +01:00
bc7e2a1d71
Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' into Mesh_3-improvements-GF-new
...
Mesh_3-improvements-GF-new is fresh fork of master
Conflicts:
.gitattributes
AABB_tree/include/CGAL/AABB_tree.h
GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-02-28 17:10:16 +01:00
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
1ca7174e01
Merge from Mesh_3-improvements-GF
...
+ some bugfixes (most of them are related to the parallel version)
This version works (sequential and parallel) as long as the following macros are NOT defined:
* CGAL_COMPACT_MESH_VERTEX_CELL
* CGAL_INTRUSIVE_LIST
* FORCE_STRUCTURAL_FILTERING
2012-10-16 14:02:16 +00:00
824e8060fe
fix typo when CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS is not defined
2012-10-16 09:59:44 +00:00
44f4a1a5c7
fix Construct_initial_points in Polyhedral_mesh_domain_3. In some numerically degenerate cases, it can be that there is no intersection point
2012-10-16 09:53:14 +00:00
2366fee1e1
Merge from next
2012-09-28 14:51:02 +00:00
7ce332af96
Removed the "CGAL_MESH_3_INITIAL_POINTS_NO_RANDOM_SHOOTING" part (I switched to another technique)
2012-09-05 13:50:20 +00:00
c58bd4f8fb
Merge from next up to revision 70936
2012-08-02 12:18:09 +00:00
db194534c7
First big patch to fix -Wunused-local-typedefs
...
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
by -Wall since gcc-4.8 (not yet released).
The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
2012-08-01 13:29:16 +00:00
15d1ed2a98
r58679 from Mesh_3-experimental-GF
...
Avoid a call to do_intersect: call intersection directly
2012-07-27 14:46:10 +00:00
59d97a0caf
r66818 from Mesh_3-experimental-GF
...
Modify the use of macros
The semantic of CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS is split into
two macros:
- CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS itself,
- CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3
A new file <CGAL/Mesh_3/config.h> is now responsible for the logic like "if
that macro is enabled, then enable that one too".
2012-07-24 13:09:04 +00:00
b96ce91267
r66740 from Mesh_3-experimental-GF
...
Protect the use of Robust_intersection_traits_3_new by a macro
The macro is named CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAIT.
I have also extended the error message we got if there is a problem with
the intersection returned by the AABB tree.
2012-07-24 09:23:33 +00:00
1cf6743d37
missing include
2012-07-24 09:00:48 +00:00
e0b8d33410
Add a grid of points for which we dtermine if they are inside or outside
...
This then can be used by Is_in_domain(Point query)
2012-07-23 15:30:40 +00:00
23e2a71425
Tweak the implementation of Polyhedral_mesh_domain_3
...
Even if there is an AABB tree dedicated to the bounding polyhedron, copy
the facets of that bounding polyhedron to the global AABB tree.
r62302 from Mesh_3-experimental-GF
2012-07-23 15:20:15 +00:00
3c3a134256
Use of Mesh_3 profiling macros
...
r66626 from Mesh_3-experimental-GF
2012-07-23 14:26:14 +00:00
c09476db5f
- Fix a bug in Polyhedral_mesh_domain_3: the Surface_patch_index types was
...
not equal to Polyhedron::Face::Patch_id but to Subdomain_index!
LR
r61189 from Mesh_3-experimental-GF
2012-07-19 15:16:51 +00:00
d607377d85
Polyhedral_mesh_domain_3 with a cache of the previous query, and its
...
answer.
2012-07-19 14:23:42 +00:00
17797b7271
Merge next into this branch. There have been conflicts in the
...
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
d06b27b2c1
Bugfix
2012-04-24 08:05:22 +00:00
e9a4f746f6
Added an #ifdef to choose if we want random shooting, or not, for initial points construction (can be useful for debugging purpose or if one wants Mesh_3 to be deterministic).
2012-04-18 12:03:00 +00:00
9ae59efaaf
Merge from next
2012-02-15 15:58:17 +00:00
fcc51ff63d
Typo
2012-02-15 11:45:55 +00:00
a21d007070
For easy comparison between sequential and parallel versions, disabled random ray shooting for initialization.
2012-02-15 08:53:31 +00:00
dbf52257f8
In Polyhedral_mesh_domain_3, add a check that the input polyhedron is
...
triangulated.
2012-01-18 11:06:11 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
e9748fdf9a
Set but not used variables removed for smoother compiling with -Wextra
2011-11-25 14:04:37 +00:00
Clement Jamin
Laurent Rineau
Sébastien Loriot
iyaz
Jane Tournois
Jane Tournois
Laurent Rineau
Philipp Möller