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

266 Commits

Author SHA1 Message Date
Maxime Gimeno 0111db6173 Add color writing for OFF format. Fixes Vertex_color display. 2017-06-26 16:57:01 +02:00
Laurent Rineau 01fc5c3b33 Merge branch 'releases/CGAL-4.10-branch' 2017-06-16 11:45:45 +02:00
Laurent Rineau bececa63df Merge branch 'releases/CGAL-4.9-branch' into releases/CGAL-4.10-branch 2017-06-16 11:43:08 +02:00
Laurent Rineau 01504b06e6 Add missing headers 2017-06-08 09:49:40 +02:00
Andreas Fabri d6816a7368 Move Mesh_3 specific properties to Mesh_3 2017-05-31 16:08:26 +02:00
Andreas Fabri 4d27ea1cc5 Move selection properties to the Polyhedron demo directory as it is demo specific 2017-05-31 16:05:24 +02:00
Maxime Gimeno e379ad8524 Fix after rebase 2017-05-29 14:35:17 +02:00
Maxime Gimeno 360031a14a Restore the PMP_properties_Surface_mesh.h and remove the private copy constructor of Gwdwg to let the default one be used, as it does not allow memory. This allows Surface only meshing to work with surface_mesh. 2017-05-29 13:24:08 +02:00
Maxime Gimeno 1330777a31 Make property maps for PMP and Surface_mesh generic 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h
 2017-05-29 13:22:37 +02:00
Maxime Gimeno 880b6e21a2 Fixes and Clean-up. 
- Move the new properties in a file in PMP and remove them from the namespace boost.
- Move the surface mesh properties from properties_Surface_mesh.h to Scene_surface_mesh_item.h
 2017-05-29 13:20:39 +02:00
Maxime Gimeno 278c5b6154 Fix missing typename and template 2017-05-29 13:20:39 +02:00
Andreas Fabri b5212bd83b Make surface mesh simplification plugin work for Surface_mesh 2017-05-29 13:20:38 +02:00
Laurent Rineau 72cd1785cd Merge pull request #2086 from afabri/BGL-cgal_style_doc-GF 
BGL:  doxygen doc for concepts
 2017-05-29 11:16:40 +02:00
Laurent Rineau b037471750 Merge pull request #2075 from afabri/CGAL-dont_include_graph_traits_header-GF 
Do not include graph_traits_{Polyhedron | Surface_mesh}.h
 2017-05-19 10:28:38 +02:00
Laurent Rineau cc40bf46e4 Merge pull request #1899 from maxGimeno/Clean_up_Surface_mesh_doc-GF 
Clean-up Surface_mesh doc
 2017-05-11 16:05:46 +02:00
Andreas Fabri 86bc36abe1 Complete documentation 2017-04-28 11:45:16 +02:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Andreas Fabri 8e5df1efe9 An isolated point IS a border point 2017-03-29 19:10:47 +02:00
Andreas Fabri a890b3f221 Fix #1949 2017-03-06 08:55:51 +01:00
Maxime Gimeno 3bc4308abb Remove useless doc. 2017-02-10 12:00:11 +01:00
Laurent Rineau f55950601f Merge pull request #1890 from lrineau/Surface_mesh-fix_Property_map-GF 
Fix <CGAL/Surface_mesh/Properties.h> introduced by #1791
 2017-02-08 17:32:35 +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
Laurent Rineau 7b2a150e84 Fix <CGAL/Surface_mesh/Properties.h> and its uses 
The PR #1791 introduced `CGAL::Point_set_3`, and factorized the
`Property_map` implementation of `Surface_mesh` into a new class
template `CGAL::Properties::Property_map<Key, T>`.

The backward compatibility was supposed to be ensured by the fact that
`Surface_mesh<Point>::Property_map<Key,T>` had
`Properties::Property_map<Key, T>` as base class. But that compatibility
was only partial, and there could be ambiguities in the calls to `get`
and `put` with those property maps.

This commit/PR renamed `Properties::Property_map` to
`Properties::Property_map_base`, and added a third parameter, used as
the `Derived` class in the CRTP used by `boost::put_get_helper`. That
way, the `get` and `put` functions are defined directory on the real
class `Surface_mesh::Property_map<Key, T>` and not on its base class.

