Commit Graph

6737 Commits

Author SHA1 Message Date
Laurent Rineau 16c173346b Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-09-23 17:32:54 +02:00
Laurent Rineau 7ae8386da9
Merge pull request #4242 from sgiraudot/Demo-Fix_classification_unresized_ranges-GF
Demo/classif: Fix unresized ranges
2019-09-23 17:30:43 +02:00
Simon Giraudot 58b73c04a1 Fix unresized ranges 2019-09-23 11:47:49 +02:00
Laurent Rineau 883b3e3d0d
Merge pull request #4218 from maxGimeno/Demo-Fixes-GF
CGAL 3D Demo: Some more fixes
2019-09-13 12:27:13 +02:00
Maxime Gimeno fc41a09ace Fix deformation+selection bug 2019-09-12 13:58:45 +02:00
Laurent Rineau fda3a5a902 Fix commit df99307140
The renaming from `test_items` to `all_scene_items` was not complete.
2019-09-12 09:29:35 +02:00
Maxime Gimeno 9383a7607c Keep the user from saving an invalid c3t3 file. 2019-09-10 12:17:02 +02:00
Maxime Gimeno 01252a3d7d Fix no_interpolation_program declaration 2019-09-10 12:03:48 +02:00
Laurent Rineau df99307140 Merge branch 'releases/CGAL-4.14-branch' 2019-09-09 16:48:23 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau d00369432b
PMP: Fix ctestsuite (#4128)
PMP: Fix ctestsuite
2019-09-09 16:36:53 +02:00
Maxime Gimeno 0d2f7a7204 More time for test_items 2019-09-06 11:53:44 +02:00
Laurent Rineau 2a5b7cd7ba Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Maxime Gimeno e2299db864 Add a target depending on all the items, and make every plugin test depend on it.
This way we hope to prevent multiple ans simultaneous compilation of the same target, which leads to the "truncated file" bug.
2019-09-04 09:51:48 +02:00
Maxime Gimeno b747943bbf Fix the crash after split polyhedra. 2019-09-03 13:49:29 +02:00
Simon Giraudot aab26aa579 Make full copy of point set and avoid useless copies 2019-08-28 10:55:14 +02:00
Simon Giraudot 0d4959eba8 Fix warnings if no solver available 2019-08-20 13:27:38 +02:00
Laurent Rineau 850d6090c0 Merge pull request #4102 from maxGimeno/Demo-Fixes-maxGimeno
3D Demo: Fixes
2019-08-16 13:25:06 +02:00
Laurent Rineau e58d82e5ac Merge pull request #4108 from sgiraudot/Demo-Update_reconstruction_plugin-GF
Demo: update reconstruction plugin
2019-08-16 13:25:03 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Maxime Gimeno a4b171d77f Add a compilation_test for demo_framework in the Polyhedorn_Demo and make everythink else depend on it, to try and fix the truncated file errors in the testsuite 2019-08-14 13:04:29 +02:00
Maxime Gimeno 47426af402 Fix warnings 2019-08-12 09:41:42 +02:00
Sebastien Loriot fd328f6c91
Merge pull request #3772 from maxGimeno/BasicViewer-Update_shaders-GF
Basic viewer: use compatibility shaders in basic_viewer
2019-08-12 09:01:05 +02:00
Maxime Gimeno 3ffa7afd95 Fix CMakeLists 2019-08-09 16:49:06 +02:00
Sebastien Loriot 7b96326fab
Merge pull request #4101 from maxGimeno/Demo-Add_diff_plugin-maxGimeno
Demo 3D:Diff Between Meshes Plugin
2019-08-08 10:54:13 +02:00
Sebastien Loriot aca05d36fa
Merge pull request #4119 from sloriot/CGAL-named_function_parameters-5.0
Named function parameters (5.0)
2019-08-08 10:10:45 +02:00
Sebastien Loriot 05e894cd04
Merge pull request #4118 from sloriot/CGAL-named_function_parameters-4.14
Named function parameters (4.14)
2019-08-08 10:05:41 +02:00
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