Commit Graph

936 Commits

Author SHA1 Message Date
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Dmitry Anisimov 269a47d773
Merge branch 'master' into CGAL-clang_warnings_fix-danston 2021-01-14 16:51:13 +01:00
Dmitry Anisimov bd600286ee surface mesh simplification range loop analysis copy to ref warning fixed 2021-01-08 10:20:34 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Laurent Rineau 85325d789f Merge pull request #5090 from afabri/FastEnvelope-GF
Polygon Mesh Processing:  Add envelope test
2021-01-06 16:11:56 +01:00
Sébastien Loriot 02db50ae4f fix warnings 2021-01-04 10:36:14 +01:00
Andreas Fabri 8ae9070e5d Fix warnings 2020-12-30 09:06:19 +00:00
Andreas Fabri f6f8dcfcfd Add data set 2020-12-30 08:56:10 +00:00
Andreas Fabri b6bc0f9579 Fix test. huge did not mean the mesh but the size of the envelope 2020-12-22 10:01:28 +00:00
Sébastien Loriot a095b674e7 change extension to the one recognized by the demo 2020-12-09 14:20:07 +01:00
Andreas Fabri c84f5c1ee5 Address doxygen warnings 2020-11-26 09:56:33 +00:00
Andreas Fabri 08782bac8a Change Filter to PlacementFilter 2020-11-26 09:27:15 +00:00
Andreas Fabri 8ea3c4e653 Finally, we explain the Filter policy 2020-11-23 16:24:01 +00:00
Andreas Fabri 1f29b38fae Apply suggestions from code review
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-23 13:18:00 +01:00
Andreas Fabri 59061b926a fix doc 2020-11-20 12:06:42 +00:00
Andreas Fabri f4667246c2 rename file 2020-11-20 12:03:31 +00:00
Andreas Fabri d85af03761 Fix doc of Filter in SMS 2020-11-20 11:49:23 +00:00
Andreas Fabri e668500c05 fix named parameter 2020-11-17 07:52:51 +00:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Andreas Fabri 19234f15ea Fix include 2020-11-16 09:38:26 +00:00
Andreas Fabri 108b57687e fix CMakeLists.txt 2020-11-13 16:36:50 +00:00
Andreas Fabri f246c4abf8 merge 2020-11-13 16:26:57 +00:00
Andreas Fabri ac1200fe28 Cleanup of GetFilter 2020-11-10 10:52:53 +00:00
Andreas Fabri c510a89ea0 Improve doc 2020-11-10 09:59:01 +00:00
Andreas Fabri c01dfb1709 Update Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-11-09 22:40:24 +01:00
Andreas Fabri 041502a60c Move Envelope_filter to PMP 2020-11-05 08:43:33 +00:00
Andreas Fabri e1c1e1fbb6 capitalize file name in the #include (VC++ did not care) 2020-11-04 11:28:02 +00:00
Andreas Fabri 5ff48521d1 Use TLS; Fix SMS example 2020-11-04 09:53:38 +00:00
Andreas Fabri 85bb0775e8 Improve documentation 2020-11-02 14:44:46 +00:00
Andreas Fabri ff368dd84f Add SMS::Envelope_filter 2020-10-22 13:50:30 +01:00
Andreas Fabri 4ee9875556 Add example 2020-10-20 14:22:15 +01:00
Andreas Fabri f6302a9479 Remove test which uses FastEnvelope directly 2020-10-20 14:00:36 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Sébastien Loriot 87b8f66e14 update from master 2020-10-20 09:19:13 +02:00
Andreas Fabri 89c9ed68b6 change namespace and add doc 2020-10-20 09:17:16 +02:00
Andreas Fabri ef75dbb26d Deal with degenerate queries 2020-10-20 09:17:16 +02:00
Andreas Fabri a9b78f97a5 Add the test of SMS using the Envelope 2020-10-20 09:17:16 +02:00
Andreas Fabri 95556e2359 small doc changes 2020-10-20 09:17:14 +02:00
Andreas Fabri 5b21794bf6 Add documentation of the filter 2020-10-20 09:17:14 +02:00
Andreas Fabri deeff23907 Rename header file 2020-10-20 09:17:14 +02:00
Andreas Fabri e957de2993 Make the filter a named parameter 2020-10-20 09:17:09 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Jane Tournois bfd4e9915f rename named parameter graph_visitor to visitor 2020-09-15 15:42:24 +02:00
Andreas Fabri a308ff89bb Change tolerance as it becomes pretty slow 2020-09-10 11:02:43 +01:00
Andreas Fabri f31b7fe4e1 SMS: Use FastEnvelope to bound the error 2020-09-09 17:02:03 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
Mael Rouxel-Labbé 6f8a895671 Merge remote-tracking branch 'mine/CGAL-Improve_NP_doc_presentation-GF' into CGAL_IO-maxGimeno 2020-06-18 15:21:27 +02:00
Mael Rouxel-Labbé 26eb7903aa Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-18 12:46:46 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Maxime Gimeno 25c8313859 Replace IO functions in examples and fix Surface_mesh read_OFF() 2020-06-16 14:36:24 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Mael Rouxel-Labbé 038869cab9 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-05-12 15:12:21 +02:00
Sébastien Loriot d6d8fbeb8b the placement must store the triangles has the AABB-tree does not copy them 2020-04-27 16:06:43 +02:00
Sébastien Loriot 3e75af4fcd remove useless calls to accelerate_distance_queries 2020-04-23 17:00:12 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé 48bd92b4dd Proof read all NP changes 2020-04-13 13:03:05 +02:00
Mael Rouxel-Labbé 80f6f659f3 Update to new named parameters macros 2020-04-05 17:56:50 +02:00
Mael Rouxel-Labbé 16092f53d6 Update doc about NPs 2020-04-05 17:56:11 +02:00
Mael Rouxel-Labbé fc79510388 Regroup NP aliases into the base doxyfile.in 2020-04-04 17:26:32 +02:00
Mael Rouxel-Labbé e7d52999a8 Update PMP NPs to new macros 2020-03-29 17:16:50 +02:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +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
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00: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 cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Mael Rouxel-Labbé c33e8b60d7 Merge remote-tracking branch 'maxgimeno/PMP-Default_pmap-maxGimeno' into CGAL_IO-maxGimeno 2020-03-17 09:33:19 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Mael Rouxel-Labbé ad62f89a20 Use the new index map initializer functions and fix doc 2020-03-06 15:25:38 +01:00
Mael Rouxel-Labbé 547ff7764b Fix doc typo 2020-03-05 17:04:52 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Laurent Rineau 141eed441c Merge pull request #4508 from MaelRL/BGL-Fix_graph_has_property_doc-GF
BGL: fix doc of graph_has_property
2020-02-14 14:39:16 +01:00
Maxime Gimeno 14954c2f46 Fix SMS examples 2020-02-10 11:57:57 +01:00
Mael Rouxel-Labbé 19d18633ae Misc doc fixes 2020-02-07 16:11:22 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Maxime Gimeno a8820c69a9 Doc. 2020-01-28 13:45:27 +01:00
Maxime Gimeno 0de28e84ff Undocument 2020-01-28 12:45:31 +01:00
Mael Rouxel-Labbé 3df376ed83 Update dependencies
enter the commit message for your changes. Lines starting
2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 80f1583fa8 Minor doc improvements 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé fa83880b5e Document Bounded_distance_placement 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 38b780cdb6 Tiny improvement to GH doc 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 66b32fa3d1 Update test 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 46e7a8f930 Make it optional to pass the AABB tree 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 1ee8e7b838 Better output in the test 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 5ab92fef26 Keep the squared value in memory instead of recomputing it on every call 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé d556bcc5d6 Fix compilation / test 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 8c26549b65 Clean test 2020-01-28 12:45:29 +01:00
Mael Rouxel-Labbé 32e78834eb Clean header 2020-01-28 12:45:29 +01:00
Sébastien Loriot fd43d44fa5 do an initial try with the closest point since do_intersect is with a sphere and not a ball 2020-01-28 12:45:29 +01:00
Maxime Gimeno a17c5b1eb2 Update 2020-01-28 12:45:29 +01:00
Maxime Gimeno 5907ec9a18 Add Policy for bounded distance placement 2020-01-28 12:45:29 +01:00
Maxime Gimeno 844de0c5fc WIP waiting for the missing intersections 2020-01-28 12:45:29 +01:00
Maxime Gimeno 4351ecfb5e Add test for bench 2020-01-28 12:45:29 +01:00
Mael ea827e98ec
Fix GH example saying it uses a Polyhedron 2020-01-08 09:02:30 +01:00
Mael 0ae7d32f5f
Add Surface_mesh to SMS's doc dependencies 2020-01-08 08:46:08 +01:00
Mael Rouxel-Labbé 9a7c98f26c Minor code fixes 2019-11-29 11:42:18 +01:00
Mael Rouxel-Labbé 74d86e7e20 Minor doc fixes 2019-11-29 11:37:23 +01:00
Mael Rouxel-Labbé 6cbb0d0712 Make the VertexCostMap a member of the policy
If the dynamic property map isn't attached to the mesh, this could not
work previously.
2019-11-29 09:30:54 +01:00
Mael Rouxel-Labbé 55bb46a383 Use DontAlign property for garland heckbert matrices
See discussion in: https://github.com/CGAL/cgal/pull/4279

