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

move Polygon_soup_to_polyhedron_3 to its own header

This commit is contained in:
Sébastien Loriot 2015-01-23 15:03:13 +01:00
parent 00a57be25a
commit 4fbf80df46
4 changed files with 79 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Operations_on_polyhedra/include/CGAL/Polygon_soup_to_polyhedron_3.h Normal file
View File

@ -0,0 +1,77 @@
// Copyright (c) 2009-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) : Laurent Rineau and Sebastien Loriot
#include <CGAL/IO/generic_print_polyhedron.h>
#include <CGAL/Polyhedron_incremental_builder_3.h>
#include <CGAL/Modifier_base.h>
#ifndef CGAL_POLYGON_SOUP_TO_POLYHEDRON_3_H
#define CGAL_POLYGON_SOUP_TO_POLYHEDRON_3_H
namespace CGAL{
/**
* Modifier to build a polyhedron from a soup of polygons.
*/
template <class HDS, class Point_3>
class Polygon_soup_to_polyhedron_3: public CGAL::Modifier_base<HDS>
{
typedef std::vector<std::size_t> Polygon_3;
const std::vector<Point_3>& points;
const std::vector<std::vector<std::size_t> >& polygons;
public:
/**
* The constructor for modifier object.
* @param points points of the soup of polygons.
* @param polygons each element in the vector describes a polygon using the index of the points in the vector.
*/
Polygon_soup_to_polyhedron_3(const std::vector<Point_3>& points,
const std::vector<std::vector<std::size_t> >& polygons)
: points(points), polygons(polygons)
{ }
void operator()(HDS& out_hds)
{
Polyhedron_incremental_builder_3<HDS> builder(out_hds);
builder.begin_surface(points.size(), polygons.size());
for(std::size_t i = 0, end = points.size(); i < end; ++i)
{ builder.add_vertex(points[i]); }
for(std::size_t i = 0, end = polygons.size(); i < end; ++i)
{
const Polygon_3& polygon = polygons[i];
const std::size_t size = polygon.size();
builder.begin_facet();
for(std::size_t j = 0; j < size; ++j) {
builder.add_vertex_to_facet(polygon[j]);
}
builder.end_facet();
}
builder.end_surface();
}
};
} //end of namespace CGAL
#endif //CGAL_POLYGON_SOUP_TO_POLYHEDRON_3_H

48
Operations_on_polyhedra/include/CGAL/orient_polygon_soup.h
View File

@ -21,9 +21,6 @@
#ifndef CGAL_ORIENT_POLYGON_SOUP
#define CGAL_ORIENT_POLYGON_SOUP
#include <CGAL/IO/generic_print_polyhedron.h>
#include <CGAL/Polyhedron_incremental_builder_3.h>
#include <CGAL/Modifier_base.h>
#include <set>
#include <stack>
@ -233,51 +230,6 @@ bool orient_polygon_soup(const std::vector<Point_3>& points,
return orienter.orient();
}
/**
* Modifier to build a polyhedron from a soup of polygons.
*/
template <class HDS, class Point_3>
class Polygon_soup_to_polyhedron_3: public CGAL::Modifier_base<HDS>
{
typedef std::vector<std::size_t> Polygon_3;
const std::vector<Point_3>& points;
const std::vector<std::vector<std::size_t> >& polygons;
public:
/**
* The constructor for modifier object.
* @param points points of the soup of polygons.
* @param polygons each element in the vector describes a polygon using the index of the points in the vector.
*/
Polygon_soup_to_polyhedron_3(const std::vector<Point_3>& points,
const std::vector<std::vector<std::size_t> >& polygons)
: points(points), polygons(polygons)
{ }
void operator()(HDS& out_hds)
{
Polyhedron_incremental_builder_3<HDS> builder(out_hds);
builder.begin_surface(points.size(), polygons.size());
for(std::size_t i = 0, end = points.size(); i < end; ++i)
{ builder.add_vertex(points[i]); }
for(std::size_t i = 0, end = polygons.size(); i < end; ++i)
{
const Polygon_3& polygon = polygons[i];
const std::size_t size = polygon.size();
builder.begin_facet();
for(std::size_t j = 0; j < size; ++j) {
builder.add_vertex_to_facet(polygon[j]);
}
builder.end_facet();
}
builder.end_surface();
}
};
}// namespace CGAL
#endif // CGAL_ORIENT_POLYGON_SOUP

1
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
View File

@ -19,6 +19,7 @@
#include <CGAL/version.h>
#include <CGAL/orient_polygon_soup.h>
#include <CGAL/Polygon_soup_to_polyhedron_3.h>
#include <CGAL/orient_polyhedron_3.h>
typedef Kernel::Point_3 Point_3;

2
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
View File

@ -8,7 +8,7 @@
#include "Scene_polyhedron_item_decorator.h"
#include "Polyhedron_type.h"
#include <CGAL/gl_render.h>
#include <CGAL/orient_polygon_soup.h>
#include <CGAL/Polygon_soup_to_polyhedron_3.h>
#include <fstream>
#include <boost/foreach.hpp>