Commit Graph

577 Commits

Author SHA1 Message Date
Laurent Rineau a618b1db81 Cherry-pick this patch:
| ------------------------------------------------------------------------
  | r61610 | sloriot | 2011-03-09 17:32:05 +0100 (Wed, 09 Mar 2011) | 2 lines
  | Changed paths:
  |    M /branches/experimental-packages/Mesh_3-protecting_balls-branch/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h
  | 
  | split an internal function to reuse it
  | 
  | ------------------------------------------------------------------------
2011-06-17 13:12:31 +00:00
Sébastien Loriot a03f2c88c0 bug fix in tersection of 3D colinear segments.
Update test-suite to test all possible configurations.
2011-05-20 08:52:12 +00:00
Sébastien Loriot 1674fa6240 use coplanar intersection (avoid retesting it) 2011-05-16 17:12:06 +00:00
Sébastien Loriot a372589e67 intersection can be empty 2011-04-11 08:06:51 +00:00
Andreas Fabri ab7736631e QPL -> LGPL 2011-03-10 21:15:14 +00:00
Andreas Fabri dcf575beb3 Remove unused variable 2010-11-12 08:33:25 +00:00
Sébastien Loriot b2f7df6513 add do_intersect for Ray_3 vs {Line_3,Segment_3,Ray_3}
add intersection for Ray_3 vs {Line_3,Segment_3,Ray_3}
append test to the testsuite

correct a variable name in line vs segment intersection
2010-10-28 15:13:53 +00:00
Sébastien Loriot 799a3448ab merge modifications made in the branch branches/experimental-packages/AABB_tree-faster-BBox_3_Triangle_do_intersect
created at r56349 and last modifications at r56671

modification in r56464 requires that the function point() of triangle returns a const ref
to the triangle point. This has already been done in the trunk at r56954.

Details:
*For Bbox_3 plane_3 intersection:
  For floating point arithmetic everything is ok,
  but in the presence of floating point filters
  things start getting slightly more complicated.
  The supporting plane/bbox test uses
  the orientation of the normal of the plane
  for finding two corners of the cube for a 
  sidedness test.
  For planes parallel to the xy, xz, yz plane
  this immediatly leads to problems.
  We introduce CGAL::Uncertain, etc in order
  to avoid switching to an exact arithmetic
  as long as possible.
*For Bbox_3 triangle_3:
  Idem. Fine with floating point or exact type
  but get into troubles with interval arithmetic when one
  triangle boundary is collinear with an axis.
  Remember that the implementation is based on the 
  separating axis theorem. Amongst axis tested, the
  one discribed by the cross product of the triangle boundary
  and the bbox boundary is tested. In the case they are collinear
  this directly fail.
  To handle this we added a small part testing whether the triangle
  has one boundary collinear to an axis to avoid this situation.
  Also, The "underlying" code has been factorized using the swap function.
2010-10-15 08:57:22 +00:00
Marc Glisse 51e7039a93 Remove extra ';' 2010-09-05 09:12:08 +00:00
Sébastien Loriot d01decf3ad correct include path 2010-09-01 20:40:33 +00:00
Sébastien Loriot 458b5136cc add missing symetric function 2010-09-01 10:11:57 +00:00
Sébastien Loriot 1daecf3943 move BBox vs {sphere,plane,triangle} do_intersect from AABB_tree to Intersections_3,
and update accordingly include directives. Update testsuite

remove unneed CMakeLists.txt from AABBtree testsuite

