Commit Graph

80417 Commits

Author SHA1 Message Date
Sébastien Loriot 5ebdb7c872 fix checking condition in autorefine test 2018-06-13 09:47:05 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Laurent Rineau a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace 2018-06-12 16:15:34 +00:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Laurent Rineau aa5b7e83b7 Merge branch 'releases/CGAL-4.12-branch' 2018-06-12 16:44:47 +02:00
Laurent Rineau 97d59289e1 Merge pull request #3029 from maxGimeno/Demo-Use_img_offset-GF
Polyhedron demo: Use image's offset in display
2018-06-12 16:38:42 +02:00
Laurent Rineau 6ed06f3d8b Merge pull request #3162 from afabri/patch-4
Update Weighted_point_3.h
2018-06-12 16:38:39 +02:00
Laurent Rineau 3ec18a14a5 Merge pull request #3097 from maxGimeno/Demo-Fix_triangulate_primitive-GF
Polyhedron demo: Fix triangulation of facets
2018-06-12 16:38:36 +02:00
Laurent Rineau a6be5794fb Merge pull request #3160 from afabri/patch-3
PMP: Fix typos in the User Manual
2018-06-12 16:38:33 +02:00
Laurent Rineau 2a6c101ad6 Merge pull request #3157 from afabri/Triangulation_3-Conflict_with_Windows_Point-GF
Surface mesher demo: Another problem with VS2017 -permissive-
2018-06-12 16:38:30 +02:00
Laurent Rineau 3845494b5c Merge pull request #3151 from lrineau/Mesh_3-fix_uninitialized_variables-GF
Mesh_3: Fix the warnings about uninitialized variables
2018-06-12 16:38:27 +02:00
Laurent Rineau 16c581fb4b Merge pull request #3145 from afabri/PMP-should-GF
Polygon_mesh_processing: Change should  to must/shall
2018-06-12 16:38:24 +02:00
Laurent Rineau 796d1bdcb6 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
Spatial Searching: bugfix disable_if
2018-06-12 16:38:20 +02:00
Laurent Rineau 2da31fad27 Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch 2018-06-12 16:36:54 +02:00
Laurent Rineau c8009c7250 Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
Spatial Searching: bugfix disable_if
2018-06-12 16:32:18 +02:00
Laurent Rineau 08d72d0029 Merge pull request #3162 from afabri/patch-4
Update Weighted_point_3.h
2018-06-12 16:32:15 +02:00
Laurent Rineau dd885ec5c9 Merge pull request #3160 from afabri/patch-3
PMP: Fix typos in the User Manual
2018-06-12 16:32:10 +02:00
Laurent Rineau e3e64036bd Merge pull request #3142 from sgiraudot/Spatial_searching-Fix_disable_if-GF
Spatial Searching: bugfix disable_if
2018-06-12 16:31:26 +02:00
Mael Rouxel-Labbé ac0779b92b Removed erroneous documentation about translation of weighted points 2018-06-12 16:06:25 +02:00
Andreas Fabri 449e649ccc We cannot return a child of the DAG if it got pruned 2018-06-12 12:57:10 +01:00
Sébastien Loriot 7511b3e1b2 add missing constructor for unsigned int 2018-06-12 12:59:51 +02:00
Guillaume Damiand 3c6dc005de Update Polyhedron examples, to remove .cin input file. 2018-06-12 09:36:48 +02:00
Maxime Gimeno c17b4a3716 Fix (maybe) the problems of DockWidgets sizing 2018-06-12 09:26:49 +02:00
Maxime Gimeno 4843c0562c remove unwanted include for moc. 2018-06-12 08:59:12 +02:00
Guillaume Damiand 9226228a5e Create data directory in Polyhedron example 2018-06-12 08:09:50 +02:00
Guillaume Damiand 873ee7216b Remove an unused off, which is not in data directory. 2018-06-12 08:05:14 +02:00
Sébastien Loriot ef09d971e2 undo unwanted change in 777d305 2018-06-11 22:09:37 +02:00
Sébastien Loriot 8ccc2af157 add missing overload 2018-06-11 22:04:24 +02:00
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +02:00
Laurent Rineau 564a68dada use printf, to display \n 2018-06-11 15:54:41 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Guillaume Damiand c08546276b Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined. 2018-06-11 13:06:20 +02:00
Laurent Rineau d0c9081321 CGAL-4.11 is incompatible with Qt5>=5.11 2018-06-11 11:20:34 +02:00
Andreas Fabri a61c51d08f This sneaked in. Thank you Laurent for pointing it out 2018-06-08 16:01:54 +01:00
Andreas Fabri 8efae621d8 And the same for the 3D weight 2018-06-08 15:52:05 +01:00
Andreas Fabri c844a0b788 Do the same for the weight 2018-06-08 14:00:12 +01:00
Andreas Fabri 73ed26ba75 Add a dynamic cast and remove the assert 2018-06-08 12:58:51 +01:00
Andreas Fabri 6281b5b152
Update Weighted_point_3.h
Fix typo
2018-06-08 12:25:00 +02:00
Sébastien Loriot 895dbaad73 fix merge of status after the usage of ecm in collapse_edge
ep and epo are no longer guarantee to be the halfedges to be removed
2018-06-07 17:35:29 +02:00
Andreas Fabri de55e06547
PMP: Fix doc 2018-06-07 15:42:38 +02:00
Sébastien Loriot 117b1d810a work around issue with boost::size in boost 1.55
improve at the same time the runtime in cases
we could also have a lazy version for non-random access iterators
2018-06-07 15:14:20 +02:00
Andreas Fabri e20aca8806 More disabling of warnings 2018-06-07 13:26:52 +01:00
Maxime Gimeno fdeb5621ca replace cast in unsigned long int to std::size_t to fix warnings. 2018-06-07 13:55:22 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno 4cefdef103 Fix indentation 2018-06-07 11:55:31 +02:00
Maxime Gimeno feef087fed fix warnings 2018-06-07 10:11:24 +02:00
Maxime Gimeno b87aeef1fe Use offset of the image 2018-06-07 10:08:10 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00
Sébastien Loriot e1e1512869 Merge 'PMP-isotropic_remeshing_user_projection' into PMP-isotropic_remeshing_user_projection 2018-06-06 18:00:32 +02:00