Commit Graph

6848 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 652fa7a2fa Remove duplicate default initialization of dynamic pmap 2019-07-03 11:58:27 +02:00
Maxime Gimeno f510bee3d3 disable highlighting in self_intersection test 2019-07-03 11:40:12 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Maxime Gimeno 94e91cf58a Sort actions alphabetically in Operations, so it won't change the order randomly at each call. 2019-07-03 11:05:48 +02:00
Maxime Gimeno e9ef53ed74 WIP 2019-07-03 10:23:53 +02:00
Guillaume Damiand bd8a4d8326 Commit all dependencies, result of make packages_dependencies 2019-07-03 09:09:36 +02:00
Maxime Gimeno 7cb5ef6ee4 WIP : alphabetically sort the operations. Problem : replacing the actions makes the menu disappear. 2019-07-02 16:05:13 +02:00
Maxime Gimeno e724f0bd62 Activate debug output for repair_soup_plugin 2019-07-02 14:41:47 +02:00
Maxime Gimeno 048d527c0c fix basic objects in menu 2019-07-02 13:29:12 +02:00
Mael f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-01 11:24:11 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 4435f93aaa Compatibility with VTK 9 (VTK master)
Fix issue #3789
2019-06-26 13:17:14 +02:00
Mael Rouxel-Labbé 33c589cb61 Further Ceres-related CMakeLists.txt simplifications 2019-06-21 12:45:23 +02:00
Mael Rouxel-Labbé 7c82c96dfd Proper usage of CMake to find and use Ceres
done with the help of @lrineau
2019-06-21 11:24:32 +02:00
Mael Rouxel-Labbé 0d1759e996 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-20 15:02:32 +02:00
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:20:08 +02:00
Laurent Rineau b0c182ce63 Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:09:17 +02:00
Laurent Rineau c64c40491b Merge pull request #4003 from maxGimeno/Demo-Fix_clip_plus_point_selection-GF
3D Demo: Fix Points Selection when Clipping
2019-06-20 14:09:15 +02:00
Mael Rouxel-Labbé cad9a0aaa8 Make things work when Ceres is not available 2019-06-20 13:04: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
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00
Mael Rouxel-Labbé 77711e4e71 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé 3b53ce20e3 Rename smooth/smooth_along_curvature_flow to smooth_mesh/shape
Also fix edge protection in the demo
2019-06-19 10:17:26 +02:00
Mael Rouxel-Labbé 22bd8a943b Merge smooth_areas and smooth_angles, rework AABB tree, document everything 2019-06-18 16:02:42 +02:00
Mael Rouxel-Labbé 19de8eda04 Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF 2019-06-17 15:18:33 +02:00
Laurent Rineau a7c4793b5b Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:15:57 +02:00
Laurent Rineau 8089f7c33c Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:15:20 +02:00
Laurent Rineau 37839b3e88 Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF
[Classification] Make cluster lightweight to copy + fix bbox computation
2019-06-17 14:14:50 +02:00
Maxime Gimeno 86ca13a388 change behavior when soup is not orientable in the demo. 2019-06-17 14:11:32 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau 021b287fa0 Merge pull request #3912 from lrineau/Scripts-simplify_user_scripts-GF
Simplify user scripts (cgal_create_CMakeLists and cgal_create_cmake_script)
2019-06-17 13:54:36 +02:00
Laurent Rineau 22fb28d57e Modify the name when multiple source items 2019-06-17 13:47:05 +02:00
Laurent Rineau 5ec5318e9e Add selection plugin and detect sharp edges in the Mesh_3 demo 2019-06-14 15:16:24 +02:00
Maxime Gimeno 3f76dfb056 take the offset into account in the test is_clipped() of the Selection functor. 2019-06-14 14:39:41 +02:00
Laurent Rineau 4af7e7dcdc Remove the tests for OPENGL_FOUND 2019-06-12 11:38:48 +02:00
Simon Giraudot b981f25e84 Fix classification plugin 2019-06-12 09:46:47 +02:00
Mael Rouxel-Labbé 9942669dd1 Make Delaunay flips optional 2019-06-07 16:13:49 +02:00
Mael Rouxel-Labbé 7bf1bc6ff4 Link demo with Ceres (badly done) 2019-06-07 15:44:34 +02:00
Mael Rouxel-Labbé b0cb1cc640 Minor fixes for the smoothing polyhedron plugin 2019-06-07 13:53:44 +02:00
Laurent Rineau 2ad4bf8c6f Mesh_3_plugin: clean `applicable()` and allow to mesh multiple surfaces 2019-06-07 12:10:38 +02:00
Mael Rouxel-Labbé ba36b7cd41 Update Smoothing Polyhedron GUI
and clean some sneaky use_explicit
2019-06-07 10:52:31 +02:00
Mael Rouxel-Labbé 6c4d873338 Get rid of the explicit curvature flow smoothing scheme
It's just worse all the time anyway
2019-06-07 10:27:21 +02:00
Maxime Gimeno 5c6f20e1ec add a writing function for meshes 2019-06-06 13:04:47 +02:00
Laurent Rineau a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +02:00
Mael Rouxel-Labbé 82722a4e7d Fix many issues with the smoothing polyhedron plugin + remake the GUI 2019-06-05 16:00:02 +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 e4993273c5 Merge pull request #3864 from danston/Point_set_shape_detection_3-make_it_general_with_region_growing-danston
[Feature] Shape detection with region growing
2019-06-05 11:20:29 +02:00
Laurent Rineau 4719bac98e Merge pull request #3970 from maxGimeno/Demo-LCC_plugin-GF
3D Demo: Lcc IO plugin
2019-06-05 11:20:13 +02:00
Laurent Rineau adaed61c20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-05 10:58:12 +02:00
Laurent Rineau 31dd4f11fb Merge pull request #3969 from lrineau/Polyhedron-demo__fix_segfault_of_load_plugin-GF
Polyhedron demo:  fix the menu entry 'Load plugin'
2019-06-05 10:44:27 +02:00
Laurent Rineau 926067967a Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-05 10:43:44 +02:00
Mael Rouxel-Labbé 691aa3e361 Remove smoothing polyhedron-based plugin (keep only SM) 2019-06-05 09:39:20 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Mael Rouxel-Labbé 7beeb16f05 Partial clean/fix of shape smoothing tests/demo 2019-06-04 17:02:11 +02:00
Laurent Rineau 44cfe8d2eb
Do not use `REQUIRED OPTIONAL_COMPONENTS` with FindBoost
The CMake module `FindBoost.cmake` only supports `OPTIONAL_COMPONENTS` since CMake-3.11. Previously they were treated like required components.
2019-06-03 10:44:01 +02:00
Maxime Gimeno ef17e71efa Fix remaining warnings 2019-06-03 10:14:43 +02:00
Maxime Gimeno 87f7a68ed0 Fix find_path and don't make blue results if 3mf not found 2019-06-03 10:10:39 +02:00
Maxime Gimeno 0dc66db195 Don't use default path in 3MF find_path to avoid VTK interfering (at least on Blake, that's the reason the testsuite is red over there.) 2019-05-31 10:44:05 +02:00
Maxime Gimeno d34ac7b14b Fix override and shadow warnings for clang 2019-05-31 10:22:21 +02:00
Mael Rouxel-Labbé 6e3f2c3510 Factorize smoothers and clean obsolete code 2019-05-29 15:59:50 +02:00
Maxime Gimeno 6a3cce1429 Add colors per volume. 2019-05-29 15:46:12 +02:00
Laurent Rineau ecaa138761 Do not block load_plugin from loading plugins
Since the adoption of the "keywords" feature, the 'Load plugin' menu
was not able to load a plugin with other keywords. That defeats the
purpose of that feature.
2019-05-29 11:44:08 +02:00
Laurent Rineau cdb72b9f34 Avoid a segfault in `load_plugin`
Before that patch `accepted_keywords` was a dangling reference to an
object that was destroyed at the end of the constructor of the class
`Polyhedron_demo`.

