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 973 MiB
Commit Graph

1033 Commits

Author SHA1 Message Date
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 6eacaa7868 cosmetic fix: display the iterations on 1 line only 2016-01-05 17:41:56 +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 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
Laurent Rineau 94b3204038 work in progress 
one more step:
  - inverse the arguments,
  - specify the argument Base_.
 2015-12-18 15:44:21 +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
Laurent Rineau 312962f429 Bug-fix: do not store a reference to a temp object 2015-12-17 12:20:16 +01:00
Sebastien Loriot 60dbff189d Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF 
Polyhedron 3 improve mesh 3 plugin gf
 2015-12-10 21:01:00 +01:00
Andreas Fabri b623100175 split the dual() functions; make the power test check for the absence of weights 2015-12-08 11:27:14 +01:00
Andreas Fabri b3b21809c6 Avoid calling make_object as it is expensive: It calls new/delete 2015-12-07 15:42:02 +01:00
Andreas Fabri d26903170c Do not use std::endl in output_to_medit 2015-12-06 12:34:25 +01:00
Andreas Fabri 247ba0056c Include Mesh_3/global_parameters.h earlier 2015-12-02 10:59:26 +01:00
Andreas Fabri dd17f1ad5d Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages 2015-12-01 17:05:53 +01:00
Jane Tournois f7efee8977 fix the use of the default number of initial points 
it depends on the type of domain
 2015-11-24 12:23:45 +01:00
Jane Tournois 44f940164a add to mesh_3_options the ability to set the number of initial points from make_mesh_3 
this is an undocumented internal feature
mainly for testing purposes
 2015-11-23 16:48:15 +01:00
Andreas Fabri 7a904dd370 fix VC++ max() error 2015-11-18 08:18:49 +01:00
Sebastien Loriot bb85ae0179 Merge pull request #474 from afabri/BGL-suppress_warning-GF 
suppress warning in boost as this has to be solved upstream
 2015-11-17 13:21:05 +01:00
Jane Tournois 3f308a48af Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 2015-11-17 11:16:53 +01:00
Andreas Fabri 2ce8b07ec0 Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h> 
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>

Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
 2015-11-16 11:21:31 +01:00
Sebastien Loriot ab704be3b5 Merge pull request #473 from janetournois/Mesh_3-fix_protection_bug-GF 
Mesh 3 : fix limit case in polylines protection
 2015-11-13 12:36:33 +01:00
Jane Tournois a5162d86e1 bugfix : deal with the limit case 
where the point to be found is almost exactly the endpoint of the polyline,
just "behind" it in terms of geodesic_distance
 2015-11-10 16:35:31 +01:00
Jane Tournois f9d16f6720 this code should not be called for a triangulation of dimension < 3 2015-11-10 16:33:58 +01:00
Jane Tournois 31ebc6c472 use complete API of boost::optional 2015-10-30 16:06:31 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois b8ffee0f3a add typedef to be used in polyhedron demo 2015-10-29 14:09:22 +01:00
Laurent Rineau cc84605c2b Merge pull request #421 from janetournois/Mesh_3-check_weights_before_optimization-jtournois 
Mesh_3 - add a precondition to global optimizers
 2015-10-16 11:45:56 +02:00
Jane Tournois 258efef761 fix the case where trilinear_interpolation is not used 
here transform() returns true or false whether the voxel value (not interpolated)
is less (default functor) than the input isovalue

this error was shown by a conversion "float to int" warning
 2015-10-15 17:29:18 +02:00
Jane Tournois 58dc3c0fbb fix a bug in C3T3_helpers for Mesh_3 global optimizers 
handle the case, with global optimisers, in which
a point is moved to the same location as an existing vertex,
which is not old_vertex

it belongs to the case where there is a topological change
(because of the removal of old_vertex) but
find_conflicts(new_location) does not find any conflict
 2015-10-15 17:13:47 +02:00
Jane Tournois 5b03df377f fix compilation 2015-10-15 15:47:52 +02:00
Jane Tournois 4b2e0301e0 fix compilation 2015-10-15 15:47:02 +02:00
Jane Tournois 3c0169c6e2 Merge branch 'Mesh_3-check_weights_before_optimization-jtournois' into Mesh_3-gray_level_image_oracle-lrineau 2015-10-15 13:19:32 +02:00
Jane Tournois a77b066f6b add a precondition to global optimizers 
this precondition checks that global optimizers are not run on a
triangulation with weights.
Protecting balls are an exception and don't prevent global optimizers
from running
 2015-10-15 13:11:48 +02:00
Jane Tournois e3c396d219 add random generator as parameter for determinism 2015-10-15 10:58:34 +02:00
Jane Tournois 70b9a83f60 fix conversion warning 2015-10-13 12:38:37 +02:00
Andreas Fabri 0e26773f5d insert \n in the stream instead of \endl 2015-10-13 09:15:21 +02:00
Jane Tournois 5a28ef7067 fix error due to deprecation 
file has moved from include/CGAL/Mesh_3 to include/CGAL
 2015-10-12 10:05:47 +02:00
Jane Tournois 039ddb0e4f Merge branch 'Mesh_3-gray_level_image_oracle-lrineau-old' into Mesh_3-gray_level_image_oracle-lrineau 
Conflicts:
	.gitignore
 2015-10-12 08:49:52 +01:00
Clement Jamin 77e6772aa7 Use Real_timer in Mesh_3 since the algorithms might be parallel 
And update the doc accordingly
 2015-10-08 15:26:50 +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
Laurent Rineau 0bc029c5b8 Revert "suppress performance warning concerning an assertion" 
This reverts commit 580b65d8a5.

The warning was already fixed by commit
63ae26eb0f.
 2015-09-04 13:52:45 +02:00
Andreas Fabri 0d18ccf09d Merge branch 'CGAL-assert-GF' of github.com:CGAL/cgal-dev into CGAL-assert-GF 2015-09-04 12:30:26 +02:00
Andreas Fabri 580b65d8a5 suppress performance warning concerning an assertion 2015-09-04 12:30:07 +02:00