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

Non manifold edges fix 

- The test to detect the non manifold edges was wrong. It had an unnecessary condition.
- The function that fills the list of non manifold edges was not called anymore. It is
  now called in compute_normals_and_vertices().
- I added the necessary code to display the non manifold edges.
This commit is contained in:
Maxime Gimeno 2015-09-04 14:43:25 +02:00
parent 0e2d38cf9b
commit e07b95e7ee
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,12 +117,27 @@ Scene_polygon_soup_item::initialize_buffers(Viewer_interface* viewer) const
program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,4);
buffers[3].release();
program->release();
vaos[1]->release();
}
//vao containing the data for the non manifold edges
{
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT, viewer);
program->bind();
vaos[2]->bind();
buffers[4].bind();
buffers[4].allocate(positions_nm_lines.data(),
static_cast<int>(positions_nm_lines.size()*sizeof(float)));
program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,4);
buffers[4].release();
vaos[2]->release();
nb_nm_edges = positions_nm_lines.size();
positions_nm_lines.resize(0);
std::vector<float> (positions_nm_lines).swap(positions_nm_lines);
}
are_buffers_filled = true;
}
@ -258,7 +273,6 @@ Scene_polygon_soup_item::triangulate_polygon(Polygons_iterator pit)
void
Scene_polygon_soup_item::compute_normals_and_vertices(){
//get the vertices and normals
typedef Polygon_soup::Polygons::size_type size_type;
positions_poly.resize(0);
positions_lines.resize(0);
@ -319,16 +333,36 @@ Scene_polygon_soup_item::compute_normals_and_vertices(){
positions_lines.push_back(pb.z());
positions_lines.push_back(1.0);
}
//Non manifold edges
positions_nm_lines.resize(0);
soup->fill_edges();
BOOST_FOREACH(const Polygon_soup::Edge& edge,
soup->non_manifold_edges)
{
const Point_3& a = soup->points[edge[0]];
const Point_3& b = soup->points[edge[1]];
positions_nm_lines.push_back(a.x());
positions_nm_lines.push_back(a.y());
positions_nm_lines.push_back(a.z());
positions_nm_lines.push_back(1.0);
positions_nm_lines.push_back(b.x());
positions_nm_lines.push_back(b.y());
positions_nm_lines.push_back(b.z());
positions_nm_lines.push_back(1.0);
}
}
}
Scene_polygon_soup_item::Scene_polygon_soup_item()
: Scene_item(4,2),
: Scene_item(5,3),
soup(0),
oriented(false)
{
nb_nm_edges = 0;
}
Scene_polygon_soup_item::~Scene_polygon_soup_item()
@ -544,7 +578,6 @@ Scene_polygon_soup_item::draw(Viewer_interface* viewer) const {
// Clean-up
program->release();
vaos[0]->release();
}
void
@ -574,7 +607,6 @@ Scene_polygon_soup_item::draw_edges(Viewer_interface* viewer) const {
initialize_buffers(viewer);
}
if(soup == 0) return;
vaos[1]->bind();
attrib_buffers(viewer,PROGRAM_WITHOUT_LIGHT);
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT);
@ -587,6 +619,22 @@ Scene_polygon_soup_item::draw_edges(Viewer_interface* viewer) const {
// Clean-up
program->release();
vaos[1]->release();
if(displayNonManifoldEdges())
{
vaos[2]->bind();
attrib_buffers(viewer,PROGRAM_WITHOUT_LIGHT);
program = getShaderProgram(PROGRAM_WITHOUT_LIGHT);
program->bind();
QColor c = QColor(255,0,0,255);
program->setAttributeValue("colors", c);
//draw the edges
viewer->glDrawArrays(GL_LINES, 0,static_cast<GLsizei>( nb_nm_edges/4));
// Clean-up
program->release();
vaos[2]->release();
}
}
bool

10
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
View File

@ -15,7 +15,10 @@ struct Polygon_soup
{
typedef Kernel::Point_3 Point_3;
typedef std::vector<Point_3> Points;
//vector containing 3 indices of points in Points
typedef std::vector<std::size_t> Polygon_3;
//vector containing a pair of indices of points in Points and a set of indices of Polygons
//containing the edge.
typedef std::map<std::pair<std::size_t, std::size_t>, std::set<std::size_t> > Edges_map;
typedef boost::array<std::size_t, 2> Edge;
typedef std::vector<Polygon_3> Polygons;
@ -71,9 +74,8 @@ struct Polygon_soup
const std::size_t& i0 = polygons[i][j];
const std::size_t& i1 = polygons[i][ j+1 < size ? j+1: 0];
if( (i0 < i1) &&
(edges[std::make_pair(i0, i1)].size() +
edges[std::make_pair(i1, i0)].size() > 2) )
if(edges[std::make_pair(i0, i1)].size() +
edges[std::make_pair(i1, i0)].size() > 2)
{
Edge edge;
edge[0] = i0;
@ -168,6 +170,8 @@ private:
bool oriented;
std::vector<float> positions_poly;
std::vector<float> positions_lines;
mutable std::vector<float> positions_nm_lines;
mutable int nb_nm_edges;
std::vector<float> normals;
using Scene_item::initialize_buffers;