Commit e42d0200 authored by Sylvain Thery's avatar Sylvain Thery
Browse files

resolve compilation pb after merge

parent 513390af
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "Utils/Shaders/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/pointSprite.h" #include "Utils/pointSprite.h"
#include "Utils/text3d.h" #include "Utils/text3d.h"
#include "Utils/qtInputs.h" #include "Utils/Qt/qtInputs.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Geometry/normal.h" #include "Algo/Geometry/normal.h"
......
...@@ -327,7 +327,7 @@ int main(int argc, char **argv) ...@@ -327,7 +327,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
else else
position = myMap.getAttribute<PFP::VEC3>(VERTEX , attrNames[0]) ; position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ;
} }
......
...@@ -34,23 +34,23 @@ Dart EmbeddedMap3::splitVertex(std::vector<Dart>& vd) ...@@ -34,23 +34,23 @@ Dart EmbeddedMap3::splitVertex(std::vector<Dart>& vd)
Dart dres = Map3::splitVertex(vd); Dart dres = Map3::splitVertex(vd);
if(isOrbitEmbedded(VERTEX)) if(isOrbitEmbedded<VERTEX>())
{ {
embedNewCell(VERTEX, d2); embedNewCell<VERTEX>(d2);
copyCell(VERTEX, d2, d); copyCell<VERTEX>(d2, d);
embedOrbit(VERTEX, d, getEmbedding(VERTEX, d)); embedOrbit<VERTEX>( d, getEmbedding<VERTEX>(d));
} }
if(isOrbitEmbedded(EDGE)) if(isOrbitEmbedded<EDGE>())
{ {
} }
if(isOrbitEmbedded(VOLUME)) if(isOrbitEmbedded<VOLUME>())
{ {
for(std::vector<Dart>::iterator it = vd.begin() ; it != vd.end() ; ++it) for(std::vector<Dart>::iterator it = vd.begin() ; it != vd.end() ; ++it)
{ {
embedOrbit(VOLUME, *it, getEmbedding(VOLUME, *it)) ; embedOrbit<VOLUME>( *it, getEmbedding<VOLUME>(*it)) ;
} }
} }
......
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