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

80417 Commits

Author SHA1 Message Date
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Laurent Rineau 5ceb529d0f Merge branch 'releases/CGAL-4.12-branch' 2018-06-20 17:21:55 +02:00
Laurent Rineau b08fb6c4ed Merge pull request #3069 from sloriot/PMP-isotropic_remeshing_user_projection 
Fix constrained edge map update and add user projection functor as input
 2018-06-20 17:21:10 +02:00
Laurent Rineau fbb550905b Merge pull request #3179 from MaelRL/T3-Fix_doc-GF 
Triangulation_3: Minor doc fixes
 2018-06-20 17:21:06 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Laurent Rineau fad43cfed8 Merge pull request #3177 from sgiraudot/Classification-Bugfix_grid_has_points-GF 
Classification: Fix bug + clean up has_points() method in Planimetric_grid
 2018-06-20 17:20:58 +02:00
Laurent Rineau 786f85c93b Merge pull request #3168 from MaelRL/Kernel23-Fix_weighted_point_translate_doc-GF 
Kernel_23: Fix some doc issue with weighted points
 2018-06-20 17:20:53 +02:00
Laurent Rineau 0ef817416b Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch 2018-06-20 17:20:20 +02:00
Laurent Rineau 4d270c10d0 Merge pull request #3179 from MaelRL/T3-Fix_doc-GF 
Triangulation_3: Minor doc fixes
 2018-06-20 17:19:55 +02:00
Laurent Rineau 49af768373 Merge pull request #3177 from sgiraudot/Classification-Bugfix_grid_has_points-GF 
Classification: Fix bug + clean up has_points() method in Planimetric_grid
 2018-06-20 17:19:52 +02:00
Laurent Rineau 233ca4faa5 Merge pull request #3168 from MaelRL/Kernel23-Fix_weighted_point_translate_doc-GF 
Kernel_23: Fix some doc issue with weighted points
 2018-06-20 17:19:48 +02:00
Laurent Rineau 6aab09cc50 Merge pull request #3179 from MaelRL/T3-Fix_doc-GF 
Triangulation_3: Minor doc fixes
 2018-06-20 17:18:50 +02:00
Laurent Rineau 46961e7607 Merge pull request #3168 from MaelRL/Kernel23-Fix_weighted_point_translate_doc-GF 
Kernel_23: Fix some doc issue with weighted points
 2018-06-20 17:18:47 +02:00
Laurent Rineau f4ae634ebe
Merge pull request #3182 from MaelRL/Kernel_23-Fix_doc_typo-GF 
Kernel_23: Fix typo in doc
 2018-06-20 12:01:32 +02:00
Mael Rouxel-Labbé d3a57afc8b Fixed variable name 2018-06-20 11:34:16 +02:00
Sébastien Loriot 78e4b69359 update plugin using internal function with updated signature 2018-06-19 09:57:50 +02:00
Mael Rouxel-Labbé 174f6fa65f Fixed various minor doc bugs (missing const&, grammar, wrong point type) 2018-06-18 22:09:11 +02:00
Sébastien Loriot 700979b10f remove extra typename 2018-06-18 12:49:56 +02:00
Simon Giraudot 34e05470a4 Fix bug + clean up has_points() method in Planimetric_grid 2018-06-18 10:49:59 +02:00
Sébastien Loriot f7241be70a fix test on the shortness of protect edges 
since ecm was updated to only contain real constrained edges (and no additional
patch border edges), we use connected component patch map to identify them
 2018-06-18 10:08:52 +02:00
Laurent Rineau 765b0f4e65 Add the announcement of the small feature Basic Viewer 2018-06-15 11:38:40 +02:00
Laurent Rineau 5fbe760de9 Merge pull request #3149 from afabri/Mesh_3-boost_pp_warning-GF 
Mesh_3: Suppress warning concerning boost/preprocessor
 2018-06-14 17:40:28 +02:00
Laurent Rineau 8de20ec496 Merge branch 'releases/CGAL-4.12-branch' 2018-06-14 17:37:02 +02:00
Laurent Rineau 2b33f0690d Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF 
Polyhedron demo: add some OpenGL debugging information
 2018-06-14 17:36:54 +02:00
