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

552 Commits

Author SHA1 Message Date
Laurent Rineau 70c08ae2bf Merge pull request #217 from bo0ts/Surface_mesh-drop_fusion-pmoeller 
Drop Boost.Fusion from Surface_mesh
 2015-07-31 14:27:30 +02:00
Philipp Möller bda64df544 Remove unnecessary includes 2015-07-30 14:16:59 +02:00
Philipp Möller 0b5e682985 Clean up some includes 2015-07-30 14:16:26 +02:00
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF 
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
 2015-07-28 15:30:17 +02:00
Sébastien Loriot a220686d02 satisfies_link_condition->does_satisfy_link_condition to match naming convention 2015-07-21 10:27:27 +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
Sébastien Loriot 5ac79c737f use two variable names to avoid warnings and possible issues 2015-07-17 09:40:22 +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
Sébastien Loriot c89fa4bd53 simplify bgl named parameters handling with boost < 1.51 and make PMP compatible 2015-07-16 16:01:21 +02:00
Sébastien Loriot ab8d6cfbcb add todo 2015-07-16 10:25:09 +02:00
Sébastien Loriot a25297a5c9 add missing filename in test 2015-07-16 08:48:59 +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
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Laurent Rineau 9ce70faffb Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt

There was also a "conceptual conflict" in:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
 2015-07-09 18:04:09 +02:00
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Sébastien Loriot e4277165c6 make an assertion tagged as expensive 2015-07-08 11:44:10 +02:00
Sébastien Loriot d164633493 remove REQUIRED keyword 2015-07-07 11:23:46 +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
Sébastien Loriot a306384cc8 add missing include 2015-07-03 11:13:18 +02:00
Andreas Fabri 2416a8917b Do not #define CGAL_USE_OPENMESH 2015-07-02 15:26:11 +02:00
Andreas Fabri 8d86bebcaf Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-07-01 17:25:13 +02:00
Andreas Fabri 28c631a177 fix BGL test suite 2015-07-01 14:25:20 +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 ed9f4b8233 rename dual.cpp 2015-07-01 10:24:44 +02:00
Jane Tournois abec5f1c88 rename dual example 2015-07-01 10:18:21 +02:00
Philipp Möller 224d63be58 On GCC 4.4 with C++0x enabled, ADL + next is unreliable 
This is a combination of two bugs: the call to next should pick up
CGAL::next to begin with and even if it didn't iterator_traits should
arguably be SFINAE friendly. See
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40497

We fix this by fully qualifying the call on the affected compiler. To
make this work we have to partially break the dependency between
CGAL/boost/graph/iterator.h and CGAL/boost/graph/graph_traits_Surface_mesh.h
 2015-06-29 13:13:10 +02:00
Philipp Möller 0cda240dd1 Clean up some includes 2015-06-29 13:13:09 +02:00
Jane Tournois bab9c51189 fix documentation 2015-06-25 11:49:35 +02:00
Sébastien Loriot f6a2479472 fix compilation issues with g++ 2015-06-22 11:23:31 +02:00
Laurent Rineau cce0d3ec64 Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk 
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path

This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
 2015-06-15 10:45:25 +02:00
Laurent Rineau 00eb751dc1 Nasty compilation-error 
SFINAE does not work in that case, and the substitution error is a hard
error.
 2015-06-11 16:17:15 +02:00
Laurent Rineau c61663b6ca Merge branch 'releases/CGAL-4.6-branch' 2015-06-05 16:45:53 +02:00
Andreas Fabri dadb129147 g++ needs a forward declaration for std::hash 2015-06-02 08:46:20 +02:00
Sébastien Loriot d123ce5a47 Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk 
Conflicts:
	Documentation/biblio/geom.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
	Documentation/scripts/generate_how_to_cite.py
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-06-01 17:47:31 +02:00
Andreas Fabri 56c16d581c use CGAL naming conventions 2015-06-01 12:35:52 +02:00
Andreas Fabri b6850d35c0 #include <functional> and suppress struct/class warning for VC10 2015-06-01 10:42:52 +02:00
Andreas Fabri c30a000ce3 bug fix. The iterator did not dereference to opposite faces 2015-05-29 09:16:32 +02:00
Sébastien Loriot 7404bd0ef7 fix classified refman 2015-05-27 16:58:12 +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
Andreas Fabri 307c86910b fix a -strict-ansi warning 2015-05-18 10:52:50 +02:00
Jane Tournois 68b5acb9b3 Merge branch 'Polygon_mesh_processing_OpenMesh-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing_OpenMesh-GF 2015-05-15 12:03:13 +02:00
Jane Tournois f5c9d9fce5 fix is_valid_polygon_mesh 2015-05-15 12:02:02 +02:00
Andreas Fabri 1cd6715d9b perform Euler operations tests also for OM 2015-05-15 11:23:03 +02:00
Andreas Fabri 57e2c27b73 use generic is_valid test 2015-05-15 11:22:33 +02:00
Andreas Fabri 09ea32096d Add generic is_valid_polygon_mesh() to BGL Helpers 2015-05-15 10:52:31 +02:00
Andreas Fabri 1249f74c83 halfedge(v,om) returns opposite of the stored halfedge 2015-05-15 10:51:46 +02:00