Initial warning: https://cgal.geometryfactory.com/CGAL/testsuite/results-5.1-Ic-11.shtml#Surface_mesh_simplification_Examples
2019-11-29 09:29:48 +01:00
Mael Rouxel-Labbé c9836ce5d7 Fix comment 2019-11-29 09:28:32 +01:00
Mael Rouxel-Labbé 5057df5cb7 Properly forward a parameter 2019-11-20 09:09:05 +01:00
Mael Rouxel-Labbé 0813fd740b Move partial specializations outside of the Edge_collapse.h class 2019-11-19 11:04:14 +01:00
Mael Rouxel-Labbé ddf9be579b Fix conversion warnings 2019-11-15 11:44:04 +01:00
Mael Rouxel-Labbé a0db18b0bb Fix code typo 2019-11-15 11:43:49 +01:00
Mael Rouxel-Labbé a1763c8789 Mark expensive assertions as expensive 2019-11-15 11:43:32 +01:00
Mael Rouxel-Labbé 6cf6b13e69 Make it possible to change the stop ratio from command line 2019-11-15 11:42:57 +01:00
Mael Rouxel-Labbé 11e49e817c Fix compilation of SMS trace code 2019-11-15 11:17:19 +01:00
Mael Rouxel-Labbé ea3736ab20 Fix using full specialization of functions within non namespace scopes 2019-11-15 11:11:04 +01:00
Mael Rouxel-Labbé 6f96731156 Fix header license text 2019-10-28 09:41:51 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02:00
Mael Rouxel-Labbé 7587bf5f48 Add missing doc file + add a note about requiring Eigen 2019-10-24 14:34:22 +02:00
Mael Rouxel-Labbé 1fc58a433f misc code cleaning 2019-10-21 15:31:07 +02:00
Mael Rouxel-Labbé 64ba5fa006 Clarify in the documentation that a null placement means no collapse 2019-10-21 15:30:46 +02:00
Mael Rouxel-Labbé 9b30a557f8 Remove incorrect comment about null placements 2019-10-21 15:21:27 +02:00
Mael Rouxel-Labbé f152b54a91 Add a few words about implementation history + add new authors 2019-10-21 14:39:03 +02:00
Mael Rouxel-Labbé 9dba3fa0ae Update maintainer 2019-10-21 12:49:28 +02:00
Mael Rouxel-Labbé 665dc8ae3f Fix LCC reading always argv[1]... 2019-10-21 00:27:22 +02:00
Mael Rouxel-Labbé 7be4775087 Fix old assertion that had not been updated when constraints were introduced 2019-10-21 00:22:09 +02:00
Mael Rouxel-Labbé b70a9e9239 Move example data to appropriate folder, get rid of .cmd, misc improvements 2019-10-21 00:21:49 +02:00
Mael Rouxel-Labbé 5fb5e7206f Fix SMS CmakeLists disabling all examples if Eigen is not found 2019-10-20 21:40:21 +02:00
Mael Rouxel-Labbé 784c8b09d2 Fix formatting 2019-10-20 19:45:14 +02:00
Mael Rouxel-Labbé 8a1dd342ea Tiny doc changes 2019-10-20 12:50:08 +02:00
Mael Rouxel-Labbé 41118d7f39 Update dependencies 2019-10-20 12:26:16 +02:00
Mael 082732ee59
Fix missing include 2019-10-20 01:37:45 +02:00
Mael Rouxel-Labbé 19c02bdd0b Fix missing include 2019-10-19 18:06:05 +02:00
Mael Rouxel-Labbé c488a14d96 Regroup both GH policies within a single class
Simpler API (users don't have to explicit the vertex cost map) + clearer
that they must go together.
2019-10-19 18:03:01 +02:00
Sébastien Loriot c4c1a0b317 Remove license notice in headers manually 2019-10-19 16:00:05 +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
Mael Rouxel-Labbé 9314f5a3d7 CLean and improve examples 2019-10-18 23:25:21 +02:00
Mael Rouxel-Labbé 09bd731ff9 Finish documentation 2019-10-18 23:09:21 +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 Rouxel-Labbé eb2942bc37 No more lies about the concept EdgeProfile, it does not exist.
Users cannot actually set any model, it is hardcoded to be SMS::Edge_profile
2019-10-17 16:19:47 +02:00
Mael Rouxel-Labbé 4ec28cb79b Add a traits class member to Surface_mesh_simplification
Can be passed via named parameters, must be compatible with the VPM
2019-10-17 15:35:56 +02:00
Mael Rouxel-Labbé d7e26020f4 Minor cleaning (no real changes) 2019-10-17 12:53:04 +02:00
Mael Rouxel-Labbé 9e74b606d3 Explicit the fact that GH_cost and GH_placement must be used together 2019-10-17 12:43:25 +02:00
Mael Rouxel-Labbé 7b1547d1f0 Continue improving Surface_mesh_simplification
- Use BGL functions
- Simplify trivially simplifiable code
- Use proper nomenclature (no camel code, stop using capital
  on members, etc.)
- Fix Edge and Halfedge being mixed (edge_index_map
  being a halfedge index map, etc.)
- Get rid of package specific macros so that assertions are
  actually doing something
- Minor indentation changes
2019-10-16 16:01:26 +02:00
Mael Rouxel-Labbé a88382283b Clean weird and useless converter shenanigans in OpenMesh-based simplification
Profile::Point is by definition equal to Profile::VPM::value_type,
so it is not converting anything.

Users are free to pass a custom VPM, and in that case things will break
because there is no proper geom traits being passed, but this is an
independent issue that must be fixed.
2019-10-16 15:32:45 +02:00
Mael Rouxel-Labbé 4a89522dec Fix bad stop value in example 2019-10-16 13:06:22 +02:00
Mael Rouxel-Labbé e4b2be3e4b Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-16 12:32:30 +02:00
Mael Rouxel-Labbé f121c194b4 Fixes for GH:
- Actually use the VPM
- Do not compute the planes needlessly: loop faces rather than vertices
- Some minor fixes
2019-10-16 11:06:12 +02:00
Mael Rouxel-Labbé 12a7ac136a Remove obsolete file 2019-10-15 14:01:32 +02:00
Mael Rouxel-Labbé ae3f7d1e1a Revert unpractical change (forces having to specify template parameters) 2019-10-15 14:00:55 +02:00
Mael Rouxel-Labbé bcfec4ef89 Remove deleted examples from the list of examples 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé d5a05392b0 Fix type 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé 15dae12dcc Some doc cleaning 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé c0b61fbace Mirror commit c6fc4568fe 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé f026201511 Misc SMS cleaning 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé 63e8bf841a Fix wrong sign 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé a835744ff7 Improve GH simplification example 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé cb3c68eca2 Rework the storing of cost marices for GH simplification 2019-10-15 13:59:09 +02:00
Mael Rouxel-Labbé 4a0f4536d6 Make it possible to pass a value for the stop criterion 2019-10-15 13:59:08 +02:00
Mael Rouxel-Labbé 7b3a59f355 Remove undesired files 2019-10-15 13:59:07 +02:00
Mael Rouxel-Labbé d7f615dd6e Clean code 2019-10-15 13:58:13 +02:00
Mael Rouxel-Labbé fd4f6e6673 Remove GH + Polyhedron example
one example w/ Surface_mesh is enough
2019-10-15 13:58:13 +02:00
Baskin Senbaslar 33bd6ef391 garland&heckbert docs added 2019-10-15 13:58:13 +02:00
Baskin Senbaslar a662c97f00 map_type change to state_type 2019-10-15 13:58:13 +02:00
Mael Rouxel-Labbé b3595ecf6e Use bounded GH placement in the Surface_mesh example 2019-10-15 13:58:13 +02:00
Mael Rouxel-Labbé bfdaf7f2de Do not return a cost if there is no placement (GH) 2019-10-15 13:58:13 +02:00
Baskin Senbaslar 2c37b32f92 borders are handled based on edges instead of vertices 2019-10-15 13:58:13 +02:00
Mael Rouxel-Labbé 1b7c1c3417 Fix default value so that the comment makes sense 2019-10-15 13:58:13 +02:00
Mael Rouxel-Labbé 5b537f5b3d Minor improvements to the surface_mesh GH example 2019-10-15 13:58:13 +02:00
Baskin Senbaslar 0e0c312bf4 garland&heckbert border bad simplification issue solved 2019-10-15 13:58:13 +02:00
Baskin Senbaslar cd7fd75efc GarlandHeckbert_cost_stop_predicate added 2019-10-15 13:58:13 +02:00
Baskin Senbaslar 9438b6c168 several changes, fix the issue with plane normal normalization 2019-10-15 13:58:10 +02:00
Baskin Senbaslar edd760df03 timing added to CGAL's garland&heckbert examples 2019-10-15 13:56:28 +02:00
Sébastien Loriot c6fc4568fe do not collapse an edge is the placement cannot be computed 2019-08-19 13:45:45 +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
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters
no longer rely on boost
2019-07-14 22:45:47 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +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 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Baskin Senbaslar b4e313e323 garland&heckbert null-face problem solved, 1 more example added for polyhedron meshes 2019-06-13 16:09:06 +03:00
Baskin Senbaslar 0c893d8167 garland&heckbert non invertible derivative matrix handled with alternative optimization 2019-06-11 17:39:22 +03:00
Baskin Senbaslar 22e02f0d65 Add garland&heckbert mesh simplification first structure and implementation 2019-06-07 22:59:59 +03:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Mael Rouxel-Labbé b2cb2e708d Clean interal code
- Get rid of abusive and often useless 'using'
- Rename Detail to internal to align with conventions
- put internal code in 'internal' namespace
- Put include headers where they matter rather than in Common.h
2019-05-09 11:41:58 +02:00
Mael Rouxel-Labbé 2e178c106b Remove "convenience" headers that are actually just cluttering things up 2019-05-09 09:40:36 +02:00
Mael Rouxel-Labbé 6d8d0b564c Clean SMS code (whitespace, indentation, variable names, clumsy for loops, etc) 2019-05-09 09:31:35 +02:00
Mael Rouxel-Labbé 4747f8ccaf Improve reader sanity
- Re-indent to more normal standards
- Remove usage of *_impl.h
- Clean useless and trailing whitespace
- some minor code readability changes
2019-05-03 14:56:21 +02:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Andreas Fabri 596661526e fix (sub)section 2019-03-22 08:46:46 +01:00
Andreas Fabri 60f54882f9 Examples with Surface_mesh 2019-03-21 19:40:08 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Andreas Fabri e254a770df Some Fixes for #3457 2019-03-19 19:20:40 +01:00
Andreas Fabri e08d85f3e3 Set precision of the ostream when writing a point set or face graph. Add a \note in the manual 2019-03-04 15:50:18 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Sébastien Loriot e474d61fa7 handle the case of degenerate volumes in the link condition
a volume is degenerate if it consists only of twice the same face
with opposite orientation
2018-09-04 10:09:08 +02:00
Sebastien Loriot 9938100097
Merge pull request #2955 from afabri/BGL-include_cleanup-GF
Do not include some BGL related header files
2018-05-15 22:21:42 +02:00
Sebastien Loriot c09e6ec7bc
Merge pull request #2741 from sloriot/SMS-clean_up_doc
Cleanup documentation
2018-05-07 11:29:48 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Laurent Rineau b141cbd1ef Fix the dependencies, again 2018-03-07 15:59:45 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Sébastien Loriot f2b1e70d80 rename ECM -> TM in code 2018-01-16 10:03:06 +01:00
Sébastien Loriot c6839a6aea fixes in the user manual
picked from @MaelRL
2018-01-16 10:01:35 +01:00
Sébastien Loriot 20f9ae4ee2 replace ECM by TriangleMesh in the doc 2018-01-16 09:43:01 +01:00
Sébastien Loriot d93ab6432b remove EdgeCollapsableSurfaceMesh concepts and use BGL ones 2018-01-16 09:42:53 +01:00
Sébastien Loriot ee297db460 Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch' 2017-12-21 15:16:10 +01:00
Sébastien Loriot 09a7f58410 Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-12-21 15:15:20 +01:00
Sébastien Loriot 989264e32b only the counts must be tight
lSize must be num_edges as we use an array for edge property
we access using halfedge index properties
2017-12-21 15:08:20 +01:00
Laurent Rineau 61e662c4e4 Merge pull request #2649 from sgiraudot/BGL-Regroup_named_parameters-GF
Regroup PMP named parameters with BGL named parameters

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h
2017-12-19 16:33:44 +01:00
Mael Rouxel-Labbé ad947da752 Give each package a NamedParameters.txt 2017-12-12 00:07:57 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau f37630bc0f Merge branch 'releases/CGAL-4.11-branch'
# Conflicts:
#	Kernel_23/test/Kernel_23/include/CGAL/_Result_of_kernel.h
#	Kernel_23/test/Kernel_23/test_result_of.cpp
2017-12-05 18:14:23 +01:00
Laurent Rineau 9513533b68 Merge pull request #2643 from sloriot/SMS-use_tight_edge_numbers
Use a tight count for the number of edges
2017-12-05 17:58:25 +01:00
Sébastien Loriot 4e8639edb9 workaround a warning with MSVC 2017-12-04 11:50:52 +01:00
Sébastien Loriot c0eb7c33e1 use a tight count for the number of edges 2017-11-29 14:54:12 +01:00
Sébastien Loriot 19adf3b05e make the doc match struct/class with the implementation 2017-11-17 11:34:55 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau 46cc91e787 Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 17:06:22 +02:00
Laurent Rineau 8902d8e929 Merge pull request #2500 from afabri/SMS-add_typedef-GF
Surface_mesh_simplification: Add a missing typedef
2017-10-11 19:14:41 +02:00
Andreas Fabri 5b69ef7783 Add typedef .. ECM so that one can wrap the Midpoint_placement 2017-10-05 08:39:31 +01:00
Andreas Fabri 42a24a45cd fix typo 2017-09-21 13:50:48 +01:00
Andreas Fabri b3cc873679 fix warning 2017-09-21 09:23:43 +01:00
Laurent Rineau 66ced61e7b Fix a warning
```
...\test_edge_profile_link.cpp(68) : warning C4800: 'void *' : forcing value to bool 'true' or 'false' (performance warning)
```
2017-08-29 10:33:38 +02:00
Laurent Rineau e5f49829cd Merge pull request #2350 from sloriot/SMS-fix_link_computation
Fix the link computation for edges on the border
2017-08-28 12:57:15 +02:00
Laurent Rineau ff6cea1719 Merge pull request #2350 from sloriot/SMS-fix_link_computation
Fix the link computation for edges on the border
2017-08-28 12:50:10 +02:00
Sébastien Loriot 4bfbc0259e add missing include directive 2017-08-25 11:23:03 +02:00
Sébastien Loriot a0d5974884 test link computed by edge profile 2017-08-24 11:13:10 +02:00
Sébastien Loriot 4d68958d82 fix the link computation
the only tedious point is what to do with the target vertices
of endleft and endright that might be the target of the
halfedges used to start the link extraction
(that is opp(prev(v0v1)) and opp(prev(v1v0)))
The fix consists in checking whether such a vertex will be (were) added
by the next (previous) while-loop.
2017-08-24 11:07:03 +02:00
Sébastien Loriot 486a32c3ec fix call to named parameter function
+add missing line to compile edge_collapse_bounded_normal_change.cpp
2017-08-11 16:19:15 +02:00
Laurent Rineau 4c57786059 Merge pull request #2193 from afabri/SMS-geometrically_valid-GF
Surface Mesh Simplification: Introduce placement that bounds change of face normal
2017-07-25 18:17:18 +02:00
Andreas Fabri 6c0323fc8a fix typos and indentation 2017-07-17 16:39:27 +02:00
Andreas Fabri 2a0dde7956 Document the constructors 2017-07-03 22:37:33 +02:00
Guillaume Damiand 4c9bbc06af Merge branch 'master' into BGL-LCC-gdamiand 2017-06-30 17:18:53 +02:00