Remove Triangle_3_Plane_3 intersection from AABB_tree (I define it in Intersections_3 some days ago, thus a conflict)
2010-09-01 08:49:24 +00:00
Sébastien Loriot 1581e10c65 update testsuite to test intersection of segment and line 2010-08-31 13:50:09 +00:00
Sébastien Loriot 663099d82d add intersection Triangle_3,Triangle_3
add intersection Plane_3,Triangle_3
update documentation (also for Segment_3,Line_3 and Segment_3,Segment_3)
2010-08-31 13:42:40 +00:00
Sébastien Loriot 6bdfdf8f70 extract from intersection(segment,segment), intersection_collinear_segments
that be used internally.
2010-08-26 09:18:32 +00:00
Sébastien Loriot a5f3b43834 add intersection and do_intersect for segment_3 vs line_3 2010-08-24 13:33:07 +00:00
Sébastien Loriot 4b4f91a5eb add intersection computation and test for segment_3 vs segment_3 2010-08-24 08:28:00 +00:00
Sébastien Loriot 15079cf214 correct bug in triangle_3-segment_3 intersection:
in the case when the segment is coplanar with the triangle plane 
and the segment is on the supporting line of one triangle segments.
The case when the intersection is reduced to a point was not handled.
2010-07-12 06:34:17 +00:00
Stéphane Tayeb d7e1d01f4f Fix warnings: remove unused variables. 2010-07-02 15:06:05 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Stéphane Tayeb 71165c8ef4 Fix compilation on x86-64_Linux-2.6_llvm-clang-with-g++-4.4.1_F11: declare function do_intersect_coplanar before using it. 2010-05-20 07:02:56 +00:00
Laurent Rineau b7d60899b4 Merged revisions 53941-53943,53950,53952-53953,53956,53958,53961,53963,53965 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53941 | lrineau | 2010-02-01 10:48:57 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Fix the CHANGES (typo, and forgot PT3 in 6.5)
........
  r53942 | penarand | 2010-02-01 11:54:35 +0100 (Mon, 01 Feb 2010) | 1 line
  
  changed the calls to the pow() functions in VC environments
........
  r53943 | penarand | 2010-02-01 11:59:26 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  used standard number types to avoid VC errors and eliminated warnings in VC due to implicit casts
........
  r53950 | stayeb | 2010-02-01 12:55:10 +0100 (Mon, 01 Feb 2010) | 1 line
  
  Fix warning (MSVS2k8).
........
  r53952 | lrineau | 2010-02-01 13:07:16 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Remove the version number from strings of environment_variables.ini
........
  r53953 | hemmer | 2010-02-01 13:18:54 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  fix license header 
........
  r53956 | penarand | 2010-02-01 13:42:57 +0100 (Mon, 01 Feb 2010) | 3 lines
  
  added Sylvain L. and myself to the AUTHORS file
........
  r53958 | lrineau | 2010-02-01 14:24:35 +0100 (Mon, 01 Feb 2010) | 2 lines
  
  Remove the CGAL version numbers from that file.
........
  r53961 | lrineau | 2010-02-01 15:32:55 +0100 (Mon, 01 Feb 2010) | 3 lines
  
  - Update to 3.6.
  - Add g++-4.4 in supported g++ versions.
........
  r53963 | penarand | 2010-02-01 15:41:32 +0100 (Mon, 01 Feb 2010) | 3 lines
  
  eliminated special treatment of pow() function on different compilers
