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

147 Commits

Author SHA1 Message Date
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