Commit Graph

7133 Commits

Author SHA1 Message Date
Laurent Rineau f58b40b77b Merge pull request #4501 from maxGimeno/OFF_reading-Fixes-maxGimeno
Fix OFF reader
2020-02-14 14:39:22 +01:00
Maxime Gimeno 2dbce59bd8 Merge remote-tracking branch 'cgal/master' into Convex_hull_3-Overload_for_VertexListGraph-maxGimeno 2020-02-14 09:21:38 +01:00
Maxime Gimeno 25454b4d77 Use CGAL::square() 2020-02-13 14:37:15 +01:00
Maxime Gimeno 71a99a2700 Fix offset computation trigger. 2020-02-13 14:21:59 +01:00
Maxime Gimeno e9864cf874 Fixes after review 2020-02-11 14:13:56 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno e38dbfe3a3 Fix test for spheres resizing. 2020-02-10 13:44:33 +01:00
Maxime Gimeno 4c2b8162b8 Merge remote-tracking branch 'cgal/master' into Demo-Fixes-maxGimeno 2020-02-10 13:16:12 +01:00
Maxime Gimeno aa4b129c3b Fix eigen plugins 2020-02-10 11:57:57 +01:00
Maxime Gimeno 1855050b81 Fix smoothing_plugin dependency to Eigen 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael c51c7792b8 Fix grid generation ignoring z coordinates 2020-02-10 10:47:55 +01:00
Mael Rouxel-Labbé cb3e5cd83c Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-07 17:09:59 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Laurent Rineau 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau 226462c295 Merge pull request #4414 from oleg-alexandrov/master
Set the precision when saving a mesh
2020-02-07 16:25:00 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Mael Rouxel-Labbé b7ed9716b0 Fix includes to removed header 2020-02-06 17:14:57 +01:00
Mael Rouxel-Labbé 0ddf33c9df Use PM_to_PS in the demo 2020-02-06 16:15:15 +01:00
Jane Tournois 74243bae58 fix is_inside(edge)
by taking care also of facets that are in complex though incident
to the same subdomain on both sides
2020-02-06 11:19:27 +01:00
Simon Giraudot db1f1a9b81 Add WKT IO plugin for polylines 2020-02-05 14:41:18 +01:00
Sébastien Loriot f5197b3df7 use real size 2020-02-04 14:16:32 +01:00
Mael Rouxel-Labbé 81f04ac2d9 Move remove_self_intersections to PMP::experimental 2020-02-03 18:12:45 +01:00
Maxime Gimeno 2d72069c15 Add an overload of Convex_hull_3 for graphs 2020-01-31 14:28:17 +01:00
Maxime Gimeno 354a3ef670 Don't forget to clear() the positions_grid in c3t3_item 2020-01-31 13:13:41 +01:00
Maxime Gimeno c9fd5822e9 Fix crash in shuffle_mesh() 2020-01-31 13:12:03 +01:00
Maxime Gimeno 26c86d28be Fix OFF reader 2020-01-31 11:58:58 +01:00
Jane Tournois ea2c06a317 avoid generation of a second cut plane for the c3t3 after display update 2020-01-30 14:45:51 +01:00
Jane Tournois 7a3ec25e59 update c3t3_item display after remeshing 2020-01-30 14:45:08 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Laurent Rineau 5fc7b97e32 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:34:56 +01:00
Laurent Rineau 08909e32c0 Merge pull request #4488 from sgiraudot/Demo-Fix_points_inside_polyhedron-GF
[Demo] Fix point selection in Point_inside_polyhedron_plugin
2020-01-29 16:34:49 +01:00
Laurent Rineau 15bfc35046 Merge pull request #4488 from sgiraudot/Demo-Fix_points_inside_polyhedron-GF
[Demo] Fix point selection in Point_inside_polyhedron_plugin
2020-01-29 16:29:11 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno
TBB deprecated code replacement
2020-01-29 16:27:53 +01:00
Laurent Rineau 0351bda0df Merge pull request #4488 from sgiraudot/Demo-Fix_points_inside_polyhedron-GF
[Demo] Fix point selection in Point_inside_polyhedron_plugin
2020-01-29 16:27:47 +01:00
Maxime Gimeno 26492a9750 Don't rescale the frustum when visibility changes. 2020-01-29 16:26:13 +01:00
Maxime Gimeno 87f16a5fa2 Add menu Operations to the menu even if several items are selected. 2020-01-29 16:26:13 +01:00
Jane Tournois ee7e7459de remove useless typedef 2020-01-28 15:50:57 +00:00
Jane Tournois bac4b84e85 update plugin 2020-01-28 15:50:57 +00:00
Jane Tournois abe46686d8 move visitor to a private named parameter
this way we can use the triangulation output by Mesh_3
in a straightforward manner, without converting it to a
Remeshing_triangulation_3

