Commit Graph

27 Commits

Author SHA1 Message Date
Jane Tournois feb76b7439 add missing namespaces for msvc2015
avoid ambiguity of calls
2015-08-11 15:48:55 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Sébastien Loriot 63406293e1 Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
2014-12-12 14:24:17 +01:00
Jane Tournois 0f9ff7e619 add a typedef for Ray_2 to have Mesh_2 tests compiling
this actually was a bug.
In the documentation, Projection_traits_xy_3 is said to implement the concept
DelaunayTriangulationTraits_2, that has the type Ray_2.
Now, it's the case
2014-11-18 12:20:33 +01:00
Sébastien Loriot 0e25bfb122 bug fix in projection traits, Angle_3 != Angle_2 when z is taken into account
(cherry picked from commit 6c4cd29fb1)

Conflicts:
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
2014-10-09 10:36:04 +02:00
Sébastien Loriot 6ae7d56bc7 fix dimension typo 2014-10-06 08:13:54 +02:00
Sébastien Loriot 61e40e74a1 add additional functors in the projection traits and a test file
* Compute_scalar_product_2
  * Collinear_2,
  * Collinear_are_ordered_along_line_2
  * Compute_squared_length_3
2014-10-03 08:58:33 +02:00
Sébastien Loriot 93e664f26a add missing requirement for ConvexHullTraits_2 2012-11-29 19:40:02 +01:00
Sébastien Loriot d3e29b0441 Normalize line endings 2012-11-29 19:23:40 +01:00
Laurent Rineau b4c3b341ba Make Projection_traits_3 compatible with Mesh_2
And add one test.
2012-10-16 14:46:46 +00:00
Laurent Rineau 5ef5350f04 Fix headers of Kernel_23
Mostly missing #include, but I had to create a <CGAL/kernel_config.h> from
<CGAL/kernel_basic.h>, to reduce dependency problems.
2012-10-08 09:02:18 +00:00
Laurent Rineau 62a8fdc2d4 Merge /branches/features/Triangulation_2_UseTraitsInHierarchy-GF/Kernel_23
... and only that directory. The rest of the branch is a patch to
Triangulation_2, that will be sumbitted as a small feature.
2012-06-29 16:27:25 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 60ca2d55ef add missing operator in Projection_traits 2011-12-30 13:38:51 +00:00
Sébastien Loriot 5eace40fa1 BUG-FIX: Compute_squared_radius_2 should not be Compute_squared_radius_3 in projection traits 2011-12-30 11:06:01 +00:00
Laurent Rineau ab3753c62c Merge from next 2011-10-13 16:16:59 +00:00
Laurent Rineau 414f9319f4 Fix artificial dependency of Kernel_23 to Triangulation_2
This file was moved from Triangulation_2 to the kernel, a few months
ago. That explains why <CGAL/triangulation_assertions.h> was used.
2011-10-13 14:10:38 +00:00
Sébastien Loriot 961d58fa4b update files with incorrect license headers (QPL but should be LGPL) 2011-10-10 16:07:44 +00:00
Sébastien Loriot f1fe27620e BUGFIX: copy-paste typo 2011-06-23 11:59:29 +00:00
Andreas Fabri 415e64411c Add functors of Convex_hull_projective_traits classes 2011-04-06 07:41:14 +00:00
Andreas Fabri 7f78d9d1b1 fix 2011-01-19 10:55:02 +00:00
Andreas Fabri 1a48eaae74 Roll back to a projection on the xz instead of the zx plane 2011-01-19 10:27:51 +00:00
Sébastien Loriot 3e04fb16fb merge packages related to projection traits into the trunk. 2011-01-11 07:18:36 +00:00
Laurent Rineau 0293802159 Revert those commits:
| ------------------------------------------------------------------------
  | r59170 | afabri | 2010-10-11 15:48:42 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/doc_tex/Kernel_23_ref/Projection_traits_xy_3.tex
  | 
  | Add  Projection_traits_xy_3
  | ------------------------------------------------------------------------
  | r59168 | afabri | 2010-10-11 15:35:17 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/include/CGAL/Projection_traits_xy_3.h (from /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xy_3.h:59167)
  |    A /trunk/Kernel_23/include/CGAL/Projection_traits_xz_3.h (from /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xz_3.h:59167)
  |    A /trunk/Kernel_23/include/CGAL/Projection_traits_yz_3.h (from /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_yz_3.h:59167)
  |    D /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xy_3.h
  |    D /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xz_3.h
  |    D /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_yz_3.h
  | 
  | Generalize name of traits class
  | ------------------------------------------------------------------------
  | r59167 | afabri | 2010-10-11 15:31:36 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xy_3.h (from /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h:59165)
  |    A /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_xz_3.h (from /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h:59165)
  |    A /trunk/Kernel_23/include/CGAL/Triangulation_euclidean_traits_yz_3.h (from /trunk/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h:59165)
  | 
  | Add Projection_traits classes
  | ------------------------------------------------------------------------
  | r59166 | afabri | 2010-10-11 15:28:40 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    M /trunk/Kernel_23/include/CGAL/internal/Projection_traits_3.h
  | 
  | Add Less_xy_2 and Less_yx, so that it becomes model of PolygonTraits_2
  | ------------------------------------------------------------------------
  | r59162 | afabri | 2010-10-11 15:19:16 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    M /trunk/Kernel_23/include/CGAL/internal/Projection_traits_3.h
  | 
  | rename class inside the file
  | ------------------------------------------------------------------------
  | r59161 | afabri | 2010-10-11 15:17:15 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/include/CGAL/internal/Projection_traits_3.h (from /trunk/Kernel_23/include/CGAL/internal/Triangulation_euclidean_traits_projected_3.h:59160)
  |    D /trunk/Kernel_23/include/CGAL/internal/Triangulation_euclidean_traits_projected_3.h
  | 
  | Generalize name 
  | ------------------------------------------------------------------------
  | r59160 | afabri | 2010-10-11 15:15:20 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/include/CGAL/internal/Triangulation_euclidean_traits_projected_3.h (from /trunk/Triangulation_2/include/CGAL/internal/Triangulation_euclidean_traits_projected_3.h:59156)
  | 
  | Move implementation of Projection_traits from Triangulation_2 to Kernel
  | ------------------------------------------------------------------------
  | r59158 | afabri | 2010-10-11 15:12:54 +0200 (Mon, 11 Oct 2010) | 1 line
  | Changed paths:
  |    A /trunk/Kernel_23/include/CGAL/internal
  | 
  | Add directory for the Projection_traits
  | ------------------------------------------------------------------------
The work is now done is a branch.
2010-11-04 11:24:14 +00:00
Andreas Fabri 1e2383151e Add Less_xy_2 and Less_yx, so that it becomes model of PolygonTraits_2 2010-10-11 13:28:40 +00:00
Andreas Fabri 4656f941a8 rename class inside the file 2010-10-11 13:19:16 +00:00
Andreas Fabri 80e6d72509 Generalize name 2010-10-11 13:17:15 +00:00