Commit Graph

6848 Commits

Author SHA1 Message Date
Guillaume Damiand 0b7ec2e216 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-20 10:02:23 +01:00
Sébastien Loriot cf816d2b98 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2019-12-20 09:54:24 +01:00
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Maxime Gimeno 3c91327421 Fix clip poly plugin. 2019-12-19 09:54:01 +01:00
Maxime Gimeno 504a3ad0f5 add some copies in the copy constructor to fix crash of cloning colored items 2019-12-19 09:54:01 +01:00
Maxime Gimeno fb25130e6a fix crash at loading when alpha is not 1 2019-12-19 09:54:01 +01:00
Maxime Gimeno b3393db2bc fix filter for & 2019-12-19 09:54:01 +01:00
Maxime Gimeno 186ea0bc8c Fix Edit_polyhedron_plugin 2019-12-19 09:54:01 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00
Jane Tournois 08b3360095 do not pop_front() too early
when "write" failed, using pop_front() prevents from using front()
to the get info about what saving process has failed.
Once we do not need to use front() anymore, do pop_front()
2019-12-05 16:31:33 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF
CDT2: Throw on constraint intersections that do not require constructions
2019-12-05 11:05:47 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 2589d55c05 Merge pull request #4254 from MaelRL/PMP-Remove_needles_and_caps-GF
Add experimental code to remove needles and caps using flips and collapses
2019-12-05 11:05:25 +01:00
Laurent Rineau 8bbd46c06c Merge pull request #4295 from maxGimeno/Demo-Replace_double_spin_box-maxGimeno
CGAL 3D Demo: Replace QDoubleSpinBoxes
2019-12-05 11:05:22 +01:00
Laurent Rineau 9bb28cb263 Merge pull request #4324 from maxGimeno/Demo-Front_back_face_colors-maxGimeno
Cgal 3D Demo: Two-sided shading
2019-12-05 11:05:17 +01:00
Mael Rouxel-Labbé 57fed1416a Factorize code creating throwing output iterators 2019-12-04 09:10:49 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Mael Rouxel-Labbé e73b973b62 Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB 2019-11-20 12:24:54 +01:00
Andreas Fabri 363f77145c Do first self-intersection tests in parallel in the demo 2019-11-15 14:24:09 +01:00
Mael Rouxel-Labbé 9ecdb05746 Don't include deleted headers 2019-11-15 10:22:19 +01:00
Maxime Gimeno 4fff9b1017 Fix scopeguard error. 2019-11-12 16:43:14 +01:00
Maxime Gimeno 6e4bfb0109 Fix warning about unused capture 2019-11-12 16:36:03 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +01:00
Laurent Rineau 15d9e1f0ff Restore the alphabetical order of `dependencies` files 2019-10-31 14:41:37 +01:00
Laurent Rineau 8d4edad5ea Merge pull request #4316 from maxGimeno/Demo-Fix_nef_orientation-maxGimeno
CGAL 3D Demo: Fix nef_polyhedron normals
2019-10-29 15:23:28 +01:00
Sébastien Loriot abd8d035aa improve item naming 2019-10-29 08:42:57 +01:00
Maxime Gimeno 13a31ec9af Add a Viewer option to use a specif shader to make more obvious the orientation of the fragments in the shaded programs. 2019-10-28 15:32:31 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02:00
Maxime Gimeno 61100b870f Fix fix for nef normals 2019-10-25 14:53:24 +02:00
Maxime Gimeno dfb4bb436e Add misisng include to QSpinBox in PS selection plugin 2019-10-21 09:33:43 +02:00
Maxime Gimeno b1d383da96 remove unused include to .moc to fix warning 2019-10-21 09:29:39 +02:00
Maxime Gimeno bdcc2b64a1 Add properties for valu/min/max 2019-10-21 09:14:15 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Mael Rouxel-Labbé 0f7de56d76 Move a number of Named Parameter type extractor from CGAL::PMP:: to PMP::
These are used in a number of pacakges other than PMP and the code
is also already in /BGL. None are documented.
2019-10-17 12:41:30 +02:00
Maxime Gimeno a67361fe45 Add ranges 2019-10-16 11:39:40 +02:00
Maxime Gimeno 74db722b96 fixes after review + new batch of transformations 2019-10-16 11:04:40 +02:00
Laurent Rineau 8d7932cdc2 Merge pull request #4203 from maxGimeno/Demo-Fix_detect_boundaries-GF
Polyhedron Demo: Fix  stitching plugin
2019-10-15 16:34:14 +02:00
Laurent Rineau 6245c45bd7 Merge pull request #4273 from maxGimeno/Demo-Fix_DICOM_reading-maxGimeno
CGAL 3D Demo: Fix DICOM display
2019-10-15 16:33:58 +02:00
Maxime Gimeno 264f2d1e06 finish replacing doublespinboxes 2019-10-15 16:30:00 +02:00
Maxime Gimeno 3b54dc2f92 WIP Replace all double spin box. Remove resetRampButton as it hase become useless at some point. 2019-10-15 15:33:45 +02:00
Maxime Gimeno d76a984aee Add a custom class to replace the QDoubleSpinBox 2019-10-15 14:44:08 +02:00
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Maxime Gimeno 9c942b1821 Fix maxDim() 2019-10-04 11:22:05 +02:00
Maxime Gimeno f724fa02c0 Don't use maxdim/15 in the handles placement but rather radius*1.1. 2019-10-04 10:15:39 +02:00
Maxime Gimeno da89481d9c Add an action in the demo 2019-10-01 14:47:29 +02:00
Maxime Gimeno a52592909f Remove all calls to accelerate_distance_queries(), now redundant. 2019-09-24 11:44:20 +02:00
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
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +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
Maxime Gimeno e7b01b6d45 Don't count the nm vertices. 2019-09-02 16:25:11 +02:00
Maxime Gimeno a115e976b0 Add a pop up when loading an OFF that contains nm vertices. 2019-09-02 15:47:37 +02:00
Maxime Gimeno 9db7bea1f6 Add a nm_vertices stat to the surface_mesh_item 2019-09-02 15:43:42 +02:00
Maxime Gimeno e35d5d0f1f Fix the detect_boundaries operation to not use is_border(vertex).
Add to the doc of Surface_mesh that is_border(vertex_index) is not guaranteed to work if the SM is not a 2-manifold.
2019-09-02 14:58:57 +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