also make sure that it compiles with the Regular_triangulation
used in the Mesh_3 demo plugin

and fix a doc typo
2020-01-28 15:50:56 +00:00
Jane Tournois c7c8b24635 reintroduce set_dimension() in vertex converter 2020-01-28 15:50:56 +00:00
Jane Tournois 56003ec27e apply Laurent's review and rename some parameters 2020-01-28 15:50:56 +00:00
Jane Tournois fcdb6612be c3t3 subdomain indices need to be updated in the c3t3 item after remeshing 2020-01-28 15:50:55 +00:00
Jane Tournois e2857aa9e5 introduce dialog options UI for tetrahedral remeshing 2020-01-28 15:50:54 +00:00
Jane Tournois ad85942c0b move Vertex_converter and cell_converter to the user code : the plugin 2020-01-28 15:50:54 +00:00
Jane Tournois 447a69e934 update c3t3 after remeshing in the demo 2020-01-28 15:50:51 +00:00
Jane Tournois 0fb3a44d2e remeshing plugin should use Remeshing_triangulation
using Mesh_triangulation_3 (which is an enriched Regular_triangulation_3)
compiles, but the calls of tr.is_valid() fail since the triangulation
is not regular anymore after remeshing

we reconvert it back to the demo c3t3 triangulation type anyhow, to be able
to display it, hoping that is_valid() will not be called later on
2020-01-28 15:50:51 +00:00
Jane Tournois 1de540325d fix typo
and do not use Tr&
2020-01-28 15:50:51 +00:00
Jane Tournois e723a46e7d add tetrahedral remeshing plugin 2020-01-28 15:50:50 +00:00
Jane Tournois aca0b6ef7d add_to_complex() should not be used when subdomain_index is 0 2020-01-28 15:50:50 +00:00
Laurent Rineau 77ad2b42d2 Copy two files from Microsoft GSL instead of have CMake download it 2020-01-28 15:56:00 +01:00
Laurent Rineau d6b7b29649 Merge pull request #4482 from maxGimeno/Demo-Fix_meshing_dialog-maxGimeno
3D Demo:  Fix Meshing_dialog.ui
2020-01-28 15:06:31 +01:00
Maxime Gimeno 1f0d062c10 Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-01-27 12:51:26 +01:00
Maxime GIMENO b8f90e1a75
Update Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv.cpp
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-01-23 14:55:17 +01:00
Simon Giraudot e510659370 Fix point selection in Point_inside_polyhedron_plugin 2020-01-23 11:23:55 +01:00
Simon Giraudot 2bbe1f4a21 Fix cmake warning using QUIET 2020-01-22 11:02:33 +01:00
Laurent Rineau bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +01:00
Maxime Gimeno c61b75f001 Fix Meshing_dialog.ui 2020-01-17 16:33:48 +01:00
Maxime Gimeno d928a22a5f clean-up 2020-01-17 11:55:38 +01:00
Laurent Rineau f17d903d75 Merge remote-tracking branch 'cgal/master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-01-17 11:38:22 +01:00
Maxime Gimeno dd6cf454dc add precision(17) to most examples involving surface_mesh or polyhedron. 2020-01-17 09:58:44 +01:00
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Simon Giraudot 3cd8207f51 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-16 12:03:49 +01:00
Laurent Rineau 84cd4ee1fa Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:32:07 +01:00
Laurent Rineau 584a1ad9ba Merge pull request #4394 from maxGimeno/Demo-Fixes-maxGimeno
Fixes for the Demo
2020-01-15 17:32:04 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
Laurent Rineau c35c608021 Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:23:55 +01:00
Laurent Rineau 5a00c3425c Merge pull request #4394 from maxGimeno/Demo-Fixes-maxGimeno
Fixes for the Demo
2020-01-15 17:19:45 +01:00
Laurent Rineau 312ca08529 Merge pull request #4432 from maxGimeno/Demo-Picking_on_spheres-maxGimeno
Polyhedron_demo : Add picking on spheres
2020-01-15 17:19:28 +01:00
Laurent Rineau 25bcb34608 Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno
Graphics_view : Fix QTime warnings
2020-01-15 17:19:22 +01:00
Maxime Gimeno 2078b804db more override 2020-01-15 12:42:27 +01:00
Simon Giraudot 5beaa0c164 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-15 10:28:10 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Maxime Gimeno dd2bd99b42 add missing `override` keywords 2020-01-14 09:44:10 +01:00
Maxime Gimeno 373dbb5070 more qvariant 2020-01-13 16:55:34 +01:00
Maxime Gimeno 980d242236 Fix warnigns 2020-01-13 16:51:40 +01:00
Maxime Gimeno 93c2247335 Replace all QTimers 2020-01-13 16:33:30 +01:00
Maxime Gimeno 3debd4813e Use QVaraitn::fromValue() 2020-01-13 16:32:58 +01:00
Maxime Gimeno 86759b3172 Fix lookat 2020-01-13 10:39:52 +01:00
Laurent Rineau 4fe7be4855 Fix [-Wconversion] warnings 2020-01-10 09:33:48 +01:00
Laurent Rineau f136b25b2d Fix warnings 2020-01-09 16:52:35 +01:00
Laurent Rineau daf2e6839f Improve the code that deals with CGAL_MESH_3_PROTECTION_DEBUG 2020-01-09 16:52:05 +01:00
Maxime Gimeno 4de511f052 Replace all QTimers 2020-01-09 14:11:50 +01:00
Maxime Gimeno 82bcfb7087 Add license and remove need for operator(const C&), which cannot be called. 2020-01-09 10:01:31 +01:00
Maxime Gimeno 391b007dc3 Use QVaraitn::fromValue() 2020-01-09 09:56:25 +01:00
Maxime Gimeno 2bfdc8398f Move the file_input.h file to Triangulation_3 and write some doc. Unify with the API of copy_tds() and adapt the c3t3_io plugin. 2020-01-08 16:37:39 +01:00
Laurent Rineau b8aee673f0 Optimization_plugin.cpp does not need to know the C3t3 type 2020-01-08 15:53:21 +01:00
Laurent Rineau e051d44691 Support precompiled headers for Mesh_3 plugins 2020-01-08 15:51:51 +01:00
Laurent Rineau 9de3913dbf Fix warnings 2020-01-08 15:49:16 +01:00
Maxime GIMENO 81cb46a8f5
Update Polyhedron/demo/Polyhedron/MainWindow.cpp
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-01-08 10:32:31 +01:00
Maxime Gimeno fc7ef12c04 Force transparency_pass_number to 4 minimum in readSettings(), in case a preferences file is corrupted. 2020-01-08 10:16:51 +01:00
Maxime Gimeno 73ffe67feb Add missing header 2020-01-07 09:29:16 +01:00
Laurent Rineau 7c042a3fb3 Fix a bug in applicable 2020-01-06 09:52:54 +01:00
Laurent Rineau 4268d4657b Merge remote-tracking branch 'cgal/master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-01-06 09:51:41 +01:00
Maxime Gimeno 358d53a893 Fix warning 2020-01-03 08:58:52 +01:00
Maxime Gimeno ed81f4dff8 Add picking to c3t3_item 2020-01-02 16:41:09 +01:00
Maxime Gimeno 2c9cb4475e If no loader is found for the requiered extension, offer all io plugins in the dialog instead of none 2020-01-02 11:03:14 +01:00
Maxime Gimeno d92b376a15 Fix Edit_polyhedron_plugin 2020-01-02 10:38:22 +01:00
Maxime GIMENO 5f4eba0db6 Update Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2019-12-30 16:41:01 +01:00
Maxime Gimeno 522bc4a31c Add PATHS to find_path 3mf 2019-12-30 16:41:01 +01:00
Maxime Gimeno d248f9dda8 Fix spheres in edit_item 2019-12-23 15:16:23 +01:00
Maxime Gimeno 23337e6207 Fix sphere picking for c3t3 2019-12-23 10:38:48 +01:00
Maxime Gimeno cbf8e33009 WIP c3t3 not picking 2019-12-20 15:40:36 +01:00
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 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +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
Mael Rouxel-Labbé c6f3a429fa Update demo plugin to new API 2019-12-10 15:51:34 +01:00
Mael Rouxel-Labbé 51e965e1dc Rewrite most of OBB code to fix design issues and bugs 2019-12-09 12:25:38 +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 Rouxel-Labbé edefc616f3 Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2019-12-03 16:28:19 +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
Mael Rouxel-Labbé 9ed1a87905 Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2019-10-20 20:45:49 +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 6701a7322c Protect websocket code 2019-10-04 09:26:10 +02:00
Maxime Gimeno da89481d9c Add an action in the demo 2019-10-01 14:47:29 +02:00
Maxime Gimeno af5773cf4e Integration of WS Server to the demo. Sessions handled and Remove the point_sets and polylines management from the 3mf plugin 2019-09-26 14:59:36 +02:00
Maxime Gimeno b9e9dcc09b Add Camera sharing through WebSockets 2019-09-26 14:59:01 +02:00
Maxime Gimeno b1a8ec6d76 Add a way to upload a scene through ssh. 2019-09-26 14:57:22 +02:00
Maxime Gimeno e868586bd7 Add defaultLoaders where needed, and use only default loaders to save items in .js 2019-09-26 14:57:14 +02:00
Maxime Gimeno 1ebc5e3d00 Use temp files in /tmp instead of the build-dir 2019-09-26 14:57:06 +02:00
Maxime Gimeno c794679dac Save the scene directly into the js, without using external files. 2019-09-26 14:56:58 +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 966388fe29 Update registration plugin with pointmatcher 2019-09-02 09:47:23 +02:00
Simon Giraudot fff368c351 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2019-09-02 09:46:54 +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
Necip Yildiran c482d356d7 Merging with OpenGR_wrapper, further documentation
Merging with OpenGR_wrapper branch of remote https://github.com/necipfazil/cgal/
2019-07-26 14:18:27 +03: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
Laurent Rineau 4313a8ee66 Add compatibility with old Qt Scripts 2019-07-12 13:33:42 +02:00
Laurent Rineau 876505bdec Fix a bug in applicable() by rearranging completly the private data
In passing, I have used
  - the Guidelines Support Library (actually `gsl::not_null`),
  - `boost::optional` and `boost::variant` to better deal with the
  state of private data.
2019-07-12 13:33:39 +02:00
Laurent Rineau 03a591099d Make mesh_3_plugin scriptable 2019-07-12 13:33:03 +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