Commit Graph

4271 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 2672713308 Renamed Bare_point_3 > Bare_point 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé c1789207f1 Fixed compilation issues resulting from the removal of WP->P implicit conversion 2017-06-08 13:23:10 +02:00
Andreas Fabri 209776f628 make the Polyhedron demo mesh_3_plugin work 2017-06-08 13:23:10 +02:00
Laurent Rineau d2b17be2da Merge pull request #2126 from maxGimeno/Polyhedron_demo-Fixes_in_P_demo-GF
Polyhedron_demo: Fix empty group_item RenderingMode
2017-05-29 11:17:43 +02:00
Laurent Rineau 2a71690ded Merge pull request #1921 from MaelRL/Subdivision-FaceGraph-GF
Subdivision Facegraph
2017-05-29 11:16:48 +02:00
Laurent Rineau 7efcc76430 Merge pull request #1954 from maxGimeno/Polyhedron_demo-Update_SM_item_visu-GF
Polyhedron_demo: Update Scene_surface_mesh_item
2017-05-29 11:16:32 +02:00
Laurent Rineau 0685006e33 Merge pull request #2081 from maxGimeno/Merge_3d_demos-GF
Polyhedron_demo: Add an Alpha_shape_plugin
2017-05-29 11:16:21 +02:00
Laurent Rineau c174b9880d Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-05-26 17:56:13 +02:00
Laurent Rineau ab87eaf8c8 Merge pull request #2137 from sloriot/PMP-bug_fixes
Polygon Mesh Processing bug fixes
2017-05-26 17:52:22 +02:00
Sébastien Loriot 557807573b update function calls to the new name 2017-05-25 09:25:00 +02:00
Laurent Rineau 7e651b6b78 Merge branch 'releases/CGAL-4.10-branch'
Merges two pull-requests:

