Commit Graph

44 Commits

Author SHA1 Message Date
Laurent Rineau 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
Laurent Rineau f06d2057d6 Uniformize my uses of std::setprecision 2013-09-27 17:58:00 +02:00
Sébastien Loriot a05c50e83a fix backward compatibility of Mesh_3 with intersection API v1 2013-09-25 18:13:11 +02:00
Sébastien Loriot 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
Sébastien Loriot 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
Sébastien Loriot 4620b38ffd update include path 2013-06-24 17:27:41 +02:00
iyaz 5411669c88 Integrate point inside query to Polyhedral_mesh_domain_3 2013-06-24 13:38:44 +02:00
Sébastien Loriot 02bdcc8603 Revert "remove Robust_intersection_traits_new"
This reverts commit 77b6b2e008.
2013-06-21 12:42:12 +02:00
Sébastien Loriot 77b6b2e008 remove Robust_intersection_traits_new 2013-06-21 12:39:52 +02:00
Sébastien Loriot 483440c8f2 use new return type of intersection 2013-06-21 12:39:20 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Sébastien Loriot 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
Sébastien Loriot 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
Laurent Rineau 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
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Jane Tournois 824e8060fe fix typo when CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS is not defined 2012-10-16 09:59:44 +00:00
Jane Tournois 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
Laurent Rineau c58bd4f8fb Merge from next up to revision 70936 2012-08-02 12:18:09 +00:00
Laurent Rineau 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
Jane Tournois 15d1ed2a98 r58679 from Mesh_3-experimental-GF
Avoid a call to do_intersect: call intersection directly
2012-07-27 14:46:10 +00:00
Jane Tournois 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
Jane Tournois 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
Jane Tournois 1cf6743d37 missing include 2012-07-24 09:00:48 +00:00
Jane Tournois 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
Jane Tournois 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
Jane Tournois 3c3a134256 Use of Mesh_3 profiling macros
r66626 from Mesh_3-experimental-GF
2012-07-23 14:26:14 +00:00
Jane Tournois 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
Jane Tournois d607377d85 Polyhedral_mesh_domain_3 with a cache of the previous query, and its
answer.
2012-07-19 14:23:42 +00:00
Philipp Möller 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
Laurent Rineau dbf52257f8 In Polyhedral_mesh_domain_3, add a check that the input polyhedron is
triangulated.
2012-01-18 11:06:11 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Philipp Möller e9748fdf9a Set but not used variables removed for smoother compiling with -Wextra 2011-11-25 14:04:37 +00:00
Philipp Möller 0d528ddb74 Mesh_3 intersections with variants 2011-11-16 14:04:13 +00:00
Laurent Rineau aad9d073da Bug in Construct_initial_points if the non-bounding polyhedra are coplanar.
Before this patch, Construct_initial_points did not try to intersect with
the bounding polyhedron, but only with the other polyhedra. That can lead
to a crash if the given polyhedra are a bounding one, and a second
polyhedron that is coplanar. Then the initial points are *all* coplanar,
and then tr.dimension()==2 and an assertion is triggered.

Now Construct_initial_points uses construct_intersection_object(), and the
later tries to intersect with all polyhedra, including the bounding one.
2011-03-23 14:24:26 +00:00
Laurent Rineau 95cde53b17 Merge "Mesh_3 with features" in trunk, so that it is in CGAL-3.8, at last!
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Mesh_3_with_features
2011-01-10 15:43:22 +00:00
Andreas Fabri 480ddb54f5 Remove ';' 2010-05-14 09:46:02 +00:00
Michael Hemmer d4bc692102 use CGAL::cpp0x for tuple 2010-01-27 13:50:01 +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 9707b3edea Merge r53152 from 3.5 branch
r53152 | stayeb
Fix bug (typo) in polyhedral domain initialization.
2009-11-24 12:46:06 +00:00
Stéphane Tayeb dcf43908d9 * remove accelerate_distance_queries() call in Polyhedral_mesh_domain_3 ctor
* make_surface_index() of class Polyhedral_mesh_domain_3 is now public
* change default value of Min_dihedral_angle_criterion from 25 to 12
* add command-line applications for various mesh generation examples
2009-10-05 12:03:49 +00:00
Stéphane Tayeb f8101d1b48 Merge [r50813-r51122]
From branches/CGAL-3.5-branch/Mesh_3 To trunk/Mesh_3.

r51094 | stayeb | 
* Fix "protect macros" of header files

r51075 | stayeb |
* Typo. Fix liver background color.
2009-08-07 15:35:32 +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