songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
86,062 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

6496 Commits

Author SHA1 Message Date
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
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
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
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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
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
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