Move read_polygon_mesh() in another header

This commit is contained in:
Maxime Gimeno 2020-05-07 14:32:05 +02:00
parent 30dcc81a61
commit ece2c67a89
3 changed files with 122 additions and 107 deletions

View File

@ -21,110 +21,4 @@
#include <CGAL/boost/graph/IO/VTK.h>
#include <CGAL/boost/graph/IO/WRL.h>
namespace CGAL{
//not for now.
/*
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(std::istream& is,
FaceGraph& g,
const NamedParameters& np)
{
bool ok = false;
ok = read_OFF(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();//reset the error state
is.seekg (0, is.beg);
ok = read_OBJ(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_PLY(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_STL(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_GOCAD(is, g, np, false);
return ok;
}
template <class FaceGraph>
bool read_polygon_mesh(std::istream& is,
FaceGraph& g)
{
return read_polygon_mesh(is, g, parameters::all_default());
}
*/
/*!
*
*/
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(const std::string& fname,
FaceGraph& g,
const NamedParameters& np)
{
if (fname.find(".TS") != std::string::npos) {
return read_GOCAD(fname, g, np);
}
if (fname.find(".obj") != std::string::npos) {
return read_OBJ(fname, g, np);
}
if (fname.find(".off") != std::string::npos) {
return read_OFF(fname, g, np);
}
if (fname.find(".ply") != std::string::npos) {
return read_PLY(fname, g, np);
}
if (fname.find(".stl") != std::string::npos) {
return read_STL(fname, g, np);
}
if (fname.find(".vtp") != std::string::npos) {
return read_VTP(fname, g, np);
}
return false;
}
template <class FaceGraph>
bool read_polygon_mesh(const std::string& fname,
FaceGraph& g)
{
return read_polygon_mesh(fname, g, parameters::all_default());
}
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(const char* fname,
FaceGraph& g,
const NamedParameters& np)
{
return read_polygon_mesh(std::string(fname), g, np);
}
template <class FaceGraph>
bool read_polygon_mesh(const char* fname,
FaceGraph& g)
{
return read_polygon_mesh(fname, g, parameters::all_default());
}
}//end CGAL
#endif // CGAL_BOOST_GRAPH_IO_H

View File

@ -0,0 +1,121 @@
// Copyright (c) 2020 GeometryFactory (France). All rights reserved.
//
// This file is part of CGAL (www.cgal.org)
//
// $URL$
// $Id$
// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
//
// Author(s) : Maxime Gimeno
#ifndef CGAL_BOOST_GRAPH_POLYGON_MESH_IO_H
#define CGAL_BOOST_GRAPH_POLYGON_MESH_IO_H
#include <CGAL/boost/graph/io.h>
namespace CGAL{
//not for now.
/*
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(std::istream& is,
FaceGraph& g,
const NamedParameters& np)
{
bool ok = false;
ok = read_OFF(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();//reset the error state
is.seekg (0, is.beg);
ok = read_OBJ(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_PLY(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_STL(is, g, np, false);
if(ok)
return true;
g.clear();
is.clear();
is.seekg (0, is.beg);
ok = read_GOCAD(is, g, np, false);
return ok;
}
template <class FaceGraph>
bool read_polygon_mesh(std::istream& is,
FaceGraph& g)
{
return read_polygon_mesh(is, g, parameters::all_default());
}
*/
/*!
*
*/
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(const std::string& fname,
FaceGraph& g,
const NamedParameters& np)
{
if (fname.find(".TS") != std::string::npos) {
return read_GOCAD(fname, g, np);
}
if (fname.find(".obj") != std::string::npos) {
return read_OBJ(fname, g, np);
}
if (fname.find(".off") != std::string::npos) {
return read_OFF(fname, g, np);
}
if (fname.find(".ply") != std::string::npos) {
return read_PLY(fname, g, np);
}
if (fname.find(".stl") != std::string::npos) {
return read_STL(fname, g, np);
}
if (fname.find(".vtp") != std::string::npos) {
return read_VTP(fname, g, np);
}
return false;
}
template <class FaceGraph>
bool read_polygon_mesh(const std::string& fname,
FaceGraph& g)
{
return read_polygon_mesh(fname, g, parameters::all_default());
}
template <class FaceGraph, typename NamedParameters>
bool read_polygon_mesh(const char* fname,
FaceGraph& g,
const NamedParameters& np)
{
return read_polygon_mesh(std::string(fname), g, np);
}
template <class FaceGraph>
bool read_polygon_mesh(const char* fname,
FaceGraph& g)
{
return read_polygon_mesh(fname, g, parameters::all_default());
}
}//end CGAL
#endif // CGAL_BOOST_GRAPH_POLYGON_MESH_IO_H

View File

@ -18,7 +18,7 @@
#endif
#include <CGAL/boost/graph/io.h>
#include <CGAL/boost/graph/polygon_mesh_io.h>
#include <CGAL/IO/VTK.h>
#include <CGAL/IO/polygon_soup_io.h>