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

65917 Commits

Author SHA1 Message Date
Laurent Rineau dbbca6cfe8 Fix: the manifold criterion was activated when the checkbox was *not* checked! 2016-01-06 17:30:53 +01:00
Laurent Rineau 8542eb2fe9 Fix compilation error (clang) 
> /Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h:632:25: error: declaration of 'Tr' shadows template parameter
>         template<class Tr, class Cr, class MD, class C3T3_, class Ct, class C_>
 2016-01-06 17:28:52 +01:00
Laurent Rineau 2a7fb19d3e Fix compilation error (missing header) 2016-01-06 16:50:08 +01:00
Laurent Rineau 772772d7b7 Fix the -Wsign-compare 
There was a warning in a CGAL_assertion.
 2016-01-06 15:50:27 +01:00
Laurent Rineau 6dd9321fb0 Fix: do not remove CGAL::FACET_VERTICES_ON_SAME_SURFACE_PATCH 2016-01-06 14:35:50 +01:00
Laurent Rineau 5ca23a105a Add the manifold criterion to the Mesh_3 plugin 2016-01-06 13:54:44 +01:00
Laurent Rineau 1f9de830ae Improvement: do not depend on Scene_c3t3_item.h 
A declaration of `Scene_c3t3_item` is sufficient. That avoids that the
compilation of `Meshing_thread.cpp` involves the heavy headers of
Mesh_3.
 2016-01-06 13:50:19 +01:00
Laurent Rineau 6eacaa7868 cosmetic fix: display the iterations on 1 line only 2016-01-05 17:41:56 +01:00
Laurent Rineau b023f6c33a Test the manifold criterion, in Sequential mode 2016-01-05 17:41:28 +01:00
Laurent Rineau 8324d8eceb bug-fix: invalidate the "manifold info" after refine(). 
The global optimizers destroy the manifold info. It must be invalidated.
 2016-01-05 17:40:40 +01:00
Laurent Rineau 432b52636a Override the debuginfo too 
That way, the manifold mesher level displays also the number of bad
edges/vertices.
 2016-01-05 17:40:01 +01:00
Laurent Rineau a8a895ae94 Merge pull request #574 from sgiraudot/CGAL-Fix_several_warnings-GF 2016-01-05 15:05:26 +01:00
Laurent Rineau 7b53a337af Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau' 
Conflicts:
	.gitignore
	Mesh_3/include/CGAL/IO/File_medit.h
 2016-01-05 14:58:18 +01:00
Laurent Rineau d34b240e5e WIP: seems to work 
I will test with the 3D gray level images...
 2016-01-05 14:55:42 +01:00
Laurent Rineau 397ac28143 WIP, new milestone: compiles with Refine_facets_manifold_base 2016-01-05 12:45:22 +01:00
Laurent Rineau b754453b44 WIP: Refine_facets_3_base compiles 2016-01-04 17:08:27 +01:00
Simon Giraudot a95c68e804 Merge branch 'CGAL-Fix_several_warnings-GF-old' into CGAL-Fix_several_warnings-GF 2015-12-28 14:13:00 +01:00
Sébastien Loriot 81d638341a prevent internal namespace to be documented 2015-12-28 10:51:49 +01:00
Simon Giraudot 6d4d362701 Warning fix: uninitialized variable 2015-12-28 10:43:50 +01:00
Sébastien Loriot 4b4723752a Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-12-28 10:09:01 +01:00
Sebastien Loriot 02644aa2d0 Merge pull request #573 from bo0ts/patch-1 
Actually add the CGAL_USE_OPENMESH define
 2015-12-28 10:08:30 +01:00
Sebastien Loriot a905f55a29 Merge pull request #497 from sloriot/AOS-leak_in_trapezoidal_decomposition 
fix a leak in the trapezoidal decomposition that occurs when a curve is removed
 2015-12-28 10:07:16 +01:00
Philipp Moeller e47052af55 Also add the CGAL_USE_OPENMESH define 
The BGL testsuite uses the define CGAL_USE_OPENMESH to check if OpenMesh is available, but that define is not set even if it there.
 2015-12-27 16:26:40 +01:00
Sebastien Loriot 3a3367aeb5 Merge pull request #571 from sloriot/PMP-fix_concept_requirements 
Add missing model of requirements
 2015-12-22 23:05:12 +01:00