The same has been modified in `CGAL::Point_set_3`.

That makes the use of `Property_base_base` and `Property_container` a
little trickier, but that removes several ugly non-portable hacks, like
the `reinterpret_cast` that were used to convert a pointer to base class
of the pmap to the pointer the real pmap. Now that is a lot cleaner.

I have verified that the documentation is not modified. Actually, the
PR #1791 did modify the documentation of `Surface_mesh` (see the member
method `add_property_map` for example), and this PR fixes the situation:
the documentation of `Surface_mesh` is put back to the version in
CGAL-4.9.
 2017-02-08 14:33:18 +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
Sébastien Loriot 6926578b15 add reserve to MutableFaceGraph 2017-01-18 18:19:25 +01:00
Simon Giraudot ab7a245161 Cancel useless changes in BGL and Surface_mesh 2017-01-04 08:47:32 +01:00
Simon Giraudot 1beb340550 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2017-01-03 15:23:23 +01:00
Sébastien Loriot fe5e925367 Merge pull request #1701 from afabri/Convex_hull_3-FaceGraph-GF 
Convex_hull_3: Switch to FaceGraph
 2016-12-30 15:14:34 +01:00
Andreas Fabri 55c53d53f3 Surface_mesh: The get/put functions are not templated 2016-12-05 17:05:23 +01:00
Andreas Fabri d968e123ea Make indices work with Unique_hash_map 2016-11-22 12:26:26 +01:00
Simon Giraudot 22f0b2c1f8 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-10-24 15:17:38 +02:00
Simon Giraudot a694c34ff2 Properties: fix types (use std::size_t everywhere it should be used) 2016-10-21 10:28:41 +02:00
Laurent Rineau 9865f19a4d Back-compatibility of Surface_mesh::Property_map 2016-10-21 10:28:40 +02:00
Simon Giraudot 5e13b93b73 Revert "Add missing Properties.h file" 
This reverts commit f9cdfbdfd9.
 2016-10-21 10:28:40 +02:00
Simon Giraudot f80bbf517c Bugfix: creation of pmap should return false if pmap already exists 2016-10-21 10:28:40 +02:00
Simon Giraudot 7f4044bb2e Recover property values as strings + fix get to check type in addition of name 2016-10-21 10:28:39 +02:00
Simon Giraudot a1ef348e66 Revert unfortunate change in Surface_mesh 2016-10-21 10:28:39 +02:00
Simon Giraudot 1ff9ebf0e9 Return boolean instead of void to make sure property is removed 2016-10-21 10:28:39 +02:00
Simon Giraudot 1b37cbcb35 Add missing const 2016-10-21 10:28:39 +02:00
Simon Giraudot 3fabd97cab Add missing Properties.h file 2016-10-21 10:28:39 +02:00
Simon Giraudot dc82631685 Update namespaces 2016-10-21 10:28:39 +02:00
Simon Giraudot 0cc14d6738 Add iterator and related methods begin() and end() 2016-10-21 10:28:38 +02:00
Simon Giraudot 1343ade651 Remove Surface_mesh as a friend class (useless) 2016-10-21 10:28:38 +02:00
Simon Giraudot 8e6dbf0e03 Reset Properties to initial state in Surface_mesh 2016-10-21 10:28:38 +02:00
Simon Giraudot bf157b4511 Propagate namespace change in test of Surface_mesh 2016-10-21 10:28:38 +02:00
Simon Giraudot 20efa0bb5d Propagate namespace change in examples 2016-10-21 10:28:38 +02:00
Simon Giraudot a5bb805d31 Propagate namespace change in BGL 2016-10-21 10:28:38 +02:00
Simon Giraudot 6429dde647 Revert now useless modifications of Surface_mesh 2016-10-21 10:28:37 +02:00
Simon Giraudot 8e73580e3e Update change of namespace in Surface_mesh/IO.h 2016-10-21 10:28:37 +02:00
Simon Giraudot a4aaf392e6 Move properties out of Surface_mesh and update namespaces 2016-10-21 10:28:37 +02:00