Commit Graph

1099 Commits

Author SHA1 Message Date
Maxime Gimeno 7f334a0133 save intermediary result to avoid computing it up to 3 times in Less_along_2_axis 2021-03-10 13:33:01 +01:00
Maxime Gimeno d2ba62aa21 Fixes in concepts and addition of missing functors for complyance to PolygonTraits_2. 2021-03-10 12:25:24 +01:00
Laurent Rineau cb8e564ac7 Merge pull request #5349 from afabri/Polyline_simplification-simplify_overlaps-GF
2D Polyline simplification: Also simplify overlapping vertex sequences
2021-03-03 17:35:27 +01:00
Laurent Rineau b1d78a909f Merge pull request #5433 from sloriot/CGAL-last_bind
Remove last bind
2021-03-03 17:32:59 +01:00
Laurent Rineau 6f8f36462f Merge pull request #5433 from sloriot/CGAL-last_bind
Remove last bind
2021-03-03 17:10:13 +01:00
Laurent Rineau 1a040c8552
Merge pull request #4749 from danston/Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2021-02-19 07:59:59 +01:00
Laurent Rineau 8fc88a9463 Merge pull request #5409 from lrineau/Triangulation_3-fix__move__semantic__of__Triangulation_hierarchy_3-GF
Fix the move-semantic of Triangulation_hierarchy_3
2021-02-18 15:19:11 +01:00
Laurent Rineau 0539b1ab3a Merge pull request #5409 from lrineau/Triangulation_3-fix__move__semantic__of__Triangulation_hierarchy_3-GF
Fix the move-semantic of Triangulation_hierarchy_3
2021-02-18 15:18:00 +01:00
Maxime Gimeno 2e77ad352d Fix plan to plane 2021-02-17 12:39:39 +01:00
Sébastien Loriot 4bb0406240 do not include boost/bind.hpp (shouldn't be used anymore) + fix remaining bind
(nasty using namespace boost!)
2021-02-12 15:35:19 +01:00
Laurent Rineau 3bd7181ff3 Merge pull request #5244 from afabri/Triangulation_2-Intersect_use_variant-GF
Nef_3, Triangulation_2:  Change the result type of the Intersect_2 functor
2021-02-05 16:12:58 +01:00
Laurent Rineau b8bb3ffc09 Apply on triangulation_hierarchy_2 the same fix as in 3D 2021-02-04 09:21:36 +01:00
Sébastien Loriot 3082808434 restore original code 2021-02-01 10:12:16 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Andreas Fabri 105b93b35a Now it should work with overlapping polylines 2021-01-14 08:51:39 +00:00
Andreas Fabri 44260a88fc Store vertex handles in the MPQ and have a map from Vertex_handle to Vertices_in_constaint_iterator 2021-01-13 20:56:34 +00:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 02eb3648ad Try something else 2021-01-07 11:43:13 +01:00
Andreas Fabri 2b77481cd4 Move a typedef to where it is used 2021-01-07 10:31:14 +00:00
Maxime Gimeno 7c6bbaaea0 debug 2021-01-07 11:27:49 +01:00
Maxime Gimeno 7418c4217b Try to select context according to OS 2021-01-07 11:15:39 +01:00
Andreas Fabri 31037aa014 Fix Triangulation_2_projection_traits_3 2020-12-08 16:48:19 +00:00
Andreas Fabri 4079954ee0 Fix Triangulation_2_projection_traits_3 2020-12-08 16:27:21 +00:00
Dmitry Anisimov c2085ea36c
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2020-12-04 18:32:25 +01:00
Andreas Fabri 2e24249f13 Triangulation_2: Change the result type of the Intersect_2 functor 2020-12-04 16:44:22 +00:00
Sébastien Loriot 3aced7f7e7 add projected segment overlapping case + clean up 2020-11-19 20:01:31 +01:00
Mael Rouxel-Labbé d6f06b9f14 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-11-17 10:24:16 +01:00
Laurent Rineau 16a929c310 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-21 09:27:51 +02:00
Sebastien Loriot bdc2f3e0db
Merge pull request #5076 from lrineau/Triangulation_2-improve_CDT_plus_2-GF
Triangulation_2: improve CDT_plus_2
2020-10-20 13:28:12 +02:00
Mael Rouxel-Labbé e3c08cf7dc Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-10-19 16:17:27 +02:00
Laurent Rineau 45f41cc69e Fix a possible compilation error with CGAL_CDT_2_DEBUG_INTERSECTIONS 2020-10-15 15:44:35 +02:00
Laurent Rineau ab5cdc6fa4 Add a debug message 2020-10-15 15:44:23 +02:00
Laurent Rineau 267b1dc3d1 Bug-fix
In degenerated cases, when a subconstraint is subdivided by an
intersection point between two other subconstraints, then it is
possible that a subconstraint is already split when one calls
`add_Steiner`. Let's remote the assertion.
2020-10-15 15:43:39 +02:00
Laurent Rineau e37c290841 Better debug messages 2020-10-15 15:08:21 +02:00
Dmitry Anisimov d5b24c4b05
Merge branch 'master' into Polygon_mesh_processing-triangulate_hole_with_cdt2-danston 2020-10-07 10:55:57 +02:00
Sébastien Loriot 090b82e762 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-10-02 15:08:56 +02:00
Maxime Gimeno a7c92f2c23 Init li and lt to fix warning 2020-09-29 10:30:26 +02:00
Mael Rouxel-Labbé db1823a470 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-09-22 14:27:09 +02:00
Mael Rouxel-Labbé af8ad79dcc Tiny varible name fix 2020-09-22 14:13:18 +02:00
Mael Rouxel-Labbé f82396ece2 Construct_point should grab references whenever possible 2020-09-22 14:13:18 +02:00
Dmitry Anisimov 7ac04fd907 checking the hole simplicity with the extended triangulation projection traits 2020-06-08 14:21:12 +02:00
Laurent Rineau 871c97273a Merge pull request #4496 from lrineau/CGAL-move_semantic_for_triangulations-GF
Add move-semantic to Compact_container and Triangulations
2020-06-03 16:23:22 +02:00
Laurent Rineau 20bc78a7d7 Merge pull request #4726 from afabri/Mesh_2-deterministic_V2-GF
Mesh_2: Make it deterministic  V2
2020-05-27 16:33:28 +02:00
Laurent Rineau 14b18f81ee Merge pull request #4735 from lrineau/Triangulation_2-fix_CDT_2_degenerate_case-GF
Fix a bug in <CGAL/Constrained_triangulation_2.h>
2020-05-27 16:33:21 +02:00
Laurent Rineau a8fca35b1d Merge pull request #4735 from lrineau/Triangulation_2-fix_CDT_2_degenerate_case-GF
Fix a bug in <CGAL/Constrained_triangulation_2.h>
2020-05-27 16:32:49 +02:00
Laurent Rineau 0ea385712f Fix compatibility with C++03 2020-05-22 14:52:18 +02:00
Laurent Rineau dcc4fb1cc1 Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
# Conflicts:
#	STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Laurent Rineau 3cd52cdc3e Fix a bug in <CGAL/Constrained_triangulation_2.h>
The function parameter was locally shadowed by a local `int i`
variable!

Then the edge `(f, i)` in the call `remove_constrained_edge(f, i)` was
the wrong one!

The bug was introduced by ecfd82e287,
ten years ago.

The bug was only triggered on degenerated cases, when two constraints
intersect, but the code failed to compute the intersection. Then, if
the intersection vertex `vi` was either `vaa` or `vbb` (and not `vcc`
or `vdd`), then the edge `(f, i)` was the wrong one.
2020-05-19 17:25:10 +02:00
Laurent Rineau 12c0ec0935 New debug code in <CGAL/Constrained_triangulation_2.h>
... tested in `test/Triangulation_2/test_cdt_degenerate_case.cpp`.
2020-05-19 17:25:10 +02:00
Andreas Fabri 243a8b68c9 Add using and typedef 2020-05-18 15:27:59 +01:00
Andreas Fabri 8a53e00155 polish 2020-05-15 15:27:02 +01:00
Andreas Fabri 7a6bdc1946 Mesh_2: make it deterministic 2020-05-15 14:16:56 +01:00
Sebastien Loriot a860a7ea5a
Merge pull request #4404 from MaelRL/CGAL-Optimal_bounding_box-GF
New Package: Optimal Bounding Box
2020-04-16 18:10:58 +02:00
Sébastien Loriot a8f9858099 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-16 16:29:55 +02:00
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +02:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot f8414293d7 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:27:08 +01:00
Sébastien Loriot 24a1bf5c23 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:26:44 +01:00
Sébastien Loriot d1a323c730 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:24:14 +01:00
Sébastien Loriot 86e25f7e71 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:23:54 +01:00
Sébastien Loriot 9f2eafd06e extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:17:02 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot 8b29d69755 fix warning 2020-03-23 19:38:06 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot 149c7a4afc Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-19 16:29:33 +01:00
Sébastien Loriot d10359d09e Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-19 16:27:55 +01:00
Sebastien Loriot e53018d11e
Merge pull request #4565 from MaelRL/Tr-construct_point_return-GF
Triangulation_23: Grab return of construct_point() by reference when possible
2020-03-19 16:25:31 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Sébastien Loriot ef6949419f Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-17 18:16:39 +01:00
Sébastien Loriot bda5680629 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-17 18:13:56 +01:00
Sébastien Loriot 09039464ef restrict partial specialization to avoid grab everything 2020-03-17 17:53:21 +01:00
Mael Rouxel-Labbé d8244fceb4 Replace std::set with boost::container::flat_set 2020-03-13 08:32:40 +01:00
Mael Rouxel-Labbé 100304667d Remove CGAL::internal::boost_::function_property_map
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.

The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé 1c622e0ba5 Base CDT2's edge sets on geometry to ensure determinism
When using face addresses, we do get the same combinatorics and
geometry in the result, but it is possible to create
different TDS' from one run to another, with a given face
not having the same order of points in memory.
2020-03-12 13:11:32 +01:00
Mael Rouxel-Labbé fe1fd95d23 Fix always returning by copy when it is possible to return by reference 2020-03-09 15:31:51 +01:00
Mael Rouxel-Labbé 3667550e75 Rename new triangulation IDs initializing functions
To look more like the existing function set_halfedgeDS_items_id()
2020-03-04 12:54:56 +01:00
Mael Rouxel-Labbé d3feda1650 Update IDs getter for triangulation edge / halfedges 2020-03-04 12:06:29 +01:00
Mael Rouxel-Labbé 17f97fc460 Add a function to initialize triangulation IDs 2020-03-04 12:06:19 +01:00
Mael Rouxel-Labbé a449948588 Add (undocumented) edge_ids to T2_face_base_with_id_2.h
This is done because the previous edge IDs can range from 0
to 3*num_faces(tr) + 2, which is greater than num_edges(tr)
and is therefore not very rational.
2020-03-04 11:57:23 +01:00
Laurent Rineau a060fb6396 Fix segfault in the dtor of a moved-from Triangulation_hierarchy_2 2020-02-21 14:23:18 +01:00
Simon Giraudot e4714165f0 Add missing include 2020-02-19 12:40:05 +01:00
Simon Giraudot 5b8d92e08f First version of split_subconstraint_graph_into_constraints() 2020-02-17 10:28:02 +01:00
Laurent Rineau 24082a7114 Fix compilation errors, with a few compiler
```
include/CGAL/Triangulation_hierarchy_3.h:163:23: error: invalid use of 'this' at top level
     noexcept(noexcept(this->Tr_Base::swap(tr)))
                       ^~~~
```

That is actually the subject of a C++ Defect:
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1207

Anyway, this was used only for the `noexcept` specification of `swap`
functions, and I no longer use `swap` for the move semantic. I can
remove those noexcept` specifications.
2020-02-12 16:30:26 +01:00
Laurent Rineau 20bb2c8428 Add move-semantic to CT_plus_2 and Tr_hierarchy_2 2020-01-31 16:28:07 +01:00
Laurent Rineau 94be80c2eb fix clang-tidy warnings 2020-01-31 16:27:41 +01:00
Laurent Rineau 75ec5c0da7 Add move-semantic to T_2, CT_2, Dt_2, and CDT_2
Still todo: `Constrained_triangulation_plus_2`, and
`Triangulation_hierarchy_2`.
2020-01-31 15:48:45 +01:00
Laurent Rineau 14b8930f79 Fix a clang-tidy warning by using nullptr instead of 0 2020-01-31 15:48:45 +01:00
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF
CDT2: Throw on constraint intersections that do not require constructions
2019-12-05 11:05:47 +01:00
Laurent Rineau b5b507c35f Merge pull request #4213 from lrineau/T2-cleanup_Polyline_constraint_hierarchy_2-GF
Polyline_constraint_hierarchy_2.h: remove the useless point_ data member
2019-12-05 11:05:41 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Mael 962e8b10a6
Fix typo 2019-10-03 08:12:16 +02:00
Mael Rouxel-Labbé ea8e6f3c98 Update CDT2 intersection tag documentation 2019-09-19 18:32:58 +02:00
Mael Rouxel-Labbé 7a50939809 Deprecate No_intersection_tag
Introduce two new tags instead, to make the behavior change clearer.

Default tag for CDT2 is changed to keep the same behavior as before
(what was called 'No_intersection_tag' and is now called
'No_constraint_intersection_requiring_constructions_tag')
2019-09-19 18:11:33 +02:00
Mael Rouxel-Labbé 9b2a7f09d7 Merge branch 'T2-Throw_on_collinear_strongly_intersecting_segments-GF-old' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-09-19 15:50:49 +02:00
Laurent Rineau 502945633c Rename Data to Point, because it must be the type of Vertex::point() 2019-09-10 12:42:03 +02:00
Laurent Rineau b1df25dcf6 Remove the useless point_ data member 2019-09-09 15:49:33 +02:00
Mael Rouxel-Labbé e955c38215 Add a new tag allowing constraints to intersect if no construction is required 2019-08-22 12:44:16 +02:00
Mael Rouxel-Labbé 013272a466 Fix not throwing on T-like segment intersection (extremity on interior) 2019-08-19 17:55:39 +02:00
Mael Rouxel-Labbé 59e0e87e24 Readability (no real changes) 2019-08-19 17:55:26 +02:00
Mael Rouxel-Labbé f3ccb18da0 Fix typo 2019-08-19 17:18:55 +02:00
Mael Rouxel-Labbé 869baed46f Fix not throwing on overlapping constraints 2019-08-19 17:18:29 +02:00
Sébastien Loriot b84297f8f6 update the usage for the new CGAL named function parameters 2019-07-29 09:38:39 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +02:00
Andreas Fabri aeac816801 Triangulation_2: Fix remove_vertex_from_constraint-GF 2019-06-26 14:34:41 +02:00
Andreas Fabri c1f337d585 Triangulation_2: Fix CDT_plus_2::remove_constraint() 2019-06-20 12:17:15 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé d75821f27a Rename template parameter to help MSVC
Seems like MSVC gets confused between 'Tr' being both a template paramter
and a typedef in the class being passed as template parameter.
2019-06-17 08:33:23 +02:00
Andreas Fabri 1e1bfa1675 constness 2019-06-15 22:30:47 +02:00
Mael Rouxel-Labbé a189e82686 Cache a descriptor within the iterators so operator*() can return a reference 2019-06-14 10:47:20 +02:00
Mael Rouxel-Labbé 0ea40f7602 Add missing 'const' in conversion operator 2019-06-14 10:46:46 +02:00
Andreas Fabri 7a49b48019 Add code and test for all_edges() 2019-06-12 09:23:57 +02:00
Andreas Fabri c34536be24
Apply suggestions from code review
Co-Authored-By: Mael <mael.rouxel.labbe@geometryfactory.com>
2019-06-05 17:26:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 39c8f7ae1f Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF
2D and 3D Triangulations:  Unify insertion of range of points with info
2019-06-05 11:20:23 +02:00
Andreas Fabri 7111518cb0 Fix usage of Vertices_in_constraint 2019-06-05 08:02:19 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 22a8edd750 doc 2019-06-04 16:52:33 +02:00
Andreas Fabri 70720e224f Add documentation for T2 2019-06-04 16:32:30 +02:00
Andreas Fabri 785ae04e0b Add ranges to Regular_triangulation_2 2019-06-04 12:45:42 +02:00
Andreas Fabri f954b00063 Fix error 2019-05-24 11:32:32 +02:00
Andreas Fabri 7b4bad5666 Fix warnings 2019-05-24 11:14:58 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Andreas Fabri f354210be3 Add using statements 2019-05-21 14:32:03 +02:00
Andreas Fabri 85d9ec1ae1 Unify 2D 2019-05-20 17:30:31 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Sébastien Loriot e6d0080cc7 fix the init of the vertex index vector 2019-05-14 09:15:44 +02:00
Mael 0efaed2095
Merge branch 'master' into PMP-Locate-GF 2019-05-06 15:57:09 +02:00
Andreas Fabri 2287817654 Add using compare_y 2019-05-02 13:49:33 +02:00
Andreas Fabri a3d535c553 Fix compilation, Add documentation, Add test for IO 2019-05-02 10:41:12 +02:00
Andreas Fabri abdad1585b Add this-> when calling a function inherited from a temmplate parameter 2019-04-30 17:53:32 +02:00
Andreas Fabri e0c2222c1f Constrained_triangulation_plus_2: Fix I/O 2019-04-30 13:24:52 +02:00
Andreas Fabri 26b26ea506 Remove deprecated function 2019-04-30 12:21:06 +02:00
Andreas Fabri 4724e3a358 Remove deprecated function 2019-04-30 12:21:03 +02:00
Mael Rouxel-Labbé 9abef28840 Add missing operator< for T2 edge descriptors
and removed useless comparators
2019-04-29 16:05:51 +02:00
Mael Rouxel-Labbé ab092afe57 Include 2D triangulation BGL properties from BGL graph traits header
for convenience
2019-04-29 15:45:22 +02:00
Mael Rouxel-Labbé a03701d2b7 Fix key type in generic 2D triangulation BGL properties 2019-04-29 15:44:51 +02:00
Mael Rouxel-Labbé 9cba48acfe Fixed TDS graph traits implementation and factorized some parts with other T2 GT 2019-04-29 13:22:45 +02:00
Mael Rouxel-Labbé 64d7747f8b Moved factorized 2D graph traits to /internal 2019-04-29 13:21:46 +02:00
Mael Rouxel-Labbé 9a03b19bfa Fixed TDS2 graph traits to work without relying on halfedge hacks from TDS2.h 2019-04-29 12:21:42 +02:00
Mael Rouxel-Labbé 842ae3fbbd Change T2 graph traits to only use finite elements
This is way more logical because infinite faces have corrupt geometry,
and do not present any particular use (if you want the convex hull, just
walk the border)

This is a breaking change, but the whole traits was so broken nobody could
have been using it in the first place anyway.
2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé aa4e1913d1 Partial revert of 42a1c49066
Halfedges in TDS2 and T2 were being used to get halfedges in the T2 graph traits
We now do it differently and without polluting the packages T2 and TDS2
2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé 9f57d48642 Factorize T2 graphs' properties via macros 2019-04-24 13:14:09 +02:00
Mael Rouxel-Labbé d9a0baa442 Multiple fixes for T2 graph traits factorization
(need independent iterator classes, make it work for RT2 despite RT2 having
a different vertex iterator, etc.)
2019-04-24 13:12:48 +02:00
Mael Rouxel-Labbé 092286a8b8 Fixed grabbing non-existent 'Point' typedef from a face base class 2019-04-23 11:44:19 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Sébastien Loriot 0651c97fdd Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-04-23 10:45:27 +02:00
Mael Rouxel-Labbé 62cb1b7283 Added class Triangulation_face_base_with_id_2 2019-04-23 10:32:59 +02:00
Mael Rouxel-Labbé 811810c02c Switch the three main triangulations' graph traits to a common version 2019-04-19 17:17:09 +02:00
Mael Rouxel-Labbé 09df9b5622 Added some common graph traits for all 2D triangulations 2019-04-19 17:14:52 +02:00
Mael Rouxel-Labbé 28a210837e Fixed missing vertex point pmap (+ property) in RT2 graph traits 2019-04-19 08:39:52 +02:00
Sebastien Loriot 7b01c13f8d
Merge pull request #2938 from afabri/Triangulation_2-internal-GF
Triangulation_2: Cleanup of include/CGAL
2019-04-18 15:51:15 +02:00
Sebastien Loriot 14ebc2fabc
Update Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
Co-Authored-By: afabri <andreas.fabri@geometryfactory.com>
2019-04-18 13:54:46 +02:00
Andreas Fabri d3128e75e5 We need two versions of the insert_constraint() function,
- one for the old API where constraints were just a 2d segment
- and one for polylines
2019-04-18 13:52:34 +02:00
Sebastien Loriot 80cece608c
Merge pull request #3595 from MaelRL/T2-Remove_strict_conflict_zone_boolean-GF
Triangulation_2: revert small feature DT2_strict_and_weak_conflict_zone
2019-04-12 15:35:06 +02:00
Andreas Fabri 899364b87b Remove files that were deprecated in 4.9 2019-04-12 14:57:18 +02:00
Andreas Fabri 5fdcfc989f Merge branch 'master' into Triangulation_2-internal-GF 2019-03-22 11:55:22 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau 82dd2b5cda Merge pull request #3669 from afabri/Triangulation_2-maybe_not_intialized-GF
Triangulation_2: Initialize to avoid warning
2019-02-13 15:38:25 +01:00
Laurent Rineau 9e056880e8 Better warning fix: do not initialize, and use CGAL_assume
Let the variable uninitialized, and instruct the compiler that the
condition where `i` remains uninitialized is an error condition.
2019-02-08 09:46:24 +01:00
Andreas Fabri a0ebd79e9d Triangulation_2: Initialize to avoid warning 2019-02-08 08:39:27 +01:00
Sébastien Loriot e4cbae525c Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-01-31 11:25:26 +01:00
Sébastien Loriot 99d842401a Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-31 11:24:50 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
Intersections_3:  Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Andreas Fabri 4bb714fd7b Fix OTR and T2 2019-01-18 10:34:47 +01:00
Mael Rouxel-Labbé 14150ef95c Revert commit b307771 ("bug fix for natural_neighbor_coordinates_2...
... using a small feature in the conflict zone functions of
Delaunay_triangulation_2")

See concerns raised in the (not-actually-approved) small feature:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/DT2_strict_and_weak_conflict_zone
2019-01-14 11:19:21 +01:00
Mael Rouxel-Labbé 502c28796d Clarify 'last' ==> 'top' 2019-01-11 13:56:06 +01:00
Andreas Fabri cf1d116d97 Remove files 2019-01-11 13:47:39 +01:00
Andreas Fabri 7009079e0c Move files to include/CGAL/Triangulation_2/internal and remove deprecated files 2019-01-11 13:46:58 +01:00
Mael Rouxel-Labbé 28ce2a5240 Fixed stack order in non recursive conflict walking
Edges must be output in a CCW order, which is achieved by walking ccw-ly first.
In the recursive function, we correctly call 'propagate(..., ccw(j))' first.
For the non-recursive version which uses a stack, then we must add 'ccw(j)'
last since the stack is a LIFO structure.
2019-01-11 12:32:43 +01:00
Andreas Fabri 630066dd24 Fix Mesh_2 testsuite 2019-01-10 17:31:54 +01:00
Sébastien Loriot c2f7814f19 prevent maybe-uninitialized warnings
they were triggered by
`l1 = t.line_walk(POINT(xr_left, yr_top), POINT(xr_right, yr_top), hface1);`
in `CGAL/apply_to_range.h`

Seen when compiling targets:
  Constrained_Delaunay_triangulation_2
  Polyline_simplification_2
  Delaunay_triangulation_2
2018-11-24 14:42:26 +01:00
Sébastien Loriot 54381db68a fix -Wmaybe-uninitialized warnings 2018-11-12 19:27:53 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Guillaume Damiand b45cf04fbf Align typedef 2018-10-15 14:20:30 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Laurent Rineau 531223bd11 Merge pull request #3271 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Implement the check that avoids to insert a constraint twice
2018-08-23 15:50:25 +02:00
Laurent Rineau 7c22eb11b2 Merge pull request #3271 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Implement the check that avoids to insert a constraint twice
2018-08-23 15:40:22 +02:00
Laurent Rineau 9afcd23be8 Implement the check that avoids to insert a constraint twice 2018-08-03 11:24:47 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
Add basic viewers
2018-06-14 17:36:37 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand bc4eca82b3 Need double cast 2018-06-13 10:47:44 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno fdeb5621ca replace cast in unsigned long int to std::size_t to fix warnings. 2018-06-07 13:55:22 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Laurent Rineau aa38a024c2 Merge pull request #3098 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points
2018-06-01 17:26:16 +02:00
Laurent Rineau c151778454 Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
Triangulation_23: fix wrong return type in spatial_sort functor

# Conflicts:
#	Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:24:23 +02:00
Laurent Rineau 0e9c09b4f4 Merge pull request #3098 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points
2018-06-01 17:21:58 +02:00
Laurent Rineau 72d2c8e1ef Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
Triangulation_23: fix wrong return type in spatial_sort functor

# Conflicts:
#	Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:21:44 +02:00
Andreas Fabri 1123afb70e Add Bbox_{2,3}.dilate(int) so that the snapping in the CT_2 also works with Projection_traits classes 2018-05-30 14:34:34 +02:00
Laurent Rineau c40d7124d0 Fix CDT_2 errors, using snapping of intersection points
When `Constrained_triangulation_2` computes the intersection of two
segments, with a floating-point number type, and with
`Exact_predicates_tag`, the computed intersection point is snapped to an
extremity of the two segments, if it is closest to 4 ulp (with the l-inf
distance).

That value `4` can be changed by defining the macro
`CGAL_CDT_2_INTERSECTION_SNAPPING_ULP_DISTANCE` to another value.
2018-05-30 14:34:34 +02:00
Maxime Gimeno 71d3514987 Fix Triangulation example 2018-05-29 12:05:57 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand 206a8a7e58 Move t2 viewer in cgal namespace 2018-05-29 11:04:57 +02:00
Guillaume Damiand 3f15cf7307 Add basic viewer for t2 2018-05-29 11:02:00 +02:00
Mael Rouxel-Labbé e9d3b9767e Fixed taking a reference to a temporary (when using EPECK) 2018-05-28 15:43:45 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 13:58:19 +02:00
Andreas Fabri 718db41ca5 Duplicates in TDS_2 and T_2 2018-05-23 11:48:58 +02:00
Sébastien Loriot da7826077a Merge pull request #2746 from afabri/Interpolation-vertices_V2-GF
Small feature: Interpolation with vertices
2018-05-07 11:45:23 +02:00
Mael Rouxel-Labbé f66196062d Fixed missing macro around inexact_locate 2018-05-04 13:57:39 +02:00
Andreas Fabri 97b5c37b6e Fix includes 2018-05-04 09:00:11 +02:00
Sébastien Loriot ad813dc4fe improving the doc 2018-04-30 09:19:15 +02:00
Maxime Gimeno 5fa7181360 changes in displayed text. 2018-04-30 09:19:15 +02:00
Maxime Gimeno 50ffa39ba6 Remove duplicated overload 2018-04-30 09:19:15 +02:00
Maxime Gimeno 121e4c3c50 Replace Throw_on_intersection_tag by the existing No_intersection_tag 2018-04-30 09:19:15 +02:00
Maxime Gimeno 944b540c54 Rename exception 2018-04-30 09:19:15 +02:00
Maxime Gimeno 3165eb1971 add a specific macro to silence the new warning 2018-04-30 09:19:15 +02:00
Maxime Gimeno fe07a1973c add doc in the right place. 2018-04-30 09:19:15 +02:00
Maxime Gimeno 6266570fc3 Move information from cerr to compilation warning and add an exception thrown with a new documented tag 2018-04-30 09:19:14 +02:00
Mael Rouxel-Labbé c5f134c9ae Readability changes 2018-04-26 13:58:23 +02:00
Mael Rouxel-Labbé 9faf52a7f5 Removed deprecated, undocumented, unused functions in T_face_base_2 2018-04-26 13:23:19 +02:00