Sébastien Loriot e18bbc442f Add missing model of requirements 2015-12-22 23:01:05 +01:00
Sebastien Loriot e44adafd60 Merge pull request #553 from lrineau/Polyhedron_demo-fix_Scene_c3t3_item_display_of_spheres-GF 
Polyhedron demo: fix the display of protecting balls in Scene_c3t3_item
 2015-12-21 10:52:07 +01:00
Sebastien Loriot 0e1c696192 Merge pull request #561 from sgiraudot/CGAL-Bugfix_clang_is_convertible-GF 
Bugfix: pair not compatible with Point_3 (clang)
 2015-12-18 16:54:22 +01:00
Sebastien Loriot 78dc72841e Merge pull request #562 from sgiraudot/CGAL-Remove_register_keyword-GF 
Remove deprecated "register" keyword
 2015-12-18 16:52:14 +01:00
Sébastien Loriot dd955cef30 Merge pull-request #483 from 'janetournois/Mesh_3-gray_level_image_oracle-lrineau' 
Mesh 3 : add gray level image oracle
 2015-12-18 16:46:46 +01:00
Sébastien Loriot b4315f4232 Merge pull request #560 from maxGimeno/Polyhedron_demo-scroll_sceneview-GF 
Scrolls the sceneView when a picking is performed.
 2015-12-18 16:38:26 +01:00
Sebastien Loriot 4187dd1240 Merge pull request #564 from maxGimeno/Polyhedron_demo-moving_names_in_list-GF 
Moving items in the list
 2015-12-18 16:37:01 +01:00
Sébastien Loriot 21444aa06d Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-12-18 16:33:29 +01:00
Sebastien Loriot 2eba140684 Merge pull request #565 from afabri/Triangulation-Issue557-GF 
Apply the fix proposed in Issue #557
 2015-12-18 16:32:36 +01:00
Laurent Rineau 94b3204038 work in progress 
one more step:
  - inverse the arguments,
  - specify the argument Base_.
 2015-12-18 15:44:21 +01:00
Sebastien Loriot 71fcc3dff8 Merge pull request #567 from maxGimeno/Scene_edit_polyhedron_Clean_up-GF 
Clean-up
 2015-12-18 15:31:34 +01:00
Maxime Gimeno 3097134e28 Some clean-up 2015-12-18 15:16:34 +01:00
Sebastien Loriot c1c30a46e5 Merge pull request #509 from sloriot/Install-fix_nsi 
Install fix nsi
 2015-12-18 15:16:29 +01:00
Sébastien Loriot b594f747a1 add dev prefix for installation dir 2015-12-18 15:11:57 +01:00
Simon Giraudot c728a96427 Warning fix: uninitialized variable 2015-12-18 15:01:33 +01:00
Laurent Rineau c7f0d9cd9d Merge pull request #566 from lrineau/Mesh_3-remove_Boost.Parameters_warnings-lrineau 
Remove Mesh_3 warnings in Boost.Parameters
 2015-12-18 14:56:15 +01:00
Laurent Rineau e0f8f4f85f Refresh the branch Mesh_3-manifold_criterion-lrineau 
For the moment, the manifold feature is no longer working.

Merge remote-tracking branch 'cgal-dev/Mesh_3-manifold_criterion-lrineau' into Mesh_3-manifold_criterion-lrineau

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
 2015-12-18 14:55:20 +01:00
Laurent Rineau d8c2f1a851 Remove Mesh_3 warnings in Boost.Parameters 2015-12-18 14:44:56 +01:00
Simon Giraudot fe1ac9e86c Warning fix: uninitialized attributes 2015-12-18 14:44:17 +01:00
Simon Giraudot 8ab80e7f71 Warning fix: unused argument 2015-12-18 08:53:57 +01:00
Sebastien Loriot 48207f2e7f Merge pull request #555 from palliez/patch-1 
Update aabb_tree.txt
 2015-12-17 18:35:42 +01:00
Laurent Rineau a18287e407 Merge pull request #563 from afabri/Triangulation-typos-GF 
fix a typo in the documentation
 2015-12-17 12:32:11 +01:00
Laurent Rineau ac42439405 Amend the .gitignore file, with binaries for tests of Mesh_3 2015-12-17 12:26:23 +01:00
Laurent Rineau 312962f429 Bug-fix: do not store a reference to a temp object 2015-12-17 12:20:16 +01:00
Andreas Fabri b9dafe6745 apply the fix proposed in Issue #557 2015-12-17 11:02:35 +01:00
Simon Giraudot da9422e77b Warning fix: variable may be used uninitialized 2015-12-17 10:54:36 +01:00