Laurent Rineau 2d7dcb0c39 Merge pull request #3166 from sloriot/Core-bigfloat_from_ui 
Add missing constructor for unsigned int
 2018-06-14 17:36:49 +02:00
Laurent Rineau 1378e30dfb Merge pull request #3165 from maxGimeno/Demo-Fix_dockwidgets_sizing-GF 
Polyhedron demo : Change the sizing preferency for DockWidgets
 2018-06-14 17:36:46 +02:00
Laurent Rineau a15825ddfe Merge pull request #3164 from sloriot/Core-windows_import_macro 
Undo unwanted change in  777d305
 2018-06-14 17:36:43 +02:00
Laurent Rineau 20ba8216b8 Merge pull request #3163 from sloriot/PMP-missing_transform_overload 
Add missing overload for PMP::transform
 2018-06-14 17:36:40 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand 
Add basic viewers
 2018-06-14 17:36:37 +02:00
Laurent Rineau 3a4121b207 Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF 
Polyhedron demo:Fix_orthographic selection

# Conflicts:
#	GraphicsView/include/CGAL/Qt/qglviewer_impl.h
 2018-06-14 17:36:26 +02:00
Laurent Rineau 39b003732e Merge pull request #2599 from afabri/Filtered_kernel-Construct_point-GF 
Make Construct_point{2,3} not create new nodes in the DAG
 2018-06-14 17:34:51 +02:00
Laurent Rineau a86ba8255d Merge pull request #3136 from afabri/GraphicsView-no_using_namespace_std-GF 
Remove 'using namespace std;' from the qglviewer files
 2018-06-14 17:34:48 +02:00
Laurent Rineau 2dc5939e22 Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch 2018-06-14 17:34:22 +02:00
Laurent Rineau 8042df9e51 Merge pull request #3166 from sloriot/Core-bigfloat_from_ui 
Add missing constructor for unsigned int
 2018-06-14 17:34:11 +02:00
Laurent Rineau 83f453f2d6 Merge pull request #3164 from sloriot/Core-windows_import_macro 
Undo unwanted change in  777d305
 2018-06-14 17:34:08 +02:00
Laurent Rineau e742206421 Merge pull request #3166 from sloriot/Core-bigfloat_from_ui 
Add missing constructor for unsigned int
 2018-06-14 17:32:32 +02:00
Mael Rouxel-Labbé 4c789c2e8a Fixed typo in comment 2018-06-13 17:30:46 +02:00
Mael Rouxel-Labbé d701f57a7c Fixed namespace 2018-06-13 17:10:36 +02:00
Mael Rouxel-Labbé 1cfb9e48ed Renamed include guard 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 49c6878098 Use CGAL::iterator 
(this is mostly a revert of e24a089ae8 to replace
boost:: by CGAL::)
 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 0c96d06fc3 Removed usage of CGAL::iterator from join iterators 
They define (almost) all the typedefs in the class anyway

Also use result_of() to deduce the result type instead of assuming
that a typedef 'result_type' will be present.
 2018-06-13 15:28:52 +02:00
Mael Rouxel-Labbé 27eb601598 Added a test for join iterators 2018-06-13 15:28:52 +02:00
Mael Rouxel-Labbé d70c344a89 Fixed tiny bugs in doc & code of join iterators 2018-06-13 15:28:52 +02:00
Maxime Gimeno fdf94c8ee5 Upgrade minimum cmake version in examples to silent cmake warnings 2018-06-13 10:55:41 +02:00
Guillaume Damiand bc4eca82b3 Need double cast 2018-06-13 10:47:44 +02:00
Mael Rouxel-Labbé d4011f3f1f Fixed result_of function signature 2018-06-13 10:37:24 +02:00
Mael Rouxel-Labbé 1090fec586 Removed weird sentence in (weighted_)points bbox()'s doc 2018-06-13 10:35:22 +02:00
Sébastien Loriot 7580d0124d fix corefine test 2018-06-13 09:54:00 +02:00