songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert this commit. It was a mistake 

+ there is no frozen vertex in Moves_vector : remove useless code

New Revision: 70994
Author: jtournoi
Date: 2012-08-03 12:13:39 +0200 (Fri, 03 Aug 2012)

Log message:

move the update of moving_vertices (by erasing frozen vertices) to update_mesh, instead of compute_moves
This commit is contained in:
Jane Tournois 2012-08-06 10:02:53 +00:00
parent be9af780a1
commit 8449cc4e6a
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
View File

@ -464,10 +464,10 @@ compute_moves(/*const*/ Moving_vertices_set& moving_vertices)
#endif //CGAL_IMPROVE_FREEZE
++vit;
//#if defined(CGAL_IMPROVE_FREEZE) && defined(CGAL_FREEZE_VERTICES)
// if(oldv->frozen())
// moving_vertices.erase(oldv);
//#endif //CGAL_IMPROVE_FREEZE
#if defined(CGAL_IMPROVE_FREEZE) && defined(CGAL_FREEZE_VERTICES)
if(oldv->frozen())
moving_vertices.erase(oldv);
#endif //CGAL_IMPROVE_FREEZE
// Stop if time_limit_ is reached
if ( is_time_limit_reached() )
@ -587,16 +587,6 @@ update_mesh(const Moves_vector& moves,
++it )
{
const Vertex_handle& v = it->first;
#ifdef CGAL_FREEZE_VERTICES
if(do_freeze_ && v->frozen())
{
#ifdef CGAL_IMPROVE_FREEZE
moving_vertices.erase(v);
#endif //CGAL_IMPROVE_FREEZE
continue;
}
#endif
const Point_3& new_position = it->second;
// Get size at new position
if ( Sizing_field::is_vertex_update_needed )