Commit Graph

247 Commits

Author SHA1 Message Date
Julian Komaromy df368bcabe make quadric detail customizable 2021-06-08 21:12:32 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43: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
Andreas Fabri f6f8dcfcfd Add data set 2020-12-30 08:56:10 +00:00
Sébastien Loriot a095b674e7 change extension to the one recognized by the demo 2020-12-09 14:20:07 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01: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 5ff48521d1 Use TLS; Fix SMS example 2020-11-04 09:53:38 +00:00
Andreas Fabri 4ee9875556 Add example 2020-10-20 14:22:15 +01:00
Andreas Fabri e957de2993 Make the filter a named parameter 2020-10-20 09:17:09 +02: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
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 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +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
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é 547ff7764b Fix doc typo 2020-03-05 17:04:52 +01:00
Maxime Gimeno 14954c2f46 Fix SMS examples 2020-02-10 11:57:57 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Mael Rouxel-Labbé c9836ce5d7 Fix comment 2019-11-29 09:28: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é 665dc8ae3f Fix LCC reading always argv[1]... 2019-10-21 00:27:22 +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é 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
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
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é 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é a835744ff7 Improve GH simplification example 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
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
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 22e02f0d65 Add garland&heckbert mesh simplification first structure and implementation 2019-06-07 22:59:59 +03: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 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
Andreas Fabri 60f54882f9 Examples with Surface_mesh 2019-03-21 19:40:08 +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
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
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 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
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
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
Guillaume Damiand 25d6abcc1a Add missing cmd file for edge_collapse_linear_cell_complex example. 2017-06-28 09:48:41 -04:00
Maxime Gimeno d019010144 Fix exemple 2017-06-28 11:28:05 +02:00
Andreas Fabri ea47806461 chmod -x 2017-06-26 11:12:02 +02:00
Andreas Fabri 3f3b3b4812 Document new placement 2017-06-26 11:08:34 +02:00
Andreas Fabri c55f66a170 WIP: document new placement 2017-06-26 11:08:34 +02:00
Andreas Fabri 00f3c27eae Add a placement class that avoids a change of >90deg of facet normals 2017-06-26 11:08:33 +02:00
Andreas Fabri 3f46969e88 resolve merge conflict 2017-06-26 11:08:33 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Laurent Rineau b037471750 Merge pull request #2075 from afabri/CGAL-dont_include_graph_traits_header-GF
Do not include graph_traits_{Polyhedron | Surface_mesh}.h
2017-05-19 10:28:38 +02:00
Guillaume Damiand 885ef4775a Update examples and tests following renaming of BGL LCC helpers. 2017-05-10 16:20:11 -04:00
Andreas Fabri 1dbedb7391 fix choices of std::cerr or std::cout 2017-04-27 09:04:12 +02:00
Andreas Fabri 1433a9f780 write to std::cout and not std:cerr 2017-04-25 14:46:23 +02:00
Andreas Fabri 931ea6a0d0 Add is_triangle_mesh test in SMS package 2017-04-25 11:22:12 +02:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand 1d765e91c9 Update mesh simplification example for lcc. 2017-03-27 12:42:17 -04:00
Laurent Rineau eb5f52869f Use the new API of target_link_libraries
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02:00
Guillaume Damiand 04d10f13e9 Update graph traits and properties for lcc. 2017-03-23 13:33:37 -04:00
Guillaume Damiand ff61b85322 update after rebase 2017-03-22 17:39:33 -04:00
Guillaume Damiand 42f60df224 use BGL function is_valid and not the one in lcc. Now surface mesh simplification seems to work with lcc. 2017-03-22 16:36:01 -04:00
Guillaume Damiand 245e7751da Move edge_collapse_linear_cell_complex.cpp file from BGL test to Surface_mesh_simplification examples. 2017-03-22 16:36:01 -04:00
Sébastien Loriot 6325b309f3 add a stop predicate to collapse all short edges 2016-10-21 14:43:33 +02:00
Andreas Fabri 39c27cb9db Call approximate_dihedral_angle() from the Kernel 2016-10-17 14:59:42 +02:00