Commit Graph

68164 Commits

Author SHA1 Message Date
Jane Tournois 061df89383 skip the infinite vertex to avoid computing stuff on associated points 2016-04-05 14:26:20 +02:00
Andreas Fabri c89f4360ac fix typo 2016-04-05 12:50:42 +02:00
Andreas Fabri fe9535b157 Replace rand() 2016-04-05 12:46:23 +02:00
Maxime Gimeno 1aa34e060a Fix for missing combo-box 2016-04-05 11:36:26 +02:00
Laurent Rineau 8e604f70f2 Merge modifications from 'releases/CGAL-4.8-branch'
Merges the following:

> dbb2be1 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau
> 5dcd5c7 Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand
> 869e65a CGAL-4.8 announcement
2016-04-05 11:24:19 +02:00
Jane Tournois f9fdd779f4 a bit more reorganization of the UI 2016-04-05 10:34:38 +02:00
Maxime Gimeno 386995bbdc Final fix for itemChanged calls 2016-04-04 16:53:17 +02:00
Guillaume Damiand 964a69676f Add #ifndef CGAL_NO_DEPRECATED_CODE to allow to run the test in test suite that remove deprecated code. 2016-04-04 16:18:19 +02:00
Laurent Rineau dbb2be1462 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau
Fix a test
2016-04-04 15:54:25 +02:00
Laurent Rineau 93da6c958c Fix a test
One cannot run `make_mesh_3` without `no_exude()`, and then use
`verify_c3t3`, that runs `refine_mesh_3`.
2016-04-04 15:49:07 +02:00
Laurent Rineau c8e1a78a39 updated crontab (automated commit) 2016-04-04 12:31:59 +02:00
Laurent Rineau 5dcd5c778b Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand
BGL bugfix
2016-04-04 12:23:32 +02:00
Laurent Rineau 869e65a74d CGAL-4.8 announcement 2016-04-04 12:23:05 +02:00
Laurent Rineau a92cbe2f77 OpenMesh-3.2 does not like comments in OFF files
We have put the comments at the end of the file and it works.
2016-04-04 11:52:02 +02:00
Andreas Fabri 18d8d97c47 CGAL::CGAL -> CGAL 2016-04-04 11:52:02 +02:00
Andreas Fabri b4c608940e Qualify generic BGL functions with CGAL:: when used outside of the CGAL namespace 2016-04-04 11:52:02 +02:00
Guillaume Damiand 790764dfa1 Replace SM by OMesh 2016-04-04 11:52:02 +02:00
Guillaume Damiand c80082a574 Bug fix in add_vertex_and_face_to_border in BGL/include/CGAL/boost/graph/Euler_operations.h. 2016-04-04 11:52:02 +02:00
Laurent Rineau 6164c91227 Merge changes to PMP from branch 'releases/CGAL-4.8-branch'
Merges:
> 621e16ed Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
> 4d1ac46 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois
2016-04-04 11:22:09 +02:00
Laurent Rineau 621e16ed41 Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
PMP : fix isotropic_remeshing plugin
2016-04-04 11:19:52 +02:00
Maxime Gimeno dfc2143b28 Fix for emit itemChanged() 2016-04-04 11:18:29 +02:00
Laurent Rineau eed5768651 updated crontab (automated commit) 2016-04-04 11:18:05 +02:00
Laurent Rineau 4d1ac46990 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois
PMP : improve remeshing_test (bis)
2016-04-04 11:16:42 +02:00
Jane Tournois f0261b6a3c minor reorganization of the UI 2016-04-04 10:35:26 +02:00
Maxime Gimeno 56486dbadd Fix for the ctrl+space shortcut 2016-04-04 10:13:21 +02:00
Frédérik Paradis 418c11ec7e Adding typedef for Sphere_d in Search_traits_d to respect the contract of RangeSearchTraits 2016-04-02 10:51:19 -04:00
Guillaume Damiand afb03a8ae4 Remove the use of deprecated functions. 2016-04-01 22:44:29 +02:00
Guillaume Damiand 4991ccf197 Add test of deprecated functions. 2016-04-01 22:34:25 +02:00
Guillaume Damiand 056e0d66fe add a missing deprecated function; use non deprecated version in assert. 2016-04-01 22:27:50 +02:00
Guillaume Damiand c99d0f3223 Bug fix in belong_to_same_cell calls; add const for is_xxx functions. 2016-04-01 22:27:36 +02:00
Guillaume Damiand 3b642fede8 Splif functor in two parts (functor_nonvoid and functor) to avoid ambiguous template specialization. 2016-04-01 22:26:34 +02:00
Laurent Rineau 3299b4b906 Do not dump after optimisers that are not used 2016-04-01 16:17:08 +02:00
Laurent Rineau 77a688530b Fix memory leak 2016-04-01 16:16:17 +02:00
Laurent Rineau f267cfb960 Do not depend on `Viewer.h`
Only `Viewer_interface.h` is needed.
2016-04-01 16:11:52 +02:00
Laurent Rineau 910f17cd51 Allow to pop the context menu with `Key_Menu`
As the item selection is rather slow, for the moment, that is a lot
faster than `Shift+Rightbutton`.
2016-04-01 16:10:58 +02:00
Laurent Rineau 5a9d82ebc7 Improve c3t3 loading and display
Followup to PR #962:

 - the display of spheres was no longer correct,
 - allow loading of c3t3 without any facets and cells (only vertices
   with weights),
 - fix the display of spheres, with better shaders,
 - `Scene_c3t3_item`: do not draw edges, in FlatPlusEdges, during a
   `drawWithNames()`, to optimize speed,
 - `Viewer`: do not use anti-aliasing during `drawWithNames()`
