Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit 6edb455a authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

Merge branch 'develop' of /home/git/repositories/sauvage/cgogn into develop

parents 72f203d1 868ecce2
......@@ -57,7 +57,7 @@ public :
virtual void setSeeds_fromVector (const std::vector<Dart>&);
virtual void setSeeds_random (unsigned int nbseeds);
const std::vector<Dart>& getBorder () { return border; }
void setCost (const EdgeAttribute<REAL>& c);
void setCost (const EdgeAttribute<REAL,MAP>& c);
Dart computeDiagram ();
virtual void computeDiagram_incremental (unsigned int nbseeds);
......@@ -74,7 +74,6 @@ protected :
template <typename PFP>
class CentroidalVoronoiDiagram : public VoronoiDiagram<PFP>
typedef typename PFP::MAP MAP;
typedef typename PFP::MAP MAP;
typedef typename PFP::VEC3 VEC3;
typedef typename PFP::REAL REAL;
......@@ -102,7 +102,7 @@ void VoronoiDiagram<PFP>::initFrontWithSeeds ()
template <typename PFP>
void VoronoiDiagram<PFP>::setCost (const EdgeAttribute<typename PFP::REAL>& c)
void VoronoiDiagram<PFP>::setCost (const EdgeAttribute<typename PFP::REAL,typename PFP::MAP>& c)
edgeCost = c;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment