Commit Graph

72957 Commits

Author SHA1 Message Date
Laurent Rineau 7d34fc5dbd Add compatibility: support when Patch_id is Tag_true/Tag_false 2017-05-29 13:24:07 +02:00
Laurent Rineau 2c2ad9ff6d Move properties from <CGAL/Mesh_polyhedron_3.h>...
... to `<CGAL/boost/graph/PMP_properties_Polyhedron_3.h>`.
2017-05-29 13:24:06 +02:00
Maxime Gimeno 9a3dde95ba Fix missing headers and definitions, SFINAE problems and ambiguous specialisation. 2017-05-29 13:24:06 +02:00
Maxime Gimeno 634488f610 Fix
- missing calls
- SFINAE problems for surface_mesh property_maps
- Detect_features_in_polyhedra updates in plugins
2017-05-29 13:24:06 +02:00
Andreas Fabri 5e7a5d656c Clean up the examples again; Add an example for two polyhedra 2017-05-29 13:24:06 +02:00
Andreas Fabri 0f28155729 I had to change Detect_features_in_polyhedra as the property map must be retrieved for the polyhedron passed to a function 2017-05-29 13:24:05 +02:00
Andreas Fabri e18f7037cf Add timer 2017-05-29 13:24:03 +02:00
Maxime Gimeno 5db694c154 polyhedral domain with features works for Surface_mesh and cheese.off (Polyhedron does no longer :(
Conflicts:
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
	Surface_mesh/include/CGAL/boost/graph/PMP_properties_Surface_mesh.h
2017-05-29 13:22:37 +02:00
Andreas Fabri 7bd5016c6d bglize and add property maps. polyhedral domain with features works almost for Surface_mesh 2017-05-29 13:22:37 +02:00
Maxime Gimeno 451af8f3ef bglize and add property maps. polyhedral domain with features works almost for Surface_mesh
Conflicts:
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
	Surface_mesh/include/CGAL/boost/graph/PMP_properties_Surface_mesh.h
2017-05-29 13:22:37 +02:00
Andreas Fabri 5a302c805d Make make_mesh_3() work for Surface_mesh 2017-05-29 13:22:37 +02:00
Maxime Gimeno 1330777a31 Make property maps for PMP and Surface_mesh generic
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h
2017-05-29 13:22:37 +02:00
Maxime Gimeno b122889723 Make the Detect_sharp_edges_plugin work with a SM_item
- finished the BGL-ization of Detect_features_in_polyhedra.h
- added a feature edges visualization to the SM_item.

Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h
2017-05-29 13:22:36 +02:00
Andreas Fabri 2e4524e11f Remove face_degree; Fix warnings 2017-05-29 13:22:36 +02:00
Maxime Gimeno 897a377344 Fix after rebase 2017-05-29 13:22:36 +02:00
Maxime Gimeno 8b9eae7f44 Fix rebase 2017-05-29 13:22:35 +02:00
Maxime Gimeno ca23909bb1 Move SMesh definition and its property_maps to a dedicated header. 2017-05-29 13:22:33 +02:00
Maxime Gimeno 298bed08c1 remove duplicated header 2017-05-29 13:21:32 +02:00
Maxime Gimeno 8bd9e88a5e Indentation 2017-05-29 13:21:31 +02:00
Maxime Gimeno 04d76d5852 Makes the Is_constrained_map light and remove the property_map after usage. 2017-05-29 13:21:31 +02:00
Maxime Gimeno e63a5a845d Fix indentation issues 2017-05-29 13:21:31 +02:00
Maxime Gimeno f0740e8f32 update cgal_test script 2017-05-29 13:21:30 +02:00
Maxime Gimeno c65f0116a6 change names of confusing targets 2017-05-29 13:21:30 +02:00
Maxime Gimeno 8910d61bce remove debug code 2017-05-29 13:21:28 +02:00
Maxime Gimeno ce9082bad5 Fixes after merge:
- fix merge errors
- fix picking unbinding in selection
- fix AABB_primitive triangulation in SM_item
2017-05-29 13:20:41 +02:00
Maxime Gimeno 2c1c78270b Fix doc of face_degree 2017-05-29 13:20:41 +02:00
Laurent Rineau d50e391577 Move properties from <CGAL/Mesh_polyhedron_3.h>...
...to `<CGAL/boost/graph/PMP_properties_Polyhedron_3.h>`.

Conflicts:
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
2017-05-29 13:20:41 +02:00
Maxime Gimeno d88dad8bef Clean-up and warning fix.
- Use constructor of sm descriptors instead of static_casts.
2017-05-29 13:20:41 +02:00
Maxime Gimeno 8e9ebaae2d Fix misisng Emptyset_iterator. 2017-05-29 13:20:40 +02:00
Maxime Gimeno 3c4206d0a7 Fix Warning 2017-05-29 13:20:40 +02:00
Maxime Gimeno a3e715cbb7 Remove modifications to Mesh_simplification_plugin.cpp 2017-05-29 13:20:40 +02:00
Maxime Gimeno 5e630f5c48 Move Detect_feature_edges to PMP 2017-05-29 13:20:40 +02:00
Maxime Gimeno fd85459322 Fix applicable() 2017-05-29 13:20:39 +02:00
Maxime Gimeno 8c2b3a5321 Fix Overwrite and discard edit 2017-05-29 13:20:39 +02:00
Maxime Gimeno 880b6e21a2 Fixes and Clean-up.
- Move the new properties in a file in PMP and remove them from the namespace boost.
- Move the surface mesh properties from properties_Surface_mesh.h to Scene_surface_mesh_item.h
2017-05-29 13:20:39 +02:00
Maxime Gimeno 278c5b6154 Fix missing typename and template 2017-05-29 13:20:39 +02:00
Andreas Fabri b5212bd83b Make surface mesh simplification plugin work for Surface_mesh 2017-05-29 13:20:38 +02:00
Maxime Gimeno 9f44aada51 fix detect_sharp_edges_plugin 2017-05-29 13:20:38 +02:00
Andreas Fabri a33e423d2e Add property maps to Mesh_polyhedron_3::type 2017-05-29 13:20:38 +02:00
Maxime Gimeno 7a3c096c72 fix detect_features 2017-05-29 13:20:38 +02:00
Maxime Gimeno fe6aa1993a Fix selection_io 2017-05-29 13:20:37 +02:00
Maxime Gimeno 8ef8605251 Fix the shortcut ambiguity. 2017-05-29 13:20:37 +02:00
Maxime Gimeno f66b5d4154 Surface_mesh-ize the importation of ROI from selection_item 2017-05-29 13:20:37 +02:00
Maxime Gimeno 1c13cb9ca4 update deformation 2017-05-29 13:20:37 +02:00
Maxime Gimeno f0ff34dda6 Use a specific unified k_ring item with the double target strategy for the selection_item to avoid moc problems. 2017-05-29 13:20:36 +02:00
Maxime Gimeno 3c7c2a663d Fix signals/slots between selection_item and k_ring_selector 2017-05-29 13:20:36 +02:00
Maxime Gimeno 6b2a44c75e Link only with the right library in CMakeLists.txt 2017-05-29 13:20:36 +02:00
Andreas Fabri c8bc628c90 WIP: make the selection plugin work for Surface_mesh 2017-05-29 13:20:33 +02:00
Maxime Gimeno 6e9156b9e4 Fix the remeshing. 2017-05-29 13:19:38 +02:00
Maxime Gimeno eb7ebe5da6 Code factorized and isolated components features added for surface_mesh.
Which means that the One_ring_iterator and the Travel_isolated_components have been BGLized.
2017-05-29 13:19:38 +02:00