........
  r53965 | lrineau | 2010-02-01 15:43:44 +0100 (Mon, 01 Feb 2010) | 15 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r53944 | afabri | 2010-02-01 12:21:50 +0100 (Mon, 01 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Minkowski_sum_3/doc_tex/Minkowski_sum_3/PkgDescription.tex
    | 
    | Add ccPkgLicense and \ccPkgDemo
    | ------------------------------------------------------------------------
    | r53945 | afabri | 2010-02-01 12:28:33 +0100 (Mon, 01 Feb 2010) | 1 line
    | Changed paths:
    |    M /trunk/Convex_decomposition_3/doc_tex/Convex_decomposition_3/PkgDescription.tex
    | 
    | Add ccPkgLicense
    | ------------------------------------------------------------------------
........
2010-02-01 14:45:09 +00:00
Michael Hemmer ec4cdbe976 ajust for other kernels 2010-01-28 17:02:09 +00:00
Michael Hemmer b379564462 mv Bbox_3 intersect with line/ray/segment to bbox_intersection_3.h file,
it must be a template function since it depends on the Kernel
rm Intersections_3/src/CGAL/Bbox_3_intersections.cpp since it is empty
2010-01-28 15:40:48 +00:00
Stéphane Tayeb 118aafdfbd Fix warnings 2010-01-07 16:00:14 +00:00
Stéphane Tayeb 6494ffc972 Move do_intersect(Bbox,Bbox/Line/Ray/Seg) and intersection(Triangle,Line/Ray/Seg) from AABB_tree. 2009-12-18 15:12:59 +00:00
Stéphane Tayeb 9cd2160f03 * Fix previous commit...
* Minor fix: replace COLLINEAR by COPLANAR (4 point orientation predicate result)
2009-11-20 12:36:02 +00:00
Stéphane Tayeb 93c5a15f51 Fix minor bug in intersection(segment,plane): ensure a line is never returned. 2009-11-20 12:05:32 +00:00
Stéphane Tayeb 12d4519a2b revert r52901-52902 (moving predicate from AABB_tree to Intersections_3) 2009-11-10 16:57:37 +00:00
Stéphane Tayeb 6743dbccef Move intersection predicates and constructions from AABB_tree to Intersection_3. 2009-11-09 12:10:11 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Sylvain Pion f66c672caa Use global random gen. 2008-08-29 18:11:03 +00:00
Sylvain Pion 07fc7b102d Make the "random generator" global. 2008-08-29 17:24:32 +00:00
Sylvain Pion 4aa2b3c500 While at it, do the same tests by swapping the arguments, it's cheap. 2008-08-29 17:15:26 +00:00
Sylvain Pion ca964c7f42 Add missing do_intersect() functions for Iso_cuboid_3. 2008-08-29 14:33:12 +00:00
Sylvain Pion b4389348a1 Rewrite the ancient parts of the test-suite using:
- a single test file
- a template parameter for the kernel
- data sets and results in the source code instead of text files using diff for comparing
- no custom cgal_test script
2008-08-29 14:21:18 +00:00
Sylvain Pion 41d9519452 Remove default-generated makefile 2008-08-29 12:51:16 +00:00
Sylvain Pion 4c79d1d5cf Rename Bool_type to Boolean. 2008-08-26 13:40:26 +00:00
Sylvain Pion dc3bf72707 Remove changes.txt files. 2008-07-24 17:47:16 +00:00
Sylvain Pion 173ef7c590 Allow propagation of Uncertain-ty in more places, to reduce the number of exceptions.
- Use K::Bool_type, K::Orientation... instead of bool, CGAL::Orientation...
- More functions around Uncertain<> : make_certain(), extract_singleton(),
                                      possible conversions tightenning.

Many conversions still remain, e.g. for switch and if statements, &&, ||...
2008-07-16 13:45:13 +00:00
Pedro Machado Manhaes de Castro 60928dd80b fixing warnings 2008-06-09 07:58:50 +00:00
Pedro Machado Manhaes de Castro fdae4d0aec avoiding unecessary warnings 2008-06-06 16:49:06 +00:00
Pedro Machado Manhaes de Castro f9ba8e6c6c IO fix 2008-06-04 12:31:15 +00:00
Pedro Machado Manhaes de Castro 0d1587c133 fix assertions 2008-06-04 12:13:00 +00:00
Pedro Machado Manhaes de Castro e23d3ef044 adding Circle_3 to the Kernel 2008-06-03 12:26:20 +00:00
Pedro Machado Manhaes de Castro 1b5dfa436a adding Circle_3 to the Kernel 2008-06-03 12:22:38 +00:00
Pedro Machado Manhaes de Castro fc45f43179 Adding Circle_3 object to the Kernel. 2008-06-03 12:17:16 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00
Laurent Rineau aa7926685b unused variable (when CGAL_NDEBUG is defined). 2008-04-25 14:00:52 +00:00
Andreas Meyer 20315de571 * replaced CGAL_test_assert with ::assert, instead of CGAL_assertion
* removed include/Testsuite/assert.h
2008-03-19 13:45:36 +00:00
Fernando Cacciola b704509dcf Examples/Demos/Test CMake scripts updated 2008-03-05 21:14:02 +00:00
Fernando Cacciola a659cd852a Added project() and conditional test for CGAL_DIR 2008-02-14 15:42:36 +00:00
Fernando Cacciola 14043c43a0 Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically) 2008-02-08 17:47:21 +00:00
Fernando Cacciola afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Sylvain Pion 9f5bad92a1 Remove my name from maintainer files where it does not resonnably make any sense anymore. 2008-01-19 14:29:27 +00:00
Sylvain Pion a46b55bf71 The files "changes.txt", "description.txt", "long_description.txt" and "maintainer"
are now under /trunk/$Package/package_info/$Package/ .
2007-12-02 15:06:42 +00:00
Andreas Meyer 6623d525eb * replaced assert in */test/*/*.{cpp,h} with CGAL_test_assertion
* replaced #include <assert.h> with the according CGAL/Testsuite/assert.h
2007-11-07 21:35:42 +00:00
Sylvain Pion a90de08bf3 Remove obsolete config flag CGAL_CFG_MATCHING_BUG_4 and its dependency CGAL_WRAP. 2007-08-08 15:15:20 +00:00
Sylvain Pion f6745f19f4 Replace Homogeneous<double> by Homogeneous<MP_Float> to fix a red raw in the test-suite.
The tests triggered a degenerate case which unluckily failed for that kernel.
2007-02-28 17:41:08 +00:00
Sylvain Pion 3bebf1b352 remove warning 2007-02-28 16:52:55 +00:00
Andreas Fabri c4370a87b5 Added suffix rule for .cpp files 2007-01-31 16:43:49 +00:00
Sylvain Pion d7b391da60 Rename .C to .cpp 2007-01-27 21:36:42 +00:00
Sylvain Pion c03659bc7a global update of maintainer files
(remove Lutz, Sven, Matthias, Geert-Jan...)
2006-12-05 14:01:13 +00:00
Andreas Fabri 368ea1fa5f fix for min/max problem 2006-08-20 19:45:55 +00:00
Andreas Fabri 7e401a82f5 minmax fixes 2006-08-18 20:57:55 +00:00
Sylvain Pion cb6639b85a Introduce wmult_hw(), a new abstraction for Homogeneous/Cartesian,
similar to wmult(), for calls .hw() on the last argument
(i.e., does absolutely nothing in the Cartesian case).
2006-08-07 12:34:24 +00:00
Sylvain Pion 0789aa3b4e Style optimization (replace default-ctor+assignment by copy-ctor, etc...) 2006-08-07 11:55:37 +00:00
Sylvain Pion e35d01bd80 Philippe Guigue's intersection code is post-GALIA, hence INRIA-owner only. 2006-07-30 16:50:53 +00:00
Sylvain Pion 8070c73bc1 Move <CGAL/intersection_3_1.C> to
<CGAL/Intersections_3/intersection_3_1_impl.h>
2006-05-25 17:44:06 +00:00
Sylvain Pion d2740513aa Use .cpp file extension instead of .C for src/*/* files. 2006-04-14 09:19:29 +00:00
Sylvain Pion 22ad725de1 Move src/*.C to src/CGAL/*.C 2006-04-13 22:24:18 +00:00
Sylvain Pion f2800b9b8a - Initialize variables to stop warning 2006-03-26 21:31:32 +00:00
Joachim Reichel f582718758 rename create_makefile to cgal_create_makefile to avoid name clashes,
adjust all occurences of create_makefile and create\_makefile in the entire
repository (well, trunk only)
2006-03-15 22:10:02 +00:00
Sylvain Pion 8a9097632d Remove prehistoric funnelweb stuff. 2006-02-19 20:13:41 +00:00
Laurent Saboret db6a8f948c Change CVS keywords to SVN style 2006-02-16 14:30:13 +00:00
Laurent Saboret 1aad55d4cb Change CVS keywords to SVN style 2006-02-14 10:08:15 +00:00
Laurent Saboret 4477d33daa Move packages to trunk root 2006-02-14 08:58:15 +00:00