Skip to content
Snippets Groups Projects
Commit 0c307d45 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent 91140f26
Branches
Tags
No related merge requests found
......@@ -386,12 +386,10 @@ static void drawVoronoiDual(std::vector<T*> &elements)
SVector3 pcp1(pc.x() - e.getVertex(0)->x(),
pc.y() - e.getVertex(0)->y(),
pc.z() - e.getVertex(0)->z());
double alpha = dot(pcp1,p2p1) / dot(p2p1,p2p1);
SPoint3 p ((1.-alpha)*e.getVertex(0)->x() + alpha*e.getVertex(1)->x(),
(1.-alpha)*e.getVertex(0)->y() + alpha*e.getVertex(1)->y(),
(1.-alpha)*e.getVertex(0)->z() + alpha*e.getVertex(1)->z());
SPoint3 p((1 - alpha)*e.getVertex(0)->x() + alpha * e.getVertex(1)->x(),
(1 - alpha)*e.getVertex(0)->y() + alpha * e.getVertex(1)->y(),
(1 - alpha)*e.getVertex(0)->z() + alpha * e.getVertex(1)->z());
glVertex3d(pc.x(), pc.y(), pc.z());
glVertex3d(p.x(), p.y(), p.z());
}
......@@ -417,7 +415,6 @@ static void drawVoronoiDual(std::vector<T*> &elements)
gl2psDisable(GL2PS_LINE_STIPPLE);
}
// Routine to fill the smooth normal container
template<class T>
......
......@@ -25,7 +25,6 @@
extern Context_T CTX;
static MVertex* isEquivalentTo(std::multimap<MVertex*, MVertex*> &m, MVertex *v)
{
std::multimap<MVertex*, MVertex*>::iterator it = m.lower_bound(v);
......@@ -39,7 +38,9 @@ static MVertex* isEquivalentTo ( std::multimap<MVertex *, MVertex *> & m, MVerte
return res;
}
static void buildASetOfEquivalentMeshVertices ( GFace *gf , std::multimap<MVertex *, MVertex *> & equivalent , std::map<GVertex*,MVertex*> &bm)
static void buildASetOfEquivalentMeshVertices(GFace *gf,
std::multimap<MVertex*, MVertex *> &equivalent,
std::map<GVertex*, MVertex*> &bm)
{
// an edge is degenerated when is length is considered to be
// zero. In some cases, a model edge can be considered as too
......@@ -63,7 +64,6 @@ static void buildASetOfEquivalentMeshVertices ( GFace *gf , std::multimap<MVerte
bm[(*it)->getBeginVertex()] = va;
bm[(*it)->getEndVertex()] = vb;
printf("%d equivalent to %d\n", va->getNum(), vb->getNum());
}
}
++it;
......@@ -95,7 +95,6 @@ struct geomTresholdVertexEquivalence
~geomTresholdVertexEquivalence ();
};
geomTresholdVertexEquivalence::geomTresholdVertexEquivalence(GModel *g)
{
std::multimap<MVertex*, MVertex*> equivalenceMap;
......@@ -103,7 +102,8 @@ geomTresholdVertexEquivalence :: geomTresholdVertexEquivalence (GModel *g)
buildASetOfEquivalentMeshVertices(*it, equivalenceMap, backward_map);
// build the structure that identifiate geometrically equivalent
// mesh vertices.
for (std::map<GVertex*,MVertex *>::iterator it = backward_map.begin() ; it != backward_map.end() ; ++it){
for (std::map<GVertex*, MVertex*>::iterator it = backward_map.begin();
it != backward_map.end(); ++it){
GVertex *g = it->first;
MVertex *v = it->second;
MVertex *other = isEquivalentTo(equivalenceMap, v);
......@@ -118,7 +118,8 @@ geomTresholdVertexEquivalence :: geomTresholdVertexEquivalence (GModel *g)
geomTresholdVertexEquivalence::~geomTresholdVertexEquivalence()
{
// restore the initial data
for (std::map<GVertex*,MVertex *>::iterator it = backward_map.begin() ; it != backward_map.end() ; ++it){
for (std::map<GVertex*, MVertex*>::iterator it = backward_map.begin();
it != backward_map.end() ; ++it){
GVertex *g = it->first;
MVertex *v = it->second;
g->mesh_vertices.clear();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment