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

348 Commits

Author SHA1 Message Date
Philipp Möller 79b7fc5081 Handle the INPUT cases where the whole include dir is used 2015-12-10 17:03:46 +01:00
Sébastien Loriot 54ca52b538 Merge branch 'BGL-SurfaceMesh2SurfaceMesh-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:25:00 +01:00
Andreas Fabri eb8d2f5752 fixed three documentation typos 2015-09-22 09:26:10 +02:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF 
assert() should not be used in CGAL headers!
 2015-09-07 10:58:20 +02:00
Jane Tournois ce54198aa7 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-09-02 15:57:23 +02:00
Andreas Fabri 06bac198dc endl -> '\n' 2015-09-02 15:33:03 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Laurent Rineau 0fd6f2fa59 Merge pull request #288 from afabri/CGAL-add_hash-GF 
No longer forward declare struct std:hash

Fixes issues #287 and #274.
 2015-08-27 15:41:50 +02:00
Andreas Fabri bf975ead95 No longer forward declare struct std:hash 2015-08-23 14:30:54 +02:00
Philipp Möller 6d1d3f04ba Fix compilation errors for VS 
Note that removing the "template" keyword may break compilation
for other compilers
 2015-07-30 14:16:46 +02:00
Philipp Möller 0b5e682985 Clean up some includes 2015-07-30 14:16:26 +02:00
Philipp Möller 3533e77dfe Remove Boost.Fusion dependency 
Boost.Fusion in 1.57 fails to compile on gcc 4.4 + std=c++0x (see
https://svn.boost.org/trac/boost/ticket/10190). Since we want support
for that platform, the fusion map is replaced by a specialized class
template Property_selector.
 2015-07-30 14:16:12 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF 
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
 2015-07-17 15:39:18 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Andreas Fabri eb22148902 remove a file that is not an example 2015-07-17 11:11:07 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF 
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-07-16 16:52:53 +02:00
Laurent Rineau 2a9b9330c3 Revert "Merge pull request #143 from bo0ts/Surface_mesh-gcc44_fixes-pmoeller" 
This reverts commit 8cffc8be58, reversing
changes made to c1a0afd97a.

Philipp (@bo0ts) will open a new pull-request so solve the issue.
 2015-07-14 18:29:43 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
 2015-07-13 08:16:59 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF 
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
 2015-07-06 10:51:23 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF 
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
 2015-07-01 13:52:44 +02:00
Jane Tournois 2c6b6a9ee9 reintroduce template keyword 
msvc seems to be ok with it
 2015-07-01 13:04:36 +02:00
Jane Tournois 631a60ea85 fix compilation errors for visual studio 
note that removing the "template" keyword may break compilation
for other compilers
 2015-07-01 12:48:05 +02:00
Philipp Möller 0cda240dd1 Clean up some includes 2015-06-29 13:13:09 +02:00
Philipp Möller 1e62e6b197 Remove Boost.Fusion dependency 
Boost.Fusion in 1.57 fails to compile on gcc 4.4 + std=c++0x (see
https://svn.boost.org/trac/boost/ticket/10190). Since we want support
for that platform, the fusion map is replaced by a specialized class
template Property_selector.
 2015-06-29 13:12:51 +02:00
Andreas Fabri c48bf3a3e6 more tests; small fixes 2015-06-25 09:17:08 +02:00
Andreas Fabri 92a647b1af add example for unordered_set 2015-06-22 12:31:48 +02:00
Andreas Fabri b197a3402f do not document hash_value as it is an implementation detail 2015-06-22 12:16:46 +02:00
Andreas Fabri dadb129147 g++ needs a forward declaration for std::hash 2015-06-02 08:46:20 +02:00
Andreas Fabri b6850d35c0 #include <functional> and suppress struct/class warning for VC10 2015-06-01 10:42:52 +02:00
Andreas Fabri 425cdf0b0c derive from unary_function; Add #define switch to hash underlying pointer 2015-05-27 12:19:55 +02:00
Andreas Fabri 3491e73509 remove debug output 2015-05-27 11:29:58 +02:00
Laurent Rineau 5b374cbeb1 Merge pull request #77 from afabri/BGL-helpers-GF 
Document and complete BGL helper functions
 2015-05-26 12:27:15 +02:00
Laurent Rineau 2bfdee92c7 Merge pull request #67 from afabri/Surface_mesh-join-GF 
Add join operation to Surface_mesh
 2015-05-18 11:04:48 +02:00
Andreas Fabri 915d1e6fdb do not document an internal function 2015-04-27 17:53:04 +02:00
Andreas Fabri 18ee1199e7 replace -1 by a variable to avoid warning 2015-04-25 15:54:00 +02:00
Andreas Fabri 6dbdea0429 The results on this version with VC11 boost 1_55 are: 
$ ./build/hm.exe data/iphi.off
3165798 items

Surface_mesh  std::map
BOOST_FOREACH boost::iterator_range r = vertices(g))
  0.53 sec.
BOOST_FOREACH CGAL::Iterator_range r = vertices(g))
  0.13 sec.
BOOST_FOREACH vertices(g))
  1.49 sec.
for vertices(g))
  0.18 sec.
v = 0 0 0  2004454762201200
 2015-04-21 13:44:26 +02:00
Andreas Fabri e9766c0ffd slight change of Index_iterator::increment 2015-04-21 13:24:10 +02:00
Andreas Fabri 0c2a568d73 better coverage of the combinations of mesh and map classes 2015-04-20 10:40:03 +02:00
Sébastien Loriot d36593eb72 add missing const and remove debug output 2015-04-17 17:22:26 +02:00
Andreas Fabri 832208d815 simplifications 2015-04-17 15:49:21 +02:00
Andreas Fabri 0eaa9235d0 Add specializations of hash 2015-04-17 10:44:43 +02:00
Andreas Fabri 205a594a77 add specializations of hash and add tests 2015-04-17 10:21:14 +02:00
Andreas Fabri 79e4711ee0 make_tetrahedron is no longer in CGAL::Euler 2015-04-17 08:28:57 +02:00
Andreas Fabri 821ccc3373 move Face_index and add fake unordered set 2015-04-16 13:38:37 +02:00
Andreas Fabri 0a2e3f8a8b move Halfedge_index 2015-04-16 13:31:40 +02:00
Andreas Fabri 144e4772c1 move Vertex_index 2015-04-16 13:27:38 +02:00
Andreas Fabri a3a9a9c873 move Index out of the class and rename it to SM_Index 2015-04-16 13:23:38 +02:00
Andreas Fabri c2871c92e6 Move the Index class back into Suface_mesh; Add doc 2015-04-15 19:15:34 +02:00
Andreas Fabri 35957091d2 fix example 2015-04-15 12:23:34 +02:00
Philipp Möller f0f4b42079 Neither vector nor boost/assign are used, but iostream is 2015-04-10 14:41:53 +02:00
Jane Tournois 4f93dc07b0 use add_face(vertex range) from euler operations in Surface_mesh 2015-04-10 11:29:29 +02:00
Andreas Fabri 962ef07812 Add hash_value for Compact_container, Inplace_list, Index 2015-03-12 16:21:56 +01:00
Andreas Fabri 04fdf00d76 Add 2D Polyline Simplification; fix the description of Surface_mesh 2015-02-25 11:40:36 +01:00
Andreas Fabri ae8f32511f improve doc 2015-02-03 14:26:43 +01:00
Andreas Fabri ec19e1ca12 improve doc 2015-02-03 14:19:09 +01:00
Andreas Fabri cdf00e7532 concatenate freelists in case the meshes have garbage 2015-02-03 12:51:09 +01:00
Andreas Fabri e57073baed transfer property from rhs if the property exists on lhs 2015-02-03 11:25:34 +01:00
Andreas Fabri d65c0a0add find corresponding property arrays 2015-02-03 10:42:13 +01:00
Andreas Fabri 095cb4b2dc deal also with invalid surface meshes 2015-02-02 16:33:10 +01:00
Andreas Fabri ca23f7b4e2 Add operator+=(Surface_mesh&, const Surface_mesh&) 2015-02-02 15:40:20 +01:00
Andreas Fabri 99d18c0d42 improve example 2015-01-19 12:42:08 +01:00
Sébastien Loriot 67414ef0c8 fix default point property map used in BGL primitives 2015-01-19 11:57:43 +01:00
Andreas Fabri e854569b0b active example as it had #if 0 2015-01-19 10:25:01 +01:00
Laurent Rineau 914f8eeec7 cosmetic change of the licenses.txt file 
The script Scripts/developer_scripts/detect_packages_licenses expects a
very strict syntax. There was an extra empty line.
 2015-01-12 16:21:05 +01:00