- 9384ff4 Merge pull request #2133 from maxGimeno/Fix_cmake_warning_CMP0053-GF
- 0005d61 Merge pull request #2132 from sloriot/Kernel-use_CGAL_compare
2017-05-24 17:45:58 +02:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Laurent Rineau fafa40b2e5 Merge pull request #2044 from sgiraudot/Polyhedron_demo-Reorganize_selection_widget-GF
Polyhedron demo: Reorganize selection plugin
2017-05-22 11:00:18 +02:00
Laurent Rineau 5b0c302a2c Merge pull request #2044 from sgiraudot/Polyhedron_demo-Reorganize_selection_widget-GF
Polyhedron demo: Reorganize selection plugin
2017-05-22 11:00:09 +02:00
Maxime Gimeno 73007cc17c silent warnings and change name of generated polygon_soup 2017-05-22 10:01:45 +02:00
Maxime Gimeno d0c25b3428 Add a tooltip for the FaceGraph Mode in the Preference.ui 2017-05-19 14:10:42 +02:00
Maxime Gimeno 6518d80f82 Change the values of the enum to match the property's name. 2017-05-19 14:10:42 +02:00
Maxime Gimeno 6f9f9b6c0b Add a function face_graph() to Polyhedron_item and Surface_mesh_item 2017-05-19 14:10:42 +02:00
Maxime Gimeno a0cdb21844 Change the set_facegraph_type_adpater to use the set_facegraph_default_type function. 2017-05-19 14:10:41 +02:00
Maxime Gimeno dc07d11b27 Changes :
- fix indentation issues
- make the polyhedron_mode a property of the mainwindow instead of the scene
- remove patch_id functions of Surface_mesh_item
- Rename FaceGraph Face_graph
2017-05-19 14:10:41 +02:00
Maxime Gimeno a24435233a Finish modifying the API for the Facegraph_mode. 2017-05-19 14:10:41 +02:00
Maxime Gimeno 4260d0f577 Remove property maps from header and adapt Polyhedorn_mode selection to its new name 2017-05-19 14:07:30 +02:00
Maxime Gimeno 360b419724 remove set_patch_id() from polyhedron_item 2017-05-19 14:07:30 +02:00
Maxime Gimeno 9ac4d02710 Change polyhedronMode name. 2017-05-19 14:07:30 +02:00
Maxime Gimeno 290603e5d7 Fix after rebase 2017-05-19 14:07:06 +02:00
Maxime Gimeno 38a991006b Use dynamic properties to determine isPolyhedronMode() 2017-05-19 14:07:06 +02:00
Maxime Gimeno 18843d8d56 Remove the call to compute_elements() located in the constros to silence asserts. 2017-05-19 14:06:35 +02:00
Maxime Gimeno ec6def94ac clean up 2017-05-19 14:06:35 +02:00
Andreas Fabri d4004a43c8 Add properties.h 2017-05-19 14:06:35 +02:00
Maxime Gimeno 0279f7eaf4 Prepare Surface_mesh_item for selection_plugin 2017-05-19 14:06:35 +02:00
Maxime Gimeno ab61ff92f2 remove debug code 2017-05-19 14:06:35 +02:00
Andreas Fabri 0734bc51df Add initialization of colors for the Scene_surface_mesh_item 2017-05-19 14:06:35 +02:00
Maxime Gimeno 483a0df2c8 Add visu for face_patch_ids. 2017-05-19 14:06:35 +02:00
Andreas Fabri 8bbf322fb4 Add set_patch_id() to Polyhedron and Surface_mesh item 2017-05-19 14:06:35 +02:00
Maxime Gimeno 25821c1687 Replaces the usage of a map by a call to collect_garbage. 2017-05-19 14:06:34 +02:00
Maxime Gimeno feba66edf7 Add a public typedef FaceGraph to Scene_surface_mesh_item and Scene_polyhedron_item. 2017-05-19 14:06:34 +02:00
Maxime Gimeno 92c7f227a7 - Clarify doc
- make the indices map local
- make the Polyhedron Mode a setting in the preference dialog
2017-05-19 14:06:34 +02:00
Maxime Gimeno e07e19271d Add a toggle to specify if we are in Polyhedron_mode(default) or Surface_mesh mode, in the Edit menu. This value is accessible from a Scene_interface object under the name isPolyhedronMode(). 2017-05-19 14:05:01 +02:00
Maxime Gimeno c12db43f94 Add a default constructor to the Scene_surface_mesh_item 2017-05-19 14:03:19 +02:00
Maxime Gimeno 4fcb56f716 Update Scene_surface_mesh_item with invalidateOpenGLBuffers. 2017-05-19 14:03:19 +02:00
Laurent Rineau 3e05153f75 Merge pull request #2104 from maxGimeno/Polyhedron_demo-Fix_draw_two_sides-GF
Polyhedron_demo: Fix draw two sides for Polyhedron
2017-05-19 10:29:49 +02:00
Laurent Rineau 9c873a799a Merge pull request #2098 from janetournois/Polyhedron_demo-small_fixes-GF
Polyhedron demo : two small fixes
2017-05-19 10:29:34 +02:00
Laurent Rineau d2f0317f2a Merge pull request #2093 from sloriot/Polyhedron_demo-restore_cursor
Restore cursor if operation is not possible
2017-05-19 10:29:18 +02:00
Laurent Rineau a07cd292d9 Merge pull request #2071 from janetournois/Polyhedron_demo-improve_surf_reader-GF
Polyhedron demo : improve .surf reader
2017-05-19 10:28:22 +02:00
Laurent Rineau 529f9b1261 Merge pull request #2019 from maxGimeno/Polyhedron_demo-enhance_statistics-GF
Add genus for closed polyhedra.
2017-05-19 10:28:14 +02:00
Laurent Rineau 2ac0a5da5e Merge pull request #2062 from maxGimeno/Polyhedron_demo-Color_and_camera-GF
Polyhedron_demo: color and camera
2017-05-19 10:27:35 +02:00
Laurent Rineau 5a9ab6e377 Merge pull request #2104 from maxGimeno/Polyhedron_demo-Fix_draw_two_sides-GF
Polyhedron_demo: Fix draw two sides for Polyhedron
2017-05-19 10:27:31 +02:00
Laurent Rineau fa3c3c2bf2 Merge pull request #2071 from janetournois/Polyhedron_demo-improve_surf_reader-GF
Polyhedron demo : improve .surf reader
2017-05-19 10:27:18 +02:00
Laurent Rineau db8732b10a Merge pull request #2098 from janetournois/Polyhedron_demo-small_fixes-GF
Polyhedron demo : two small fixes
2017-05-19 10:27:00 +02:00
Laurent Rineau 575d404164 Merge pull request #2093 from sloriot/Polyhedron_demo-restore_cursor
Restore cursor if operation is not possible
2017-05-19 10:26:52 +02:00