songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
68,994 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

68994 Commits

Author SHA1 Message Date
Guillaume Damiand a78dff1806 Remove the call of the function get_static_check_fpu_rounding_mode_is_restored from FPU_set_cw; use a const variable instead. 2016-06-29 11:55:03 +02:00
Guillaume Damiand e715a25483 Move header files of ImageIO from directory CGAL_ImageIO/src/ to directory CGAL_ImageIO/include/CGAL/ImageIO/; update #include accordingly. 2016-06-28 19:18:53 +02:00
Guillaume Damiand 71d9047b87 Move add_definition before collect cgal library (bugfix) 2016-06-28 12:46:22 +02:00
Guillaume Damiand 4165a5a312 Replace the test on policy 0043 by a test on the cmake major version. 2016-06-28 12:18:07 +02:00
Guillaume Damiand 6820e1b5c4 Reorder the cmake directive to retreive the same original order 2016-06-28 11:30:18 +02:00
Guillaume Damiand 7717bc83b4 ImageIo does not need opengl nor vtk 2016-06-28 11:29:51 +02:00
Sébastien Loriot 32ea637e4b fix error introduced while fixing conflicts in 10cadcb9 2016-06-27 18:14:47 +02:00
Guillaume Damiand 157f2507cf Re-add find_package(Qt5 QUIET COMPONENTS OpenGL Svg) and find_package(OpenGL QUIET) in CGALConfig; they are required in header only mode 2016-06-24 18:58:44 +02:00
Guillaume Damiand 061ffa6806 Remove a double QUIET 2016-06-24 18:57:23 +02:00
Guillaume Damiand e02ac7f7f0 Remove link with zlib (that we introduced before but which are no more required) 2016-06-24 18:35:37 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Guillaume Damiand c4758f091a Simplify CGALConfig files: we do not need anymore to find zlib, nor opengl. 2016-06-24 14:38:28 +02:00
Guillaume Damiand 0fc00c87e3 cgal core link for header only 2016-06-24 14:37:53 +02:00
Guillaume Damiand f446cb9370 Remove some command unseless in header only 2016-06-24 14:37:38 +02:00
Guillaume Damiand c27d1d8c6f Public keywork for target link libraries does not work on my system. 2016-06-24 14:37:22 +02:00
Sébastien Loriot c951fe0fca Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF 
Fix -Wconversion warnings, and issues detected by those warnings
 2016-06-24 13:30:48 +02:00
Sebastien Loriot fc44ee3051 Merge pull request #1180 from sloriot/BGL-fix_edge_hash 
fix edge hash
 2016-06-24 13:24:27 +02:00
Sébastien Loriot db2f60f636 improve Hash test 2016-06-24 13:23:44 +02:00
Guillaume Damiand 5b000f38c6 Install header files of cgal_imageio in CGAL_ImageIO/include/CGAL/ImageIO/ directory (following Laurent remark) 2016-06-24 11:02:01 +02:00
Guillaume Damiand 98a5d85811 Patch to link 3rd party libraries with CGAL in header only mode (thanks @lrineau) 2016-06-24 09:58:16 +02:00
Guillaume Damiand d64f43ac73 The option CGAL_HEADER_ONLY is enabled only for cmake >= 3.0 (because in this case we use INTERFACE library) 2016-06-24 09:56:11 +02:00
Laurent Rineau f9dd4b4be7 Try to fix a compilation error with CentOS5's g++ 
The compilation error was:

> ../include/CGAL/Mesh_3/polylines_to_protect.h: In function ‘void CGAL::polylines_to_protect(const CGAL::Image_3&, double, double, double, std::vector<std::vector<IC, std::allocator<_CharT> >, std::allocator<std::vector<IC, std::allocator<_CharT> > > >&, Image_word_type*, Null_subdomain_index, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>, Image_word_type = unsigned char, Null_subdomain_index = CGAL::Null_subdomain_index, PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >, std::allocator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > > >]’:
> ../include/CGAL/Mesh_3/polylines_to_protect.h:538:   instantiated from ‘void CGAL::polylines_to_protect(const CGAL::Image_3&, std::vector<std::vector<IC, std::allocator<_CharT> >, std::allocator<std::vector<IC, std::allocator<_CharT> > > >&, PolylineInputIterator, PolylineInputIterator) [with P = CGAL::Point_3<CGAL::Epick>, Image_word_type = unsigned char, PolylineInputIterator = __gnu_cxx::__normal_iterator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >*, std::vector<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > >, std::allocator<std::vector<CGAL::Point_3<CGAL::Epick>, std::allocator<CGAL::Point_3<CGAL::Epick> > > > > >]’
> ../test/Mesh_3_Examples/mesh_3D_image_with_features.cpp:62:   instantiated from here
> ../include/CGAL/Mesh_3/polylines_to_protect.h:193: error: no matching function for call to ‘get(boost::tuples::tuple<boost::array<int, 3ul>, CGAL::Point_3<CGAL::Epick>, unsigned char, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type>&)’

