Commit Graph

6552 Commits

Author SHA1 Message Date
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 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é 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
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
Laurent Rineau 2ad4bf8c6f Mesh_3_plugin: clean `applicable()` and allow to mesh multiple surfaces 2019-06-07 12:10:38 +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
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
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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
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