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

remove Utility.h because it's become useless

This commit is contained in:
Jane Tournois 2015-09-08 17:02:01 +02:00
parent fb0478b519
commit cbdbad4ddf
2 changed files with 9 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h
View File

@ -58,7 +58,7 @@
#include <CGAL/internal/Surface_mesh_skeletonization/Debug.h> #include <CGAL/internal/Surface_mesh_skeletonization/Debug.h>
// Some helper functions // Some helper functions
#include <CGAL/internal/Surface_mesh_skeletonization/Utility.h> #include <CGAL/Polygon_mesh_processing/measure.h>
// For detect_degenarcy // For detect_degenarcy
#include <CGAL/internal/Surface_mesh_skeletonization/Detect_degeneracy.h> #include <CGAL/internal/Surface_mesh_skeletonization/Detect_degeneracy.h>
@ -721,7 +721,8 @@ public:
MCFSKEL_DEBUG(print_edges();) MCFSKEL_DEBUG(print_edges();)
MCFSKEL_INFO(double area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap);) MCFSKEL_INFO(double area = CGAL::Polygon_mesh_processing::area(m_tmesh,
CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap));)
MCFSKEL_INFO(std::cout << "area " << area << "\n";) MCFSKEL_INFO(std::cout << "area " << area << "\n";)
} }
@ -744,7 +745,9 @@ public:
remesh(); remesh();
detect_degeneracies(); detect_degeneracies();
double area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap, m_traits); double area = CGAL::Polygon_mesh_processing::area(m_tmesh,
CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap)
.geom_traits(m_traits));
double area_ratio = fabs(last_area - area) / m_original_area; double area_ratio = fabs(last_area - area) / m_original_area;
MCFSKEL_INFO(std::cout << "area " << area << "\n";) MCFSKEL_INFO(std::cout << "area " << area << "\n";)
@ -852,7 +855,9 @@ private:
//, m_hedge_id_pmap(get(boost::halfedge_index, m_tmesh)) //, m_hedge_id_pmap(get(boost::halfedge_index, m_tmesh))
m_are_poles_computed = false; m_are_poles_computed = false;
m_original_area = internal::get_surface_area(m_tmesh, m_tmesh_point_pmap, m_traits); m_original_area = CGAL::Polygon_mesh_processing::area(m_tmesh,
CGAL::Polygon_mesh_processing::parameters::vertex_point_map(m_tmesh_point_pmap)
.geom_traits(m_traits));
m_vertex_id_count = static_cast<int>(num_vertices(m_tmesh)); m_vertex_id_count = static_cast<int>(num_vertices(m_tmesh));
m_max_id = m_vertex_id_count; m_max_id = m_vertex_id_count;

56
Surface_mesh_skeletonization/include/CGAL/internal/Surface_mesh_skeletonization/Utility.h
View File

@ -1,56 +0,0 @@
// Copyright (c) 2013 GeometryFactory (France). All rights reserved.
//
// This file is part of CGAL (www.cgal.org).
// You can redistribute it and/or modify it under the terms of the GNU
// General Public License as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// Licensees holding a valid commercial license may use this file in
// accordance with the commercial license agreement provided with the software.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL$
// $Id$
//
// Author(s) : Xiang Gao <gaox@ethz.ch>
//
#ifndef CGAL_MCFSKEL_UTILITY_H
#define CGAL_MCFSKEL_UTILITY_H
/// @cond CGAL_DOCUMENT_INTERNAL
/**
* @file Utility.h
* @brief This file contains some helper functions like splitting an edge at a
* given point.
*/
#include <CGAL/Polygon_mesh_processing/measure.h>
#include <boost/graph/graph_traits.hpp>
#include <boost/foreach.hpp>
#include <cmath>
namespace CGAL {
namespace internal {
template<class TriangleMesh, class TriangleMeshPointPMap, class Traits>
double get_surface_area(TriangleMesh& hg,
TriangleMeshPointPMap& hg_point_pmap,
const Traits& traits)
{
namespace PMP = CGAL::Polygon_mesh_processing;
return PMP::area(hg
, PMP::parameters::vertex_point_map(hg_point_pmap)
.geom_traits(traits));
}
} //namespace internal
} //namespace CGAL
/// @endcond
#endif //CGAL_MCFSKEL_UTILITY_H