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

4195 Commits

Author SHA1 Message Date
Laurent Rineau a7cffb4238 Merge pull request #1937 from maxGimeno/Polyhedron_demo-Add_statistics_to_polyhedron-GF 
Polyhedron_demo: Add faces statistics.
 2017-03-09 19:05:55 +01:00
Maxime Gimeno b9b18778b8 Cast std::size_t in unsigned int to silence warnings 2017-03-08 11:48:17 +01:00
Clement Jamin ddb2a41da2 Remove never-used code 2017-03-08 10:36:51 +01:00
Laurent Rineau 140ea3ab9b Merge pull request #1930 from sgiraudot/Polyhedron_demo-PCA_plugin_for_point_sets-GF 
Polyhedron demo: add point set support in PCA plugin
 2017-03-07 17:55:08 +01:00
Simon Giraudot aab1cfade3 Fix duplicated points selection 2017-03-06 14:04:05 +01:00
Laurent Rineau f60275ff28 Merge pull request #1933 from janetournois/Polyhedron_demo-fix_warnings_msvc-jtournois 
Polyhedron demo : fix warnings
 2017-03-02 16:55:15 +01:00
Maxime Gimeno 3a940b429a Fix Segfault when trying to save an unsavable item 2017-03-02 14:50:02 +01:00
Maxime Gimeno a9046343f9 fixes 2017-03-01 14:36:24 +01:00
Maxime Gimeno 0ce8807a6a Add faces statistics. 2017-02-28 13:01:43 +01:00
Jane Tournois 2ef13ddf3d fix conversion warnings 2017-02-27 15:08:57 +01:00
Simon Giraudot 027a120728 Add point set support in PCA plugin 2017-02-27 10:21:38 +01:00
Maxime Gimeno 0632a86970 Factorize program declaration and use special shader for flat shading without pre computing the normals. 2017-02-21 15:20:33 +01:00
Maxime Gimeno 25989d1035 Add a toggle of the Flat Shading 2017-02-21 15:11:43 +01:00
Maxime Gimeno 369eef547e Fix the gouraud for non triangle facets. 2017-02-21 15:11:43 +01:00
Maxime Gimeno 7b8d11d388 Enhancements : 
- Use indexed drawing for edges and gouraud in Polyhedron_item
- Use shrink_to_fit() in Surface_mesh_item.
- Remove useless edge_colors in Polyhedron_item
- Use only 3 coordinates for vertices in Polyhedron_item
 2017-02-21 15:11:43 +01:00
Laurent Rineau 263a4fe1f0 Merge pull request #1902 from maxGimeno/Polyhedron_demo-Detect_degenerated_faces_in_polygon_soup_item-GF 
Polyhedron_demo: Discard degenerated faces in elements computation
 2017-02-15 19:48:15 +01:00
Maxime Gimeno cd4dded4c0 Discard degenerated faces from the item's elements computation. 2017-02-15 11:18:41 +01:00
Laurent Rineau a1f2a37705 Merge pull request #1885 from maxGimeno/Tet_soup_in_c3t3-GF 
Add a .mesh reader
 2017-02-14 15:59:03 +01:00
Jane Tournois a6a5837262 call add_to_complex(c, i, spi) with the right 3rd parameter 
plus a little cleaning
 2017-02-14 15:48:06 +01:00
Laurent Rineau 6ea415022b Merge pull request #1885 from maxGimeno/Tet_soup_in_c3t3-GF 
Add a .mesh reader
 2017-02-10 19:03:49 +01:00
Laurent Rineau 8f4e0cda65 Merge pull request #1896 from maxGimeno/Polyhedron_demo-Fix_path_selection-GF 
Polyhedron_demo: Fix the highlighting in the selection_plugin
 2017-02-10 19:03:34 +01:00
