diff --git a/README.md b/README.md index 5297a6a8eedf54220d91204807f122878dd79b1d..32f84fc5aced1e55f89dbdb2c1334ed417ec26ce 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ English version bellow Dépendences Linux ================= installer les paquets suivants: -cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev +cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev libqglviewer-dev Pour compiler CGoGN @@ -84,7 +84,7 @@ ENGLISH VERSION Linux dependencies ================== install the following packages: -cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev +cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev libqglviewer-dev To compile CGoGN ================ diff --git a/include/Algo/Geometry/distances.h b/include/Algo/Geometry/distances.h index cef58d51a320e9bf041aca011f54173d22c6d8f6..8c950bdbd65a27674c2d67ef93cbe36cf8b7b79b 100644 --- a/include/Algo/Geometry/distances.h +++ b/include/Algo/Geometry/distances.h @@ -43,7 +43,7 @@ namespace Geometry * @return the squared distance to the plane */ template -typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) ; /** * compute squared distance from point to face (assuming face is convex) @@ -55,7 +55,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f * @return the squared distance */ template -typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) ; /** * compute squared distance from point to an edge @@ -66,7 +66,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con * @return the squared distance */ template -typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const typename PFP::VEC3& P) ; //template //void computeDistance(typename PFP::MAP& map1, const VertexAttribute& position1, VertexAttribute& distance1, diff --git a/include/Algo/Geometry/distances.hpp b/include/Algo/Geometry/distances.hpp index c7f4a700cec3af8f4185139bacff95835d19d528..08f9d20f9d85ab3936f2cce02dece79e6bcb4ff1 100644 --- a/include/Algo/Geometry/distances.hpp +++ b/include/Algo/Geometry/distances.hpp @@ -34,7 +34,7 @@ namespace Geometry { template -typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) { Vertex v(f.dart); const typename PFP::VEC3& A = position[v]; @@ -47,7 +47,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f } template -typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) { typedef typename PFP::REAL REAL; @@ -72,7 +72,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con } template -typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const typename PFP::VEC3& P) { const typename PFP::VEC3& A = position[e.dart]; typename PFP::VEC3 AB = position[map.phi1(e.dart)] - A; diff --git a/include/Algo/Geometry/voronoiDiagrams.hpp b/include/Algo/Geometry/voronoiDiagrams.hpp index 2608373433d396a383467502400faa30e70e846c..f6883670bd9c4afdfeeaad24e04bfd615f8db931 100644 --- a/include/Algo/Geometry/voronoiDiagrams.hpp +++ b/include/Algo/Geometry/voronoiDiagrams.hpp @@ -21,7 +21,7 @@ VoronoiDiagram::VoronoiDiagram (MAP& m, const EdgeAttribute& p, regions (r), vmReached(m) { - vertexInfo = map.template addAttribute("vertexInfo"); + vertexInfo = map.template addAttribute("vertexInfo"); } template @@ -442,7 +442,7 @@ void CentroidalVoronoiDiagram::cumulateEnergyAndGradientFromSeed(unsigned i // compute the gradient // TODO : check if the computation of grad and proj is still valid for other edgeCost than geodesic distances VEC3 grad (0.0); - const VertexAttribute& pos = this->map.template getAttribute("position"); + const VertexAttribute& pos = this->map.template getAttribute("position"); for (unsigned int j = 0; j < v.size(); ++j) { @@ -460,7 +460,7 @@ Dart CentroidalVoronoiDiagram::selectBestNeighborFromSeed(unsigned int numS { Dart e = this->seeds[numSeed]; Dart newSeed = e; - const VertexAttribute& pos = this->map.template getAttribute("position"); + const VertexAttribute& pos = this->map.template getAttribute("position"); // TODO : check if the computation of grad and proj is still valid for other edgeCost than geodesic distances float maxProj = 0.0; diff --git a/include/Algo/Selection/collector.h b/include/Algo/Selection/collector.h index 574fc514ab7ee91d8789625e4543a4e5511f38fb..92e4ac162f6fe89af9ebc64834856c49929b53e0 100644 --- a/include/Algo/Selection/collector.h +++ b/include/Algo/Selection/collector.h @@ -492,7 +492,7 @@ public: edge_cost(c), maxDist(d) { - vertexInfo = m.template addAttribute("vertexInfo"); + vertexInfo = m.template addAttribute("vertexInfo"); } ~Collector_Dijkstra_Vertices() { diff --git a/include/Algo/Selection/collector.hpp b/include/Algo/Selection/collector.hpp index c103ddae5c9fef3a9fd9381fdb9ff6b183b277ca..ef3c6a91d6c614450a146d33ae79c8cdae63b6e5 100644 --- a/include/Algo/Selection/collector.hpp +++ b/include/Algo/Selection/collector.hpp @@ -938,10 +938,9 @@ void Collector_Triangles::collectAll(Dart d) } } } - CellMarkerStore vm(this->map); // mark inside-vertices and border-vertices CellMarkerStore em(this->map); // mark inside-edges and border-edges - std::vector::iterator f_it; + std::vector::iterator f_it; for (f_it = this->insideFaces.begin(); f_it != this->insideFaces.end(); f_it++) { // collect insideVertices, insideEdges, and border Traversor2FE te (this->map, *f_it) ; @@ -1006,9 +1005,8 @@ void Collector_Triangles::collectBorder(Dart d) } } } - CellMarkerStore em(this->map); // mark inside-edges and border-edges - std::vector::iterator f_it; + std::vector::iterator f_it; for (f_it = this->insideFaces.begin(); f_it != this->insideFaces.end(); f_it++) { // collect border (edges) Traversor2FE te (this->map, *f_it) ; @@ -1085,7 +1083,7 @@ void Collector_Dijkstra_Vertices::collectAll(Dart dinit) CellMarkerStore em (this->map); CellMarkerStore fm (this->map); - for (std::vector::iterator e_it = this->insideVertices.begin(); e_it != this->insideVertices.end() ; e_it++) + for (std::vector::iterator e_it = this->insideVertices.begin(); e_it != this->insideVertices.end() ; e_it++) { // collect insideEdges Traversor2VE te (this->map, *e_it); @@ -1165,9 +1163,8 @@ void Collector_Dijkstra_Vertices::collectBorder(Dart dinit) vmReached.unmark(front.begin()->second); front.erase(front.begin()); } - CellMarkerStore fm (this->map); - for (std::vector::iterator e_it = this->insideVertices.begin(); e_it != this->insideVertices.end() ; e_it++) + for (std::vector::iterator e_it = this->insideVertices.begin(); e_it != this->insideVertices.end() ; e_it++) { // collect border Traversor2VF tf (this->map, *e_it);