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

6815 Commits

Author SHA1 Message Date
Sebastien Loriot fb8fa48950
Merge pull request #4083 from sloriot/CGAL-named_function_parameters 
Named function parameters
 2019-08-08 10:03:38 +02:00
Simon Giraudot 36bacf6940 Fix warning by cleaning up UI file 2019-08-07 11:51:51 +02:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Maxime Gimeno b462519b28 Merge remote-tracking branch 'cgal/master' into BasicViewer-Update_shaders-GF 2019-08-05 11:15:20 +02:00
Maxime Gimeno 5ddbd8cca1 Use overload working withour c++14 2019-08-05 10:06:41 +02:00
Maxime Gimeno 25090aa8eb Add a button to get rid of a heat group. 2019-08-02 14:52:45 +02:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Maxime Gimeno 5aa9e6abb6 Fix (ish) slow serachbox on windows. 2019-07-31 16:43:10 +02:00
Maxime Gimeno 44b8b2df02 Fix flip edges for 3-edges borders. 2019-07-31 15:46:14 +02:00
Maxime Gimeno 69e5072cc1 Get rid of the two fake lines in ctest_testsuite 2019-07-29 13:35:19 +02:00
Maxime Gimeno 762064e8b0 Fix warning in diff_plugin 2019-07-29 13:04:03 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master 
Conflicts resolved by hand
 2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch 
Conflicts resolved by hand
 2019-07-28 22:30:13 +02:00
Maxime Gimeno 7180f20b7a Remove threshold in source point removing in the shortest_path_plugin 2019-07-25 10:02:29 +02:00
Simon Giraudot ba9862e62c Fix indentation 2019-07-24 10:29:20 +02:00
Simon Giraudot 275f7f390b Add Polygonal reconstruction and improve plugin 2019-07-24 10:29:10 +02:00
Simon Giraudot 98fb0fa4fc Add marching tets for Poisson and fix plugin 2019-07-23 14:58:06 +02:00
Simon Giraudot d7b0fcc4f6 WIP: simplify/reorganize reconstruction plugin 2019-07-23 12:54:07 +02:00
Maxime Gimeno e448b7ae81 Merge remote-tracking branch 'cgal/master' into Demo-Add_diff_plugin-maxGimeno 2019-07-22 15:59:44 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11 
Remove CGAL_CXX11 macro usage
 2019-07-19 16:16:22 +02:00
Maxime Gimeno bedbd31157 Fix the reloading of an oriented soup. Restore highlighting of self-intersections. 2019-07-19 16:12:36 +02:00
Sebastien Loriot 66c73369d0
Merge pull request #4077 from maxGimeno/Demo-Optimize_move_point-mgimeno 
Demo 3D : Optimize the "Move point" operation
 2019-07-19 15:24:50 +02:00
Maxime Gimeno 8d37bf3aa6 Fix algorithm 2019-07-19 15:01:42 +02:00
Maxime Gimeno 0a540dd2ba WIP 2019-07-19 09:27:47 +02:00
Sébastien Loriot 2e747dd300 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 17:01:42 +02:00
Sebastien Loriot 8e7b9a67ff
Merge pull request #4064 from maxGimeno/CGAL_Qt-Fix_deprecation_warnings-GF 
Fix Qt deprecation warnings
 2019-07-18 16:58:35 +02:00
Sebastien Loriot 6bf04f51e5
Merge pull request #4073 from maxGimeno/CGAL_Qt-Fix_deprecation_warnings-4.14-GF 
Fix Qt deprecation warnings for 4.14
 2019-07-18 16:58:05 +02:00
Sébastien Loriot c411ae69d0 Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio 
PMP: Mesh and shape smoothing
 2019-07-18 16:49:05 +02:00
Sebastien Loriot d8db7aff43
Merge pull request #4088 from maxGimeno/Demo-Fix_sizing_balls-GF 
3D Demo: Fix c3t3_item
 2019-07-18 16:36:11 +02:00
Sebastien Loriot 0425b77ce4
Merge pull request #4076 from maxGimeno/Demo-Restore_View_menu-GF 
Polyhedron Demo: Fix View Menu
 2019-07-18 16:34:34 +02:00