2016-04-01 16:07:56 +02:00
Andreas Fabri 6d72405658 Simplify Constrained_delaunay_triangulation_2 2016-04-01 12:58:59 +02:00
Laurent Rineau 2ae5d2cef6 Merge pull request #975 from afabri/patch-2
Update Random_impl.h
2016-04-01 12:03:29 +02:00
Andreas Fabri e9b3918c38 Update Random_impl.h 2016-04-01 12:02:23 +02:00
Laurent Rineau 4f599d5310 Merge pull request #959 from janetournois/PMP-isotropic_remeshing_made_verbose-jtournois
Polyhedron demo : add verbosity to isotropic_remeshing plugin
2016-04-01 11:17:49 +02:00
Laurent Rineau 617d5f2856 Merge pull request #843 from afabri/Random_print_seed-GF
Print the seed of CGAL::default_random
2016-04-01 11:02:54 +02:00
Laurent Rineau 7700b73176 Merge branch 'releases/CGAL-4.8-branch'
Merges:
> d53efdd - Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
2016-04-01 11:00:57 +02:00
Laurent Rineau d53efddbd8 Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
#define BOOST_PARAMETER_MAX_ARITY early enough
2016-04-01 11:00:06 +02:00
Jane Tournois 36c3a7a758 remove unused variable 2016-04-01 10:02:21 +02:00
Jane Tournois 52b09a1e44 do not forget to reset face indices properly before remeshing 2016-03-31 15:43:07 +02:00
Jane Tournois 964e824750 make "preserve duplicates" not available on a selection_item 2016-03-31 15:17:14 +02:00
Jane Tournois 0804847e64 when remeshing a selection_item, use it instead of poly_item 2016-03-31 15:16:55 +02:00
Andreas Fabri 9776c053d6 simplify template parameters, Add _ postfix to Itag (thank you Marc) 2016-03-31 13:09:54 +02:00
Laurent Rineau 836ce61d39 Merge branch 'releases/CGAL-4.8-branch' 2016-03-31 12:35:23 +02:00
Jane Tournois f6e312fc86 deal with the degenerate face case, and avoid division by 0
the only way to catch it would be to check that the result is not NaN,
probably not a good idea, in particular for vertex normals

and
Revert "deal with the case where one face incident to v is degenerate"

This reverts commit 52105868b31a2685795e92d9caf4bfe251bcf75c.
2016-03-31 12:26:39 +02:00