Andreas Fabri 8e64f50a0b chmod -x and fixes of license headers 2015-01-07 18:38:45 +01:00
Andreas Fabri 871cc9b222 implement the \todos in the manual added by Sebastien 2015-01-06 09:51:27 +01:00
Andreas Fabri f85b635ce5 add missing typename 2015-01-06 09:31:18 +01:00
Andreas Fabri d1c951ea6c comment unused argc 2015-01-06 09:31:17 +01:00
Sébastien Loriot 73a125f611 cosmetic fixes + add todos for implementation details 2015-01-05 12:58:14 +01:00
Andreas Fabri fea4eed94a less unsigned/signed warnings 2015-01-04 11:31:29 +01:00
Andreas Fabri 0140ab6479 do not compare with -1 directly 2015-01-01 19:36:33 +01:00
Andreas Fabri c9b9cab08c remove typename 2015-01-01 19:26:13 +01:00
Laurent Rineau f87d3f6041 Workaround for Boost-1.54 2014-12-31 14:16:17 +01:00
Andreas Fabri 5110ff7754 Use CGAL_USE 2014-12-31 12:55:43 +01:00
Andreas Fabri f631dc01d7 change unsigned int to boost::uint32_t 2014-12-31 12:51:55 +01:00
Andreas Fabri 471396d821 change Surface_mesh::size_type to unsigned int 2014-12-31 12:38:10 +01:00
Andreas Fabri 1e9f07711e %n in a scanf reads the number of characters read, and must be an int 2014-12-30 10:53:13 +01:00
Andreas Fabri be632d39f5 use the size type of the graph 2014-12-29 14:47:14 +01:00
Andreas Fabri 95af2ea357 don't use the boost testing framework 2014-12-23 16:08:25 +01:00
Andreas Fabri fb5ed5c0bb size_t -> int 2014-12-23 14:25:54 +01:00
Andreas Fabri 891b951e6b fix license headers 2014-12-22 18:10:26 +01:00
Andreas Fabri 14926ec8d5 complete package_info 2014-12-22 18:00:03 +01:00
Sébastien Loriot 7e0b5a3fe6 skip comments while reading off files 2014-12-18 08:42:49 +01:00
Andreas Fabri e3ba8201c7 unify variable names 2014-12-18 08:26:06 +01:00
Andreas Fabri e0007b0564 remove free functions for proprty handling s this is not mature yet 2014-12-18 08:26:03 +01:00
Sébastien Loriot 5c135e0d30 fix bool for add_property 2014-12-18 08:11:08 +01:00
Andreas Fabri 705cb65c1c Fix sm_bgl.cpp I am not yet lucky with the API, as member functions return a pair 2014-12-11 09:12:34 +01:00
Andreas Fabri 294c047ca8 The null_face() gets also enumerated when circulating around a vertex 2014-12-10 21:56:53 +01:00
Andreas Fabri 46fe0501b8 add .sm_do_intersect.cmd file and data 2014-12-10 20:32:47 +01:00
Sébastien Loriot ad1954afc4 fix warnings and compilation issues 2014-12-10 17:34:51 +01:00
Andreas Fabri 43e967a72e remove property map after use 2014-12-10 15:18:25 +01:00
Andreas Fabri 6569bf27bb changes after Sebastien's review 2014-12-08 15:47:16 +01:00
Andreas Fabri 061190b049 Integrate Michael's review 2014-12-08 08:38:30 +01:00
Andreas Fabri 4fd55756d7 take Guillaume's user manual review into account 2014-12-04 17:44:32 +01:00
Andreas Fabri 901c3829d0 add tests 2014-11-26 11:06:31 +01:00
Andreas Fabri d5f74fd542 fix surface_mesh_test.cpp 2014-11-25 18:28:50 +01:00
Andreas Fabri 06c4164df7 fix benchmarks and add surfacem mesh simplification 2014-11-13 15:00:17 +01:00
Andreas Fabri d99996db31 unify the examples of Surface_mesh and Polyhedron 2014-11-13 10:32:10 +01:00
Andreas Fabri 9ecdad5a76 Add a segmentation example for the Surface_mesh 2014-11-12 17:58:44 +01:00
Andreas Fabri 896add20d3 fix implementation of number_of.. 2014-11-12 17:03:54 +01:00
Andreas Fabri cc20bf42a8 bug fixes 2014-11-12 15:42:21 +01:00
Andreas Fabri 67076a47e8 blue clownfish (thank you Mael) 2014-11-11 17:37:03 +01:00
Andreas Fabri 089c477604 fixed typos 2014-11-07 18:23:28 +01:00
Andreas Fabri c7f439d1a5 some more BGL/Surface_mesh equivalences; change chapter title 2014-11-07 17:39:24 +01:00
Andreas Fabri 95aa725b00 cleanup 2014-11-06 15:53:57 +01:00
Andreas Fabri 9cb623630b include Michael's remarks. The complete table of equivalences is missing yet 2014-11-06 15:40:41 +01:00
Andreas Fabri 06d4111ed7 num_removed_xx -> number_of_removed_xx 2014-11-05 14:10:44 +01:00
Andreas Fabri e0c182f592 typo 2014-11-05 12:51:55 +01:00
Andreas Fabri 37257b38ec Document add_edge and add_face 2014-11-05 12:29:12 +01:00
Andreas Fabri 9f34625a53 conceptually hafedges and edges are different, so we have to list both in clear and collect_garbage 2014-11-05 12:02:25 +01:00
Andreas Fabri 475b8c3783 remove get_or_add_property_map() 2014-11-05 11:54:07 +01:00
Andreas Fabri c2b235adeb integrate many, not yet all remarks of Guillaume and Serbastien's reviews 2014-11-04 18:27:47 +01:00
Andreas Fabri 76dabc42f5 change title of the package 2014-10-08 09:32:08 +02:00
Andreas Fabri a2308a8e7d operator << and >> do not support normals or textures 2014-10-07 14:37:22 +02:00
Andreas Fabri f24ee33133 cleanup 2014-10-06 21:38:06 +02:00
Andreas Fabri 1d3f1d5545 Add implementation for operator << and >> (without normal) 2014-10-06 21:36:55 +02:00
Andreas Fabri 9097a6931e next ccw -> previous cw 2014-10-06 16:42:10 +02:00
Andreas Fabri 6089badfcc Add next/prev around source 2014-10-06 16:42:09 +02:00
Andreas Fabri 293c5c51ba code follows manual and compiles again 2014-10-06 16:42:08 +02:00
Sébastien Loriot e8286afa33 add less "more" description 2014-10-06 14:34:20 +02:00
Sébastien Loriot 681696952a typo 2014-10-06 14:23:02 +02:00
Sébastien Loriot 688d9792be remove todo 2014-10-06 14:22:25 +02:00
Sébastien Loriot c9d6430aea prevent linking 2014-10-06 14:16:14 +02:00
Andreas Fabri 93bfd777fa Add missing example 2014-10-06 14:15:37 +02:00
Andreas Fabri 34a9d85575 adress some remarks of the reviews 2014-10-06 12:44:24 +02:00
Andreas Fabri b70d6d60fc iterator_range -> Iterator_range 2014-10-03 17:13:26 +02:00
Andreas Fabri 1fc44743cf Cleanup of the properties API 2014-10-03 12:03:46 +02:00
Andreas Fabri c01176760c cleanup in the is_border API 2014-10-03 11:44:55 +02:00
Andreas Fabri 45092fa571 cleanup in the is_border API 2014-10-03 11:37:06 +02:00
Andreas Fabri 05038ebdd0 typos 2014-10-02 10:30:58 +02:00
Andreas Fabri 0f82ce4b5a change container to range in add_face 2014-10-01 15:55:31 +02:00
Andreas Fabri 3839ce87b2 Avoid boost/assign in examples 2014-10-01 15:52:23 +02:00
Andreas Fabri 8b4171ec75 split example for iterators and circultors in two 2014-10-01 15:20:55 +02:00
Andreas Fabri fe8fd2ba4a improve example 2014-10-01 12:56:20 +02:00
Andreas Fabri 1979820571 cleanup 2014-10-01 12:27:20 +02:00
Andreas Fabri 7c545c3ec4 Simplify the API for get/add property map 2014-09-30 18:58:01 +02:00
Andreas Fabri a32ecad18c Make Property_map<I,T> a nested class again. 2014-09-30 15:04:59 +02:00
Andreas Fabri 5cee5c6348 Remove the typedefs for the iterators as we offer ranges 
Remove the free functions for accessing properties
 2014-09-30 11:28:45 +02:00
Andreas Fabri 00eb71e4d1 descriptor -> index 
Add a section on garbage collection where we keep num_vertices()
 2014-09-29 15:11:42 +02:00
Andreas Fabri 08a033ffb4 Integrate remarks from the review by Michael and Guillaume. 
Switch from pair of iterators to a range class
 2014-09-26 16:53:37 +02:00
Andreas Fabri d8d9eb605b Add concept Index and change Vertex_descriptor to Vertex_index 2014-09-25 15:51:40 +02:00
Sébastien Loriot 8bf04d7909 fix compilation issues 2014-09-09 16:50:55 +02:00
Andreas Fabri 293ca48f5c no need for call of set_prev_only 2014-09-09 15:53:39 +02:00
Andreas Fabri 1a9ba0f03d incremental builder compiles but has a runtime bug 2014-09-08 17:42:10 +02:00
Andreas Fabri d2a672ef9a Add incremental builder 2014-09-08 15:12:05 +02:00
Sébastien Loriot a158d13647 initial version of Surface_mesh package 2014-07-15 12:08:51 +02:00