See https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.9-Ic-81/Mesh_3_Examples/TestReport_lrineau_CentOS5.gz
 2016-06-23 14:19:24 +02:00
Sebastien Loriot eed19486ef Merge pull request #1192 from maxGimeno/Euler_operations_improvements-GF 
Polyhedron_demo : Selection tool improvements
 2016-06-23 13:45:55 +02:00
Sebastien Loriot 60ce6420c1 Merge pull request #1196 from sloriot/Polyhedron_demo-deform_widget_with-tabs 
use tabs to reduce the size of the deformation widget
 2016-06-23 13:44:27 +02:00
Sébastien Loriot bbf007c41f fix doc typos 2016-06-22 21:54:43 +02:00
Guillaume Damiand e21ef313c0 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 20:54:37 +02:00
Maxime Gimeno 90999805be Fix merge. 2016-06-22 17:40:02 +02:00
Sébastien Loriot a3d10e51f5 use tabs to reduce the size of the deformation widget 2016-06-22 16:52:43 +02:00
Guillaume Damiand 8b803aca6f Install header files of CGAL_ImageIO/ when we are in header only mode. 2016-06-22 15:57:57 +02:00
Sebastien Loriot 749e40fce9 Merge pull request #1115 from lrineau/Mesh_3-connected_components_for_images-GF 
Mesh_3: connected components for 3D images
 2016-06-22 14:52:10 +02:00
Maxime Gimeno c129c1329f Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:30:58 +02:00
Maxime Gimeno e3cd2143f2 Fixes facet display: 
- Re-computes normal maps after an operation that changes the number of facets.
 2016-06-22 14:28:47 +02:00
Maxime Gimeno 89cedf65cb Robustifies the highlighting 2016-06-22 14:28:38 +02:00
Maxime Gimeno e937c803a0 Removes the Hover events in edition mode. 2016-06-22 14:28:27 +02:00
Maxime Gimeno 67e6ac76f6 Fix the facets display 
- Keeps the selected facets in front of the polyhedron's facets.
 2016-06-22 14:28:17 +02:00
Maxime Gimeno 526473dca8 Keep the last selection mode in memory when erasing a scene_selection_item 2016-06-22 14:28:09 +02:00
Maxime Gimeno ccccfc03c1 Enhancement 
- Addition of a feature to select all non triangle facets.
 2016-06-22 14:27:55 +02:00
Maxime Gimeno a256f151f5 Makes the resulting point of collapse edge and join vertices the center of the original edge. 2016-06-22 14:27:45 +02:00
Maxime Gimeno 902bb2b8ce Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:27:33 +02:00
Maxime Gimeno 32fe11acee Clean-up and fix segfault 2016-06-22 14:15:03 +02:00
Maxime Gimeno cfa4796fa6 Fix for Move_vertex 2016-06-22 14:14:54 +02:00
Maxime Gimeno fcc2a94cbb Addition of doc pictures in the plugin 2016-06-22 14:13:52 +02:00
Maxime Gimeno 0d796d29f2 Addition of a tool to move a vertex in the edition_mode. 2016-06-22 14:04:17 +02:00
Maxime Gimeno 36c131b276 Fix for the singleshot in selection mode. 2016-06-22 14:03:09 +02:00
Maxime Gimeno b743c76bb1 change polygon_offset to display selected facets even with the camera in the default position. 2016-06-22 14:02:58 +02:00
Maxime Gimeno cc2e262d69 Cannot use singleshot for facet selection, somehow it discards the right event. 2016-06-22 14:02:47 +02:00
Maxime Gimeno adc43ed8ba Fluidifiy the selection 2016-06-22 14:02:32 +02:00
Maxime Gimeno 1013d4ff84 Addition of a highlighting system in the edit mode. 2016-06-22 13:59:28 +02:00
Guillaume Damiand 50125f1d53 First try to use an interface target in header only; in order to allow to link with this fictive target. 2016-06-22 13:44:50 +02:00
Sébastien Loriot ec69b336e8 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-06-22 13:20:25 +02:00