Maxime Gimeno db6b4f995a Fix 3mf_io_plugin missing include 2019-07-18 16:08:14 +02:00
Maxime Gimeno f4f815d3ce Fix warning 2019-07-18 15:56:52 +02:00
Maxime Gimeno 7ae8f3dee0 Clean version. Common_part is wrong. 2019-07-18 15:03:15 +02:00
Maxime Gimeno ccc555d497 Fix Error on windows about parameter being qualified. 2019-07-17 09:42:56 +02:00
Maxime Gimeno 94fffff5b3 Fix missing scope guard for cursor. 2019-07-16 13:31:07 +02:00
Maxime Gimeno 95b35474b8 Merge remote-tracking branch 'cgal/master' into Demo-Optimize_move_point-mgimeno 2019-07-16 13:24:43 +02:00
Maxime Gimeno 53277714bf Fix c3t3_item 2019-07-16 10:58:02 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters 
no longer rely on boost
 2019-07-14 22:45:47 +02:00
Maxime Gimeno 1ed4211bc1 Force GouraudPlusEdges for Move Vertex 2019-07-12 16:34:04 +02:00
Maxime Gimeno 889c0fc235 Fix size_t conversion warnings 2019-07-12 11:08:51 +02:00
Maxime Gimeno b422ca258c Only update locally the geometry of the item when moving a vertex around. 2019-07-11 16:26:57 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Maxime Gimeno 0ed8ed17b7 remove useless capture 2019-07-10 15:29:34 +02:00
Maxime Gimeno b4c2af80fd Fix indentation 2019-07-10 15:18:44 +02:00
Maxime Gimeno bc94f04f9f fix indentation 2019-07-10 15:18:13 +02:00
Maxime Gimeno 5b66c7337e Fix mnemonics and actionRearrangeViewers 2019-07-10 15:15:06 +02:00
Maxime Gimeno ee76241805 Restore Ctrl+T 2019-07-10 14:42:18 +02:00
Maxime Gimeno 9a2f282845 restore recenter scene 2019-07-10 14:32:57 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand 
CGAL: more viewers
 2019-07-10 14:22:50 +02:00
Laurent Rineau 81ff26797b Merge pull request #4052 from maxGimeno/Demo-Fixes-GF 
Polyhedron_Demo: Fixes
 2019-07-10 14:22:45 +02:00
Laurent Rineau 32fe1de459 Merge pull request #4058 from lrineau/Polyhedron-demo_factorize_code-GF 
Factorize more code into Polyhedron_demo.cpp
 2019-07-10 14:22:42 +02:00
Laurent Rineau 74669c0ba1 Merge branch 'releases/CGAL-4.14-branch' 2019-07-10 14:22:29 +02:00
Maxime Gimeno 261c596cfc Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 14:04:34 +02:00
Maxime Gimeno 1184530530 More warnings fixed 2019-07-10 14:02:06 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Laurent Rineau 75d76c6d72 Factorize more code into Polyhedron_demo.cpp 
At the same time, fix that warning from Qt5:
> Attribute Qt::AA_UseDesktopOpenGL must be set before QCoreApplication is created.
 2019-07-05 15:38:58 +02:00
Laurent Rineau 1e4ce95f35 Fix PR #3987 with "mesh surface only" 2019-07-05 14:56:13 +02:00
Maxime Gimeno 4b427d0a0e Don't forget to call join_face() in the code -_- 2019-07-04 14:22:44 +02:00
Maxime Gimeno 42280f22dc Fix selection behavior after surface_mesh modification 2019-07-04 14:11:14 +02:00
Maxime Gimeno 9b1eec3310 Clear selection_item when the mesh is modified. 2019-07-04 13:39:17 +02:00
Maxime Gimeno ad25061aa4 Fix Hole selection 2019-07-04 11:08:50 +02:00
Maxime Gimeno 2a3cce88e8 Fix AABB_tree with 1 primitive 2019-07-04 10:31:48 +02:00
Maxime Gimeno be5f3b93a5 Add a PMP keyword 2019-07-03 15:46:53 +02:00
Maxime Gimeno 8c4e0f758d stabilize the use of the self_intersection_plugin by moving it to the selection_plugin 2019-07-03 15:11:55 +02:00
Maxime Gimeno eca8f57ddd Fix the fix for operations order in menu 2019-07-03 13:32:45 +02:00
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