Now, that `QStringList` is copied, but it is a short list of short
strings.
2019-05-29 11:42:35 +02:00
Laurent Rineau cd22917e3d Remove the need for Boost libraries at the top level CMakeLists.txt
The 3D demo does not directly requires Boost libraries. Then are
pulled as a `PUBLIC` dependency of `CGAL::CGAL`. Only two plugins
really need Boost libraries:

- Classification needs Boost iostreams and serialization,
- Mesh_3 `io_image_plugin` needs Boost filesystem for multi-files 3D
  images.
2019-05-29 11:18:13 +02:00
Maxime Gimeno ef26c37b75 Try to fix cmake bug on Blake 2019-05-29 09:45:48 +02:00
Maxime Gimeno 6c581bac7f Don't use CGAL_UNUSED 2019-05-29 09:39:53 +02:00
Maxime Gimeno 79008f1618 Fix warnings 2019-05-28 14:03:27 +02:00
Maxime Gimeno 736461b8f2 Fix polylines/c3t3 reading 2019-05-28 13:31:46 +02:00
Maxime Gimeno 30bb614ed0 Fix plugins 2019-05-28 11:44:13 +02:00
Maxime Gimeno 1160e396f6 Fix stuffs 2019-05-27 16:33:33 +02:00
Maxime Gimeno dcf8e6bac3 Fix wheel k_ring events 2019-05-24 09:54:47 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Maxime Gimeno 4d31030950 WIP randomColors for lcc 2019-05-22 16:22:01 +02:00
Maxime Gimeno 4f8b67e115 Fix nef_3 item normals 2019-05-22 13:20:12 +02:00
Maxime Gimeno 4b66010b75 Fix znear management in orthographic mode 2019-05-21 13:33:05 +02:00
Dmitry Anisimov b2d64c796c time to unsigned int conversion warnings fix 2019-05-20 10:05:48 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Dmitry Anisimov 76feac2716 more warnings fixed 2019-05-19 14:42:24 +02:00
Maxime Gimeno 1a08685a2f Add build_items and components to work with real case data 2019-05-17 15:39:03 +02:00
Maxime Gimeno 4012cabb11 Fix Plane_items manipulation 2019-05-16 16:20:40 +02:00
Maxime Gimeno 0c7ba063a6 Add override in cut_plugin 2019-05-16 15:24:02 +02:00
Maxime Gimeno c342a88440 Fix c3t3 loading 2019-05-16 14:46:53 +02:00
Maxime Gimeno dbf2a6854f Clean-up io-plugins 2019-05-16 14:03:07 +02:00
Maxime Gimeno e717987f64 Update interface version 2019-05-16 13:20:05 +02:00
Maxime Gimeno 1fba61107d Add an IO plugin for the 3mf 2019-05-16 11:26:22 +02:00
Maxime Gimeno 56c99d8a23 Replace IO API to be able to load/save several items at a time 2019-05-16 11:10:35 +02:00
Dmitry Anisimov 28bdc838b1 surface mesh sd plugin + test fixes 2019-05-15 21:33:27 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02: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
Laurent Rineau fee84ae228 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
2019-05-14 16:44:02 +02:00
Laurent Rineau 28593de529 Merge pull request #3914 from maxGimeno/Demo-Fixes_for_multiviewer-GF
Polyhedron demo: Remove useless message at startup
2019-05-14 16:43:17 +02:00
Laurent Rineau d04a5a24c1 Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
2019-05-14 16:26:16 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Dmitry Anisimov c82199c012 improved demo + warnings fix 2019-05-13 19:08:07 +02:00
Dmitry Anisimov ec147f2cc8 demo fixes 2019-05-10 11:23:49 +02:00
Sébastien Loriot 556e7006c8 fix link 2019-05-08 10:53:30 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau 6cff0987ad Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Maxime Gimeno fe717d9293 Remove useless msg 2019-05-07 15:31:28 +02:00
Laurent Rineau 89c7edec55 Fix PR #3843 2019-05-07 13:45:46 +02:00
Laurent Rineau f3371ad311 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-07 13:29:42 +02:00
Maxime Gimeno 356f105902 Fix CMake Error 2019-05-07 13:27:18 +02:00
Mael Rouxel-Labbé a2d5ab86cf Fix typo 2019-05-07 11:46:17 +02:00
Laurent Rineau fcf633c9d5 Remove OpenGL from the dependencies of CGAL 2019-05-07 11:07:52 +02:00
Mael Rouxel-Labbé 11848b41db Add a note in Polyhedron_3 that PMP::keep_largest_CCs is stronger 2019-05-07 09:34:25 +02:00
Laurent Rineau 130c766d1e Merge branch 'releases/CGAL-4.14-branch' into Mesh_3-stop_during_protection-lrineau 2019-05-06 16:21:52 +02:00
Laurent Rineau 008a75d439 Merge pull request #3636 from sgiraudot/Surface_mesh-PLY_IO-GF
[Small Feature] Surface Mesh PLY IO
2019-05-06 15:46:07 +02:00
Laurent Rineau cd1e7da6b7 Merge pull request #3872 from maxGimeno/Demo-Statistics_for_soups-GF
Polyhedron Demo: Add stats to polygon_soup
2019-05-06 15:30:53 +02:00
Laurent Rineau df8d3a5817 Fix Polyhedron demo with Boost 1.70 2019-05-06 14:33:28 +02:00
Laurent Rineau 1b1f0a6ac3 Test the feature in the 3D demo, and fix the code 2019-05-03 16:24:50 +02:00
Maxime Gimeno b8dc1ae063 Fix warnigns 2019-05-03 13:27:00 +02:00
Maxime Gimeno 98264854eb Resize edge_map before function call 2019-05-02 13:49:34 +02:00
Maxime Gimeno 5cebf8b8df Fix if condition 2019-05-02 09:19:28 +02:00
Maxime Gimeno d73e677fc6 fix join_and_split_polyhedra_plugin. 2019-04-30 16:58:07 +02:00
Maxime Gimeno 8272034505 Fix edge selection 2019-04-30 13:17:45 +02:00
Maxime Gimeno 007f999feb Make a function for generating colors and use it in color_map_generation 2019-04-25 16:04:47 +02:00
Maxime Gimeno fedc3eabef lower the highlighting of selected SM_items and change the color system in VSA. 2019-04-25 15:00:26 +02:00
Maxime Gimeno 7beb5018e4 Don't use interpolation to recenter scene. That fixes the buggy camera. 2019-04-25 13:27:18 +02:00
Maxime Gimeno 6db417c378 Fix highlighting on not active viewers 2019-04-24 15:22:27 +02:00
Maxime Gimeno 4d24a1ac80 Highlight according to the k-ring 2019-04-24 13:33:33 +02:00
Maxime Gimeno 08a43c05f7 Highlight follows selection 2019-04-24 13:03:04 +02:00
Maxime Gimeno 9d6953f526 ctrl+R only recenters the active viewer. 2019-04-24 12:00:20 +02:00
Maxime Gimeno f966c12ab8 Don't use the scene's bbox in offset plugin so that it works when all items are hidden. 2019-04-24 11:46:37 +02:00
Maxime Gimeno bd6f600801 skip no-triangle meshes in self_intersection_plugin 2019-04-24 11:19:14 +02:00
Maxime Gimeno cc8aa0ec41 Make the lighting preference affect the active viewer and remove unconnected action "Set Lighting..." from the viewers menu. 2019-04-24 11:06:21 +02:00
Maxime Gimeno bd00eed73b Fix crash in clipping box after action renaming. 2019-04-24 10:40:59 +02:00
Maxime Gimeno d4b70a7703 Add a mechanism to specify default loaders when loading, not just for saving. Make the off plugin the default loader for .off files so that lcc_plugin doesn't come first in the list. 2019-04-24 10:35:45 +02:00
Maxime Gimeno ac72c3a069 Add stats to polygon_soup 2019-04-23 15:49:33 +02:00
Simon Giraudot 70aab39fa6 Replace pair property map with 2 property maps (simpler for IO) 2019-04-23 12:30:36 +02:00
Simon Giraudot fe18f20d05 Fix PLY plugin 2019-04-23 12:30:23 +02:00
Simon Giraudot 207a432dfd Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-23 12:08:44 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF
Polyhedron demo: Multiple Viewers
2019-04-23 10:34:26 +02:00
Sebastien Loriot 6c2427e615
Merge pull request #3815 from maxGimeno/Demo-Fix_zoom_on_id-GF
Polyhedron_demo: Fix zoom to Id
2019-04-23 09:45:52 +02:00
Sebastien Loriot fdc8d79a69
Merge pull request #3843 from sloriot/PMP-speed_orient_soup
Speed-up polygon soup orientation
2019-04-23 09:43:55 +02:00
Maxime Gimeno 9315c9cb79 Fix warnings 2019-04-17 13:16:08 +02:00
Maxime Gimeno fb98c5773d Reset settings if preference dialog is canceled 2019-04-17 11:10:36 +02:00
Maxime Gimeno df7de2fb54 Incorporate the clip() function with poly instead of plane 2019-04-17 10:56:49 +02:00
Maxime Gimeno ebfe1e9ca5 WIP clipping_plugin 2019-04-16 16:37:09 +02:00
Maxime Gimeno 62b0044d9e Add an action to the menu of plane_items to set it by hand 2019-04-16 15:52:22 +02:00
Maxime Gimeno 3f230e7567 Add tooltips to repair_polygon_soup argumetns 2019-04-16 10:46:01 +02:00
Sébastien Loriot 7945ffeea2 update surf plugin 2019-04-12 19:11:04 +02:00
Sébastien Loriot 03ec0dfbe1 update demo plugin 2019-04-12 19:09:25 +02:00
Andreas Fabri 864ba4249d Merge branch 'Surface_mesh-PLY_IO-GF-old' into Surface_mesh-PLY_IO-GF 2019-04-12 16:19:53 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sebastien Loriot fd273fe850
Merge pull request #3779 from afabri/Polyhedron-read_off-GF
Polyhedron:  read_OFF() must not set the badbit if there are 0 vertices
2019-04-12 15:27:24 +02:00
Maxime Gimeno f973dfa9a9 Fix warnigns 2019-04-12 15:04:26 +02:00
Maxime Gimeno 8cfbbd1ee4 Fix CMake Error 2019-04-12 11:11:52 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Maxime Gimeno 765146c7de Add an action for repairing polygon soups items. 2019-04-11 10:44:34 +02:00
Maxime Gimeno 41c67e16f8 Fix polyline generator 2019-04-11 09:47:57 +02:00
Maxime Gimeno c2262672c3 Add missing include 2019-04-11 08:54:17 +02:00
Maxime Gimeno 393b1aceb2 WIP 2019-04-10 16:46:35 +02:00
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +02:00
Simon Giraudot fe6f00203c Add comments of PLY mesh in demo 2019-04-09 15:04:25 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau c14308f300 Merge pull request #3788 from maxGimeno/VTU_output-Add-attribute-GF
Mesh_3: New Attributes Type for VTU Output
2019-04-08 15:58:40 +02:00
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau 65ebf7d386 Merge branch 'Mesh_3-fix_output_to_vtu-GF' into VTU_output-Add-attribute-GF 2019-04-03 19:57:36 +02:00
Laurent Rineau eb769f13fd Fix the error message 2019-04-03 14:10:57 +02:00
Laurent Rineau bba76c20f3 Fix that find_path in case of cross-compilation 2019-04-03 14:10:42 +02:00
Laurent Rineau aed5a55354 Fix the syntax of find_path 2019-04-03 14:10:27 +02:00
Simon Giraudot 7518d5642a Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-04-03 11:51:29 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Maxime Gimeno 81eeed3615 Fix crash when adding an item and the selected viewer is the mainViewer. 2019-04-02 14:21:48 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Maxime Gimeno 4542a2a808 Be careful to not select a infinite face in the process. 2019-03-29 16:24:28 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01: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 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +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
Sébastien Loriot e6cdf9f62b remove condition for cpp11 to be present in face graph related packages 2019-03-29 10:41:50 +01:00
Maxime Gimeno 4ea7d50521 Set default behavior of visibility updates offset to false. 2019-03-28 11:45:59 +01:00
Laurent Rineau d27c222e54 Merge pull request #3799 from maxGimeno/Demo-Select_only_in_clipped_zone-GF
Polyhedron Demo: Only Select in the clipped zone
2019-03-27 18:05:12 +01:00
Guillaume Damiand 379c90420b Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2019-03-27 12:40:33 +01:00
Simon Giraudot 71dc567566 Integrate clipping test in selection functor 2019-03-27 10:18:02 +01:00
Maxime Gimeno 38709a737e Fix c3t3 reload 2019-03-27 09:49:46 +01:00
Maxime Gimeno 1bd785ae44 Don't select clipped points 2019-03-26 15:30:34 +01:00
Maxime Gimeno 2a261c1d2f Fix event filter problems 2019-03-26 15:24:28 +01:00
Maxime Gimeno 49a109fa36 Add a button to enable clipping 2D to avoid conflict with selection 2019-03-26 15:06:40 +01:00
Maxime Gimeno b619fbeb28 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-03-26 10:57:54 +01:00
Maxime Gimeno 9f9bd9b1fd Set the initial transformation to Translation to get the maximum length and set the box horizontal policy to fixed. Also move a button to gain space. 2019-03-25 09:12:28 +01:00
Andreas Fabri 5d58bde7f2 Polyhedron: Fix Issue #3108 2019-03-19 17:39:04 +01:00
Maxime Gimeno c787e40ca7 Use boost variant for attributes to be able to send `double`s, `uint_8`s and `std::size_t`s 2019-03-18 13:14:00 +01:00
Maxime Gimeno e02eef8aa3 add misisng highp in compatibility shaders 2019-03-18 09:33:22 +01:00
Maxime Gimeno 3760964322 Also fix the initial state of the clipping_box widget 2019-03-15 16:05:39 +01:00
Maxime Gimeno 38c671f4b7 Don't forget the offset in the tooltip() 2019-03-15 16:00:50 +01:00
Maxime Gimeno f39fce13e3 Remove remaining #version from compatibility glsl and use compatibility shaders in basic_viewer 2019-03-15 13:36:36 +01:00
Maxime Gimeno b96bd1058f Fix mesh_3 2019-03-13 13:16:12 +01:00
Maxime Gimeno 1d04ad4d90 Merge pull request #3761 from maxGimeno/Demo-Fix_visualization-GF
Polyhedron_Demo: Fix warning
2019-03-12 17:04:21 +01:00
Maxime Gimeno 324f4e9b4a Fix warning 2019-03-12 15:00:41 +01:00
Maxime Gimeno ec656e280e Use c++11 init method for cursor to avoid msvc bug due to "most vexing parse" 2019-03-12 12:08:00 +01:00
Laurent Rineau c668f3095b Merge pull request #3732 from maxGimeno/Demo-Stats_for_selection-GF
Polyhedron_demo: Add stats to the selection_item
2019-03-11 17:26:21 +01:00
Laurent Rineau 6f67752ba5 Merge pull request #3738 from sgiraudot/Polyhedron_demo-Fix_point_set_selection_speed-GF
Polyhedron demo: Fix point set selection speed
2019-03-11 17:26:18 +01:00
Maxime Gimeno 8886bc5e6a Add offset management 2019-03-11 16:47:21 +01:00
Maxime Gimeno e00a489bc0 Add a plugin to cisualize LCC data structures. (IO plugin for *.off and *.3map) 2019-03-11 16:25:07 +01:00
Maxime Gimeno 5c433eab01 Fix show/hide 2019-03-08 11:32:50 +01:00
Maxime Gimeno 93d665e01f Fix clipping box plugin 2019-03-08 11:04:46 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Maxime Gimeno d7baf67a43 Add initialization 2019-03-07 12:54:12 +01:00
Maxime Gimeno 8d6c35f1b5 Fix warning 2019-03-06 15:53:06 +01:00
Simon Giraudot ae5a828dc7 Fix point set selection speed 2019-03-06 14:22:18 +01:00
Maxime Gimeno bd8b39d162 Add stats to the selection_item 2019-03-04 17:21:51 +01:00
Maxime Gimeno 2fd1a984af Fix blending order so that the edges with antialiasing blend with the triangles and not with the background 2019-03-04 10:35:14 +01:00
Laurent Rineau b3b513c20d Merge pull request #3708 from aboudev/VSA-lingjie
Surface mesh approximation: handle degenerate cases
2019-02-28 20:54:40 +01:00
Laurent Rineau 669dfc67bd Merge pull request #3699 from maxGimeno/Demo-Fix_Mesh_3_surface-GF
Polyhedron_Demo: fix mesh_3_plugin
2019-02-28 20:54:37 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Maxime Gimeno 3dc5ee1513 Remove unused capture in lambda 2019-02-28 15:55:46 +01:00
Lingjie Zhu b34eadc7fd fix approximate_sqrt for EPICK 2019-02-28 20:18:30 +08:00
Lingjie Zhu 91be8fbcf5 typo 2019-02-26 23:30:56 +08:00
Lingjie Zhu 24e83fc944 std::sqrt -> CGAL::approximate_sqrt 2019-02-26 22:55:52 +08:00
Simon Giraudot e6fc07bf17 Reset failbit after failing to load a surface mesh 2019-02-26 15:34:32 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Simon Giraudot 19169d9cae Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-02-26 13:50:34 +01:00
Simon Giraudot 9256c04157 Replace old color API using global const variable with new one using functions 2019-02-26 13:48:59 +01:00
Lingjie Zhu 31247193d0 replace invalid planes in rendering
CGAL::linear_least_squares_fitting_3 may return invalid plane
2019-02-26 16:55:14 +08:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau c334407c46 Merge pull request #3681 from maxGimeno/Demo-New_batch_of_bug_fixes-GF
Polyhedron Demo: new batch of bug fixes
2019-02-22 16:39:05 +01:00
Maxime Gimeno 992ed255c9 Add commentaries to map a little of the cursors set/reset 2019-02-22 09:14:24 +01:00
Maxime Gimeno 252a416bb5 Fix facegraph creation 2019-02-21 12:53:15 +01:00
Maxime Gimeno 222bd62a52 Fix waitcursor 2019-02-21 12:50:32 +01:00
Maxime Gimeno 39472ec85d Put the offset_meshing in a thread that can be interrupted. 2019-02-20 12:56:16 +01:00
Maxime Gimeno 893e2a055a Remove useless typename 2019-02-20 09:32:05 +01:00
Maxime Gimeno f467027e4b Add an action to the polylines item that allows to extract a point set from the polylines 2019-02-19 14:09:16 +01:00
Maxime Gimeno 9440020cb6 Add a button to validate the affine tranformation. 2019-02-19 13:47:51 +01:00
Maxime Gimeno a52fccb997 Move typedefs to avoid error 2019-02-19 12:18:16 +01:00
Maxime Gimeno 0d4b7185bd Test if the two constraints vertices are different before inserting to avoid crash. 2019-02-19 08:45:57 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Andreas Fabri e989b87dfe Distance, Generator, HDS, Convex_hull, Polyhedron, PCA 2019-02-14 10:39:56 +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
Sébastien Loriot 42b9a0be04 fix level 2019-02-14 10:26:05 +01:00
Maxime Gimeno b8e03cdf49 Use cgal dynamic_property_maps for source points 2019-02-13 17:00:49 +01:00
Laurent Rineau 3c23ca625e
Merge pull request #3662 from maxGimeno/Demo-Fix_polylines_display-GF
Remove Z offset.
2019-02-13 15:05:31 +00:00
Laurent Rineau 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Laurent Rineau 5c5357a279 Merge pull request #3658 from maxGimeno/Demo-Fix_isotropic_remeshing-GF
Polyhedron Demo: Fix isotropic remeshing plugin
2019-02-13 15:38:39 +01:00
Laurent Rineau f74d33af49 Merge pull request #3659 from maxGimeno/Demo-Fix_VTU_visu-GF
Polyhedron Demo: Rework of VTK_io_plugin
2019-02-13 15:38:36 +01:00
Laurent Rineau 7f00deb05c Merge pull request #3664 from maxGimeno/Demo-Fix_display_of_groups_in_groups-GF
Polyhedron Demo: Fix Rendering of Nested Groups
2019-02-13 15:38:33 +01:00
Laurent Rineau d216131c79 New undocumented AABB primitive: cells of a 3D triangulation
The `Scene_c3t3_item` from our 3D demos now uses an AABB tree of
cells, instead of an AABB tree of triangles. That divides the number
of primitives by 4, and save times:

Before:
```
C3t3 facets AABB tree built in 22.010006904602051 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.50893402099609375 wall-clock seconds
```

After:
```
C3t3 cells AABB tree built in 13.072829008102417 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.41458892822265625 wall-clock seconds
```

The gain seems mostly in the construction of the tree (40% saved), and
the gain on the queries seems lower (about 20%).
2019-02-11 13:22:11 +01:00
Maxime Gimeno fecc589b4c Move restoreoverridecursor() 2019-02-11 10:25:47 +01:00