Commit Graph

102 Commits

Author SHA1 Message Date
Laurent Rineau 6c705ab777 Fix the test
One cannot expect exact intersections computations results when the kernel
is not. This patch fixes the test: the equality between the result and the
expected result is tested with an epsilon unless the kernel has exact
constructions.
2012-04-23 22:17:15 +00:00
Sébastien Loriot 8db3036330 BUGFIX
correct error in intersection computation of triangle_3 segment_3
when the segment is collinear with a triangle edge.
2012-04-05 11:57:58 +00:00
Laurent Rineau 02acd80611 Better test and bench for do_intersect(BBox_3, Ray_3|Segment_3) 2012-03-19 14:11:45 +00:00
Andreas Fabri 6c9625e514 Fix for <windows.h> bug 2012-01-21 08:33:51 +00:00
Andreas Fabri f834260e4c Fix for Windows 'min/max' bug 2012-01-19 08:03:51 +00:00
Andreas Fabri be573d2316 Fix for Windows 'min/max' bug 2012-01-18 09:52:23 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Laurent Rineau 5685e10669 reintegrate \^/branches/features/Static_filter_do_intersect-GF 2011-11-25 17:45:11 +00:00
Laurent Rineau fb796dbc97 Missing match for Intersect_3::operator()(Ray_3, Triangle_3)
There was only Intersect_3::operator()(Triangle_3, Ray_3).

The specializations for CGAL::intersection were for both order however.
2011-11-25 17:40:02 +00:00
Laurent Rineau ede47077ce cleanup 2011-11-24 14:43:25 +00:00
Andreas Fabri c4c4a24029 cleanup 2011-11-24 14:15:32 +00:00
Laurent Rineau e0c80037ae merge changes from next 2011-11-23 15:53:51 +00:00
Laurent Rineau fc5a23bc06 Comments to help debugging 2011-11-21 14:53:16 +00:00
Sébastien Loriot 59f5cc0ba0 optimise Bbox_3-line_3 do_intersect (prevent filter failures) 2011-11-21 13:43:45 +00:00
Laurent Rineau 1ea6830233 New version of Do_intersect_3 static filter
This time we hope it is correct.
2011-11-18 15:34:26 +00:00
Laurent Rineau cfd37935cf merge from next 2011-10-20 16:04:32 +00:00
Andreas Fabri 278d79915d Suppress warning 2011-10-20 11:09:41 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Sébastien Loriot 554f62d411 remove executable property from copyright files 2011-10-03 08:18:16 +00:00
Andreas Fabri d10a333947 Add a file with the copyright holder(s) to the package_info 2011-09-29 20:45:16 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Sébastien Loriot 5ec3807e64 testsuite do_intersect Bbox_3-Ray_3 2011-07-13 14:58:51 +00:00
Sébastien Loriot bbc56adedc raffine bugfix of 64734
(remove unneed code added)
2011-07-13 14:35:58 +00:00
Sébastien Loriot 0331ea939b BUGFIX: Bbox_3-line_3 do_intersect missing two cases when the y-slope or z-slope
of the line is 0. Add a testsuite for Bbox_3-Line_3 do_intersect.
2011-07-12 07:05:40 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +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