Commit Graph

65177 Commits

Author SHA1 Message Date
Jane Tournois f53bc373a0 update changes.html 2015-11-03 15:38:32 +01:00
Jane Tournois 3448f7cd57 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-03 15:34:45 +01:00
Jane Tournois ad2e627a31 documentation and change return types to use Geom_traits::FT 2015-11-03 15:29:15 +01:00
Sebastien Loriot 542490430c Merge pull request #454 from gdamiand/patch-1
Update changes.html
2015-11-02 10:59:06 +01:00
Sebastien Loriot c0274200ef Merge pull request #455 from sgiraudot/Polyhedron_demo-Bugfix_ply_reader_unselect_all-GF
Bugfix: unselect all points when reading PLY files
2015-11-02 10:56:36 +01:00
Simon Giraudot 15e7cb563c Bugfix: unselect all points when reading PLY files 2015-11-02 10:45:59 +01:00
Guillaume Damiand 7d9338c022 Update changes.html 2015-11-02 10:01:13 +01:00
Sebastien Loriot 5d9d9d660d Merge pull request #450 from gdamiand/CMap-marks_with_exceptions-sbrandel
C map marks with exceptions sbrandel
2015-11-02 09:12:42 +01:00
Sebastien Loriot 97eb06bf48 Merge pull request #446 from lrineau/master
Three: Improvements to Scene_item/Viewer
2015-11-02 09:01:07 +01:00
Sebastien Loriot 54d2ae5e55 Merge pull request #444 from maxGimeno/CGAL_Sqrt_fix-GF
Fix for std::sqrt in Mesh_processing
2015-11-02 08:58:32 +01:00
Sebastien Loriot a3a0c40916 Merge pull request #448 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF
Left click fix
2015-10-30 16:09:36 +01:00
Maxime Gimeno 3f728e61d4 Left click fix
- No more need to move the mouse to select a facet
- shift + right click doesn't block the shift_pressed state anymore.
2015-10-30 15:55:36 +01:00
Laurent Rineau fd01d34972 updated crontab (automated commit) 2015-10-30 13:18:03 +01:00
Laurent Rineau f108a22534 minor improvement to Scene_polylines_item
Reduce the number of data members
2015-10-29 18:51:28 +01:00
Laurent Rineau b73d1662e0 move attrib_buffers and getShaderProgram to Viewer 2015-10-29 18:51:10 +01:00
Laurent Rineau 34e469bbdc improve Scene_item
Use an enum instead of macros.
2015-10-29 18:50:46 +01:00
Laurent Rineau 33059e1eb1 fix comments 2015-10-29 18:50:23 +01:00
Laurent Rineau cb063ca170 remove <CGAL/gl_render.h> 2015-10-29 18:49:10 +01:00
Sebastien Loriot 4292e3b700 Merge pull request #434 from sgiraudot/Polyhedron_demo-Meta_reconstruction_plugin-GF
Polyhedron demo - Meta reconstruction plugin
2015-10-29 16:08:59 +01:00
Sebastien Loriot 6c63dae3bc Merge pull request #440 from cjamin/Triangulation_3-fix_parallel_RT-cjamin
Enable parallel insertion of points with info in Regular_triangulation_3
2015-10-29 16:04:20 +01:00
Laurent Rineau 769dbf0e07 Merge pull request #443 from sgiraudot/Polyhedron_demo-Bugfix_missing_ui_include-GF
Polyhedron demo: Bugfix (missing UI include)
2015-10-29 13:50:23 +01:00
Maxime Gimeno 7c0be4674d Fix for std::sqrt in Mesh_processing
- replaces all the std::sqrt by CGAL::sqrt
2015-10-29 13:44:18 +01:00
Simon Giraudot 3d125b461c Remove useless includes in xyz_plugin 2015-10-29 13:34:01 +01:00
Simon Giraudot c9a661b27b Move inclusion of UI file from H to CPP for statistcis on polyhedron 2015-10-29 13:33:10 +01:00
Sebastien Loriot 00c85ba0a9 Merge pull request #441 from maxGimeno/CGAL_Assert_fix-GF
Cgal assert fix gf
2015-10-29 13:10:26 +01:00
Sébastien Loriot 1767f306cc these assertions are meant to be used without CGAL 2015-10-29 13:09:27 +01:00
Sébastien Loriot db92147837 assert -> CGAL_assertion in header 2015-10-29 13:04:01 +01:00
Maxime Gimeno 3855910b37 Fix for #295
- Replacement of CGAL_assertion by assert in test files
2015-10-29 10:51:15 +01:00
Maxime Gimeno 864c95ae08 Fix for #295
- Replacement of assert() by CGAL_assertion()
2015-10-29 10:39:53 +01:00
Simon Giraudot fa0cfae043 Correction of names of variable and displayed QAction 2015-10-29 09:26:40 +01:00
Guillaume Damiand afeb0eb4d2 Do not use using declaration but a typedef. 2015-10-29 07:41:55 +01:00
Guillaume Damiand d02357fb9c Remplace int by size_type for mark 2015-10-28 18:56:46 +01:00
Sébastien Loriot bed84e6234 Merge branch 'releases/CGAL-4.7-branch' 2015-10-28 13:45:23 +01:00
Sébastien Loriot 36b68c936f fix duplicated include guard macro name 2015-10-28 13:44:46 +01:00
Guillaume Damiand f918d36ef6 rename mark in amark. 2015-10-28 13:16:31 +01:00
Sébastien Loriot 770f87dd29 Merge branch 'releases/CGAL-4.7-branch' 2015-10-28 11:21:16 +01:00
Sébastien Loriot 87b6490af7 add missing includes 2015-10-28 11:20:46 +01:00
Guillaume Damiand 06731095ae Add using declaration for Exception_no_more_available_mark. 2015-10-28 11:19:02 +01:00
Clement Jamin b6c1581456 Fix type 2015-10-28 11:06:46 +01:00
Laurent Rineau 12cea3b62b No longer test with autotest_cgal on cgal.gf.com
autotest_cgal is still launched, but no platform is actually tested.
2015-10-27 17:02:13 +01:00
Clement Jamin ebf4192456 Add missing copy constructor + improve code/formatting 2015-10-27 12:25:14 +01:00
Clement Jamin 857dc76847 Test the parallel insertion of points with info 2015-10-27 12:22:31 +01:00
Clement Jamin 6fc4dd7dd3 Enable parallel insertion of points with info
There was a bug preventing the parallelism to be activated when
using points with info
2015-10-27 12:17:58 +01:00
Clement Jamin 136488b149 Add a test for parallel insertion of points with info (bug: not parallel) 2015-10-27 11:10:41 +01:00
Sebastien Loriot 38d1c08853 Merge pull request #429 from janetournois/Polyhedron_demo-sort_operations_by_package-GF
Polyhedron demo : sort operations by package
2015-10-27 10:19:30 +01:00
Sébastien Loriot 948651d961 Merge branch 'releases/CGAL-4.7-branch' 2015-10-27 08:59:20 +01:00
Sébastien Loriot 7e3fe6c776 fix a warning 2015-10-27 08:58:49 +01:00
Laurent Rineau 64654ea2ff Add a script that shows the merges in last testsuites 2015-10-26 14:25:06 +01:00
Sebastien Loriot 38558c5af5 Merge pull request #433 from maxGimeno/Polyhedron_demo-Splat_fix_for_mac-GF
Compilation error fix
2015-10-26 09:16:25 +01:00
Simon Giraudot cef08091f6 Fix testsuite errors: misplaced typename and concurrency tag 2015-10-26 07:25:29 +01:00