Maxime Gimeno c189c54b58 Don't use the k_ring if in PATH or edit mode. 2017-02-10 11:04:35 +01:00
Maxime Gimeno cc64739c66 Fixes : 
- set the dimension of vertices without connectivity to -1 (fixes the BBox's problem)
- re-center the cut-plane after every type of load (fixes the cutplane problem)
 2017-02-10 10:10:00 +01:00
Maxime Gimeno 35321988fd fix segfault after reload 2017-02-10 09:20:07 +01:00
Laurent Rineau db5eca69d0 Merge pull request #1885 from maxGimeno/Tet_soup_in_c3t3-GF 
Add a .mesh reader
 2017-02-09 18:43:06 +01:00
Laurent Rineau 1cbfbb1e81 Merge pull request #1894 from maxGimeno/Polyhedron_demo-Keep_point_size_when_reload-GF 
Polyhedron_demo: Keep the point's size when reloading
 2017-02-09 18:42:52 +01:00
Laurent Rineau 3ef84ed758 Merge pull request #1893 from janetournois/Mesh_3-reorganize_experimental-GF 
Mesh_3 experimental code - reorganize headers
 2017-02-09 18:42:39 +01:00
Laurent Rineau 485f223bae Merge pull request #1890 from lrineau/Surface_mesh-fix_Property_map-GF 
Fix <CGAL/Surface_mesh/Properties.h> introduced by #1791
 2017-02-09 18:42:25 +01:00
Jane Tournois c66f878e8e add .mesh to loadNameFilters 2017-02-09 17:03:42 +01:00
Maxime Gimeno a0f40dc0b6 Copies properties to keep points and normals size when reloading. 2017-02-09 16:58:25 +01:00
Jane Tournois 2aa2f5db61 initialize bounding box with first vertex that has dimension != -1 2017-02-09 16:57:44 +01:00
Laurent Rineau 9a8121ba69 Fix the Polyhedron demo as well 2017-02-09 16:25:05 +01:00
Jane Tournois ff36a27ba2 move files to Mesh_3/include/CGAL/Mesh_3/experimental 2017-02-09 14:19:07 +01:00
Jane Tournois 99ac4592aa change computation of closest point in the set of polylines 
in addition to the computation of the closest point on filtered polylines,
that excludes the polyline on which `p` (the query point) is, we now :
- compute the segment primitive on which `p` is
- compute a plane that is normal to this segment and contains `p`
- compute all the intersections between this plane and the input polylines
- keep the closest one that is not `p`
 2017-02-09 14:06:36 +01:00
Jane Tournois df083e9216 improve the topological criterion 2017-02-09 14:05:10 +01:00
Jane Tournois 3694a6d2d6 Accelerate distance queries with a kd-tree 2017-02-09 13:56:11 +01:00
Laurent Rineau d7a3386f4f Merge pull request #1885 from maxGimeno/Tet_soup_in_c3t3-GF 
Add a .mesh reader
 2017-02-08 17:33:13 +01:00
Laurent Rineau 289026f257 Merge pull request #1879 from maxGimeno/Polyhedron_demo-FixnameColumn-size-GF 
Polyhedron_demo: Fix the column resizing
 2017-02-08 17:33:00 +01:00
Laurent Rineau 13e420732c Merge pull request #1840 from afabri/BGL-reserve-GF 
BGL: Add helper function reserve(G,nv,ne,nf)
 2017-02-08 17:32:22 +01:00
Maxime Gimeno ef764634b4 Replace the CGAL_precondition about empty finite cells by a warning. 2017-02-08 11:42:18 +01:00
Maxime Gimeno 1845bf8c51 Clean-up 2017-02-08 11:42:17 +01:00
Maxime Gimeno 5e487d75a4 Move Enum to cpp and add license files 2017-02-08 11:42:16 +01:00
Maxime Gimeno 4eb6d260ca Clean -up 2017-02-08 11:42:16 +01:00
Jane Tournois 8d944754ba ifstream openmode should not be set to `binary` for .mesh files 
and fix a conversion warning
 2017-02-08 11:42:16 +01:00
Jane Tournois 9de97dffe6 remove extra typename's (cause compilation error on msvc) 2017-02-08 11:42:16 +01:00
Jane Tournois fc7a585d36 fix typedefs when CGAL_CONCURRENT_MESH_3 is not defined 2017-02-08 11:42:15 +01:00
Maxime Gimeno 9428f70212 Add statistics to the c3t3_item 2017-02-08 11:42:15 +01:00
Maxime Gimeno ebfa4a7ea5 Add a shrinking possibility to the facets of the c3t3_item. 
To apply it, either use the slider in the item's menu, or use + and - when the item is selected.
 2017-02-08 11:42:15 +01:00
Maxime Gimeno 19a45608fa WIP shrinking 2017-02-08 11:42:14 +01:00
Maxime Gimeno 45effcef68 Secure the invalid c3t3_items to keep from calling algorithm that won't work on them. 2017-02-08 11:42:14 +01:00
Maxime Gimeno a50606ca6f Add a .mesh reader for the c3t3 item 2017-02-08 11:42:14 +01:00
Laurent Rineau 760076510c Merge pull request #1845 from lrineau/Mesh_3-fix_detect_features-GF 
Various modifications of Mesh_3
 2017-02-06 15:19:31 +01:00
Maxime Gimeno c0e2fbf2b3 Use setStretchLastColumn(fale) and set ColumnName resize mode to Stretch 2017-02-06 09:26:19 +01:00
Laurent Rineau e225dd7b6e Better topological criterion 
... We have the surface patch index of the facet! That simplifies a lot:
all three vertices of that facet must be *on* the same surface patch as
the facet.
 2017-02-03 16:43:36 +01:00
Maxime Gimeno 1806b43476 Clean-up 2017-02-03 09:05:58 +01:00
Maxime Gimeno 0232be3e65 The NameColumn is the one that gets resized instead of the ABColumn. 2017-02-03 09:05:58 +01:00
Laurent Rineau 041800e721 Merge pull request #1857 from maxGimeno/Polyhedron_demo-Fix_Edit_polyhedron_plugin-GF 
Polyhedron_demo: Fix Edit_polyhedron_plugin
 2017-02-02 17:21:46 +01:00
Laurent Rineau fa304d925a Merge pull request #1796 from maxGimeno/Add_surf_format-GF 
Add surf format reader
 2017-02-02 17:21:02 +01:00
Laurent Rineau 0f538fc036 Merge pull request #1868 from sgiraudot/Polyhedron_demo-Bugfix_point_set_selection-GF 
Point set 3: bugfix points marked as removed
 2017-02-02 17:18:48 +01:00
Maxime Gimeno 5ed0cd8e7b Fix computing time of polyhedron_items 2017-01-30 12:08:24 +01:00
Maxime Gimeno 44a5b3673d Fix surface_mesh_item 2017-01-30 10:57:45 +01:00
Maxime Gimeno 8ace88f529 Fix warning. 2017-01-30 09:20:24 +01:00
Simon Giraudot ff17dd982a More efficient way of creating point set from selected points 2017-01-30 08:45:58 +01:00
Jane Tournois 3aa0520be3 for each material, read Id and Color in any order 2017-01-27 15:45:53 +01:00
Maxime Gimeno 16b91a72b7 Fix Edit_polyhedron_plugin 2017-01-26 09:34:40 +01:00
Sébastien Loriot 0270ec473a Merge pull request #1255 from afabri/CGAL-license_check-GF 
Add a license check mechanism
 2017-01-25 17:14:55 +01:00
Sebastien Loriot f9023285aa Merge pull request #1824 from maxGimeno/Polyhedron_demo-Fixes-GF 
Polyhedron demo : various fixes and enhancements
 2017-01-25 16:57:13 +01:00
Sebastien Loriot 555462ee0e Merge pull request #1842 from maxGimeno/Polyhedron_demo_fix_saveas-GF 
Polyhedron_demo: Fix the Save as option
 2017-01-25 16:54:39 +01:00
Laurent Rineau 9b05a3a5a9 Replace CGAL_MESH_3_NO_PROTECTION_NON_LINEAR by a Boolean 
The Boolean `nonlinear_growth_of_balls` can be set by the
non-documented API:
  - the function `Protect_edges_sizing_field::set_nonlinear_growth_of_balls()`,
  - the Boolean `Mesh_3_options.nonlinear_growth_of_balls`.

Of course the demo sets that Boolean when possible.
 2017-01-25 16:18:10 +01:00
Jane Tournois 0a603f7c4c fix 2 bugs : one missing ref, and parameters order in CGAL::Bbox_3 2017-01-23 12:26:54 +01:00
Maxime Gimeno 2ce60ec127 Change the sizeof<double> into sizeof<CGAL_data_type>, which is float by default. 2017-01-23 10:20:51 +01:00
Jane Tournois 3f0a6c15b6 fix warning 
"non initialised variable used"
 2017-01-20 16:12:10 +01:00
Jane Tournois 85a37b8b24 add reading of GridSize and GridBox 2017-01-20 15:28:11 +01:00
Maxime Gimeno 32414e3431 Robustify parsing. 2017-01-20 14:52:45 +01:00
Laurent Rineau f6045dce29 Merge pull request #1823 from maxGimeno/Polyhedron_demo-Enhance_point_set_selection_plugin-GF 
Polyhedron_demo : Enhance point set selection plugin
 2017-01-19 16:34:46 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Maxime Gimeno 41e1e7e4ce U[date call to GetGeomTraits into CGAL::GetGeomTraits 2017-01-19 12:10:45 +01:00
Laurent Rineau 048a13e868 Bug spotted out by jane 
Cc @janetournois
 2017-01-19 12:10:32 +01:00
Maxime Gimeno 0a521a5987 Fixes 2017-01-19 12:10:32 +01:00
Laurent Rineau aea8a6e110 Great speedup of the code 2017-01-19 12:10:32 +01:00
Maxime Gimeno bd0abd6655 Add material's metadata parsing 2017-01-19 12:10:32 +01:00
Maxime Gimeno 2f5a8bcf81 Add an IO_plugin and fix some bugs 2017-01-19 12:10:31 +01:00
Maxime Gimeno f29a94966c Add a reader for the type ".surf" 2017-01-19 12:10:31 +01:00
Laurent Rineau 5518cf5feb Change the color map for tetrahedra in the cut 2017-01-19 11:29:42 +01:00
Maxime Gimeno fb09d395e2 Make the selection_item's simplices color dependant of the item's color. 2017-01-19 09:26:26 +01:00
Maxime Gimeno 9e4e5fcd67 Fix "Duplicate filter" error 2017-01-19 09:26:25 +01:00
Maxime Gimeno d0850aad02 Fix 
- fix the bugs in selection_plugin on a pre-loaded selection-item
- add the wanted extension to the dialog's name when saving an item
 2017-01-19 09:26:25 +01:00
Laurent Rineau d9c743682d Merge pull request #1813 from maxGimeno/Polyhedron_demo-Update_ids_when_geometry_changed-GF 
Polyhedron_demo : Update the ids when the item's geometry is changed
 2017-01-18 19:34:33 +01:00
Laurent Rineau 1395bb0437 Merge pull request #1825 from maxGimeno/Polyhedron_demo-Make_polylines_width_editable-GF 
Polyhedron demo : make polylines width editable
 2017-01-18 19:32:30 +01:00
Laurent Rineau 154151f3b2 Merge pull request #1826 from maxGimeno/Polyhedron_demo-Extend_selection-GF 
Polyhedron demo : extend selection
 2017-01-18 19:31:49 +01:00
Laurent Rineau 5204288c02 Merge branch 'master' into PMP-handle_boost_prior_to_1_51 2017-01-18 19:29:24 +01:00
Laurent Rineau 634089cd02 Remove spurious typename keywords 2017-01-18 18:59:30 +01:00
Sébastien Loriot 6926578b15 add reserve to MutableFaceGraph 2017-01-18 18:19:25 +01:00
Maxime Gimeno 0e096b1e41 Fix : 
- When Save as is called from menuFile, the sender is not an item. To fix it, use mainSelectionItem when no item is found as sender.
 2017-01-18 16:15:26 +01:00
Sébastien Loriot 516b732adf using tbb::atomic instead of cpp11::atomic 2017-01-16 15:18:46 +01:00
Maxime Gimeno ff22306906 Declare updatePrimitiveIds as override 2017-01-16 09:40:03 +01:00
Sébastien Loriot 0446958c5a parallel version of mesh distance function requires cpp11::atomic 2017-01-13 13:19:29 +01:00
Sébastien Loriot ac18291803 fix typo and reduce the number of points per face by default 2017-01-12 16:11:16 +01:00
Maxime Gimeno 1685eeb45b Adapt spheres side to the box, not the the scene's size. 
Move the Add to selection button.
 2017-01-12 16:09:31 +01:00
Jane Tournois 900a4903ac test distance_plugin 2017-01-12 15:40:40 +01:00