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

STL reader / writer improvements

This commit is contained in:
Mael Rouxel-Labbé 2020-05-29 12:05:15 +02:00
parent 3a44ed2b3b
commit 08aa904396
1 changed files with 74 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Stream_support/include/CGAL/IO/STL.h
View File

@ -114,22 +114,6 @@ bool read_STL(std::istream& is,
} }
} }
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_STL(const char* fname,
PointRange& points,
TriangleRange& facets,
const CGAL_BGL_NP_CLASS& np)
{
std::ifstream in(fname);
return read_STL(in, points, facets, np);
}
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_STL(const std::string& fname, PointRange& points, TriangleRange& facets, const CGAL_BGL_NP_CLASS& np)
{
return read_STL(fname.c_str(), points, facets, np);
}
/*! /*!
* \ingroup StlIoFuncs * \ingroup StlIoFuncs
* *
@ -143,6 +127,20 @@ bool read_STL(std::istream& is, PointRange& points, TriangleRange& facets)
return read_STL(is, points, facets, parameters::all_default()); return read_STL(is, points, facets, parameters::all_default());
} }
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_STL(const char* fname, PointRange& points, TriangleRange& facets,
const CGAL_BGL_NP_CLASS& np)
{
std::ifstream in(fname);
return read_STL(in, points, facets, np);
}
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_STL(const std::string& fname, PointRange& points, TriangleRange& facets, const CGAL_BGL_NP_CLASS& np)
{
return read_STL(fname.c_str(), points, facets, np);
}
/*! /*!
* \ingroup StlIoFuncs * \ingroup StlIoFuncs
* *
@ -169,31 +167,40 @@ bool read_STL(const std::string& fname, PointRange& points, TriangleRange& facet
/*! /*!
* \ingroup StlIoFuncs * \ingroup StlIoFuncs
* *
* writes the content of `points` and `facets` in `out`, in the STL format. * writes the content of `points` and `facets` in `os`, in the STL format.
* *
* \see \ref IOStreamSTL * \see \ref IOStreamSTL
*/ */
template <class PointRange, class TriangleRange> template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_STL(std::ostream& out, bool write_STL(std::ostream& os,
const PointRange& points, const PointRange& points,
const TriangleRange& facets) const TriangleRange& facets,
const CGAL_BGL_NP_CLASS& np)
{ {
typedef typename boost::range_value<TriangleRange>::type Triangle; typedef typename boost::range_value<TriangleRange>::type Triangle;
typedef typename boost::range_value<PointRange>::type Point;
typedef typename CGAL::Kernel_traits<Point>::Kernel K;
typedef typename K::Vector_3 Vector_3;
if (get_mode(out) == IO::BINARY) using parameters::choose_parameter;
using parameters::get_parameter;
typedef typename CGAL::GetPointMap<PointRange, CGAL_BGL_NP_CLASS>::type PointMap;
PointMap point_map = choose_parameter<PointMap>(get_parameter(np, internal_np::point_map));
typedef typename boost::property_traits<PointMap>::value_type Point;
typedef typename boost::property_traits<PointMap>::reference Point_ref;
typedef typename CGAL::Kernel_traits<Point>::Kernel K;
typedef typename K::Vector_3 Vector_3;
if(get_mode(os) == IO::BINARY)
{ {
out << "FileType: Binary "; os << "FileType: Binary ";
const boost::uint32_t N32 = static_cast<boost::uint32_t>(facets.size()); const boost::uint32_t N32 = static_cast<boost::uint32_t>(facets.size());
out.write(reinterpret_cast<const char *>(&N32), sizeof(N32)); os.write(reinterpret_cast<const char *>(&N32), sizeof(N32));
for(const Triangle& face : facets) for(const Triangle& face : facets)
{ {
const Point& p = points[face[0]]; const Point_ref p = get(point_map, points[face[0]]);
const Point& q = points[face[1]]; const Point_ref q = get(point_map, points[face[1]]);
const Point& r = points[face[2]]; const Point_ref r = get(point_map, points[face[2]]);
const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r); const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r);
@ -202,31 +209,37 @@ bool write_STL(std::ostream& out,
static_cast<float>(q.x()), static_cast<float>(q.y()), static_cast<float>(q.z()), static_cast<float>(q.x()), static_cast<float>(q.y()), static_cast<float>(q.z()),
static_cast<float>(r.x()), static_cast<float>(r.y()), static_cast<float>(r.z()) }; static_cast<float>(r.x()), static_cast<float>(r.y()), static_cast<float>(r.z()) };
for (int i=0; i<12; ++i) for(int i=0; i<12; ++i)
out.write(reinterpret_cast<const char *>(&coords[i]), sizeof(coords[i])); os.write(reinterpret_cast<const char *>(&coords[i]), sizeof(coords[i]));
out << " "; os << " ";
} }
} }
else else
{ {
out << "solid\n"; os << "solid\n";
for(const Triangle& face : facets) for(const Triangle& face : facets)
{ {
const Point& p = points[face[0]]; const Point_ref p = get(point_map, points[face[0]]);
const Point& q = points[face[1]]; const Point_ref q = get(point_map, points[face[1]]);
const Point& r = points[face[2]]; const Point_ref r = get(point_map, points[face[2]]);
const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r); const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r);
out << "facet normal " << n << "\nouter loop\n"; os << "facet normal " << n << "\nouter loop\n";
out << "vertex " << p << "\n"; os << "vertex " << p << "\n";
out << "vertex " << q << "\n"; os << "vertex " << q << "\n";
out << "vertex " << r << "\n"; os << "vertex " << r << "\n";
out << "endloop\nendfacet\n"; os << "endloop\nendfacet\n";
} }
out << "endsolid\n"; os << "endsolid\n";
} }
return !out.fail(); return !os.fail();
}
template <typename PointRange, typename TriangleRange>
bool write_STL(std::ostream& os, const PointRange& points, const TriangleRange& facets)
{
return write_STL(os, points, facets, parameters::all_default());
} }
/*! /*!
@ -236,17 +249,31 @@ bool write_STL(std::ostream& out,
* *
* \see \ref IOStreamSTL * \see \ref IOStreamSTL
*/ */
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_STL(const char* fname, const PointRange& points, const TriangleRange& facets,
const CGAL_BGL_NP_CLASS& np)
{
std::ofstream os(fname);
return write_STL(os, points, facets, np);
}
template <typename PointRange, typename TriangleRange> template <typename PointRange, typename TriangleRange>
bool write_STL(const char* fname, const PointRange& points, const TriangleRange& facets) bool write_STL(const char* fname, const PointRange& points, const TriangleRange& facets)
{ {
std::ofstream out(fname); return write_STL(fname, points, facets, parameters::all_default());
return write_STL(out, points, facets); }
template <typename PointRange, typename TriangleRange, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_STL(const std::string& fname, const PointRange& points, const TriangleRange& facets,
const CGAL_BGL_NP_CLASS& np)
{
return write_STL(fname.c_str(), points, facets, np);
} }
template <typename PointRange, typename TriangleRange> template <typename PointRange, typename TriangleRange>
bool write_STL(const std::string& fname, const PointRange& points, const TriangleRange& facets) bool write_STL(const std::string& fname, const PointRange& points, const TriangleRange& facets)
{ {
return write_STL(fname.c_str(), points, facets); return write_STL(fname.c_str(), points, facets, parameters::all_default());
} }
} // namespace CGAL } // namespace CGAL