Commit 4670bae0 authored by Pierre Kraemer's avatar Pierre Kraemer

no more virtual foreach_dart / no more MAP_IMPL parameter in AttributeHandler

parent a3be313e
......@@ -798,7 +798,7 @@ void Clipping::importMesh(std::string& filename)
return;
}
else
position = myMap.getAttribute<VEC3, VERTEX>("position") ;
position = myMap.getAttribute<VEC3, VERTEX ,MAP>("position") ;
}
else
{
......@@ -808,10 +808,9 @@ void Clipping::importMesh(std::string& filename)
return ;
}
else
position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ;
position = myMap.getAttribute<VEC3, VERTEX, MAP>(attrNames[0]) ;
}
updateVBOprimitives(Algo::Render::GL2::TRIANGLES | Algo::Render::GL2::LINES | Algo::Render::GL2::POINTS) ;
m_render_topo->updateData(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
......@@ -1114,7 +1113,7 @@ int main(int argc, char** argv)
}
else
{
sqt.position = sqt.myMap.addAttribute<PFP::VEC3, VERTEX>("position");
sqt.position = sqt.myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(sqt.myMap, 10,10,10);
cubic.embedIntoGrid(sqt.position, 1.0f, 1.0f, 1.0f);
......
......@@ -71,7 +71,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP;
typedef PFP::MAP::IMPL MAP_IMPL;
typedef PFP::VEC3 VEC3;
class Clipping: public Utils::QT::SimpleQT
......@@ -81,7 +80,7 @@ class Clipping: public Utils::QT::SimpleQT
public:
//Manip Carte
MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position;
VertexAttribute<VEC3, MAP> position;
Dart dglobal;
//Render
......
......@@ -128,13 +128,12 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
// declaration of the map
MAP myMap;
// and attribute of position
VertexAttribute<VEC3, MAP_IMPL> position;
VertexAttribute<VEC3, MAP> position;
unsigned int nb_ears;
......@@ -245,7 +244,7 @@ void MyQT::cb_keyPress(int code)
int main(int argc, char **argv)
{
position = myMap.addAttribute<VEC3, VERTEX>("position");
position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Dart d0 = myMap.newFace(12);
position[d0] = PFP::VEC3(0, 20, 0);
......
......@@ -53,7 +53,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
MAP myMap;
......@@ -104,7 +103,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
MyQT sqt;
VertexAttribute<VEC3, MAP_IMPL> position = myMap.addAttribute<VEC3, VERTEX>("position") ;
VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position") ;
// define the face extruded (here a cross)
std::vector<PFP::VEC3> objV;
......@@ -134,7 +133,7 @@ int main(int argc, char **argv)
}
// extrusion
Algo::Surface::Modelisation::extrusion_scale<PFP>(myMap, position, objV, PFP::VEC3(0.0,0.0,0.0), PFP::VEC3(0.0,1.0,0.0),true, pathV, false, pathRadius);
Algo::Surface::Modelisation::extrusion_scale<PFP>(myMap, position, objV, PFP::VEC3(0.0,0.0,0.0), PFP::VEC3(0.0,1.0,0.0), true, pathV, false, pathRadius);
// bounding box
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);
......
......@@ -138,9 +138,9 @@ void MCMesh::MC()
SAlgo::MC::WindowingGreater<DATATYPE> myWindFunc;
myWindFunc.setIsoValue(DATATYPE(127));
position = myMap.getAttribute<VEC3, VERTEX>("position");
position = myMap.getAttribute<VEC3, VERTEX, MAP>("position");
if (!position.isValid())
position = myMap.addAttribute<VEC3, VERTEX>("position");
position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
// instanciation du mc
SAlgo::MC::MarchingCube<DATATYPE, SAlgo::MC::WindowingGreater,PFP> mc(myImgFr, &myMap, position, myWindFunc, false);
......
......@@ -54,7 +54,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
typedef unsigned char DATATYPE;
......@@ -75,7 +74,7 @@ public:
bool m_drawEdges ;
bool m_drawFaces ;
VertexAttribute<VEC3, MAP_IMPL> position ;
VertexAttribute<VEC3, MAP> position ;
Algo::Render::GL2::MapRender* m_render ;
......
......@@ -30,7 +30,7 @@
SimpleGMap2::SimpleGMap2()
{
position = myMap.addAttribute<VEC3, VERTEX>("position");
position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Dart d = Algo::Surface::Modelisation::createTetrahedron<PFP>(myMap);
position[d] = VEC3(0,0,0);
......@@ -62,7 +62,7 @@ void SimpleGMap2::cb_initGL()
{
Utils::GLSLShader::setCurrentOGLVersion(1) ;
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
Geom::BoundingBox<VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
VEC3 gPosObj = bb.center() ;
float tailleX = bb.size(0) ;
float tailleY = bb.size(1) ;
......
......@@ -42,7 +42,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
class SimpleGMap2 : public Utils::QT::SimpleQT
......@@ -52,7 +51,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public:
MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position ;
VertexAttribute<VEC3, MAP> position ;
SimpleGMap2() ;
......@@ -61,4 +60,3 @@ public:
void cb_initGL() ;
void cb_redraw() ;
};
......@@ -30,8 +30,8 @@
SimpleGMap3::SimpleGMap3()
{
position = myMap.addAttribute<VEC3, VERTEX>("position");
volume = myMap.addAttribute<VEC3, VOLUME>("volume");
position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
volume = myMap.addAttribute<VEC3, VOLUME, MAP>("volume");
// CellMarker<EDGE> mE(myMap);
......
......@@ -43,7 +43,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
class SimpleGMap3 : public Utils::QT::SimpleQT
......@@ -53,8 +52,8 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public:
MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position ;
VolumeAttribute<VEC3, MAP_IMPL> volume ;
VertexAttribute<VEC3, MAP> position ;
VolumeAttribute<VEC3, MAP> volume ;
Algo::Render::GL2::Topo3Render<PFP>* m_render_topo;
......
......@@ -30,63 +30,62 @@
SimpleMap3::SimpleMap3()
{
position = myMap.addAttribute<VEC3, VERTEX>("position");
position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 1, 1, 1);
cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
myMap.check();
Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 1, 1, 1);
cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
myMap.check();
// Dart dp = Algo::Surface::Modelisation::createQuadrangularPyramid<PFP>(myMap);
// Dart dp = Algo::Surface::Modelisation::createQuadrangularPyramid<PFP>(myMap);
// position[dp] = typename PFP::VEC3(0.5,0.5,-0.5);
// position[myMap.phi1(dp)] = typename PFP::VEC3(0.5,0.5,0.5);
// position[myMap.phi1(myMap.phi1(dp))] = typename PFP::VEC3(0.5,-0.5,0.5);
// position[myMap.phi_1(dp)] = typename PFP::VEC3(0.5,-0.5,-0.5);
// position[myMap.phi_1(myMap.phi2(dp))] = typename PFP::VEC3(1.5f, 0.0f, 0.0f);
// position[dp] = typename PFP::VEC3(0.5,0.5,-0.5);
// position[myMap.phi1(dp)] = typename PFP::VEC3(0.5,0.5,0.5);
// position[myMap.phi1(myMap.phi1(dp))] = typename PFP::VEC3(0.5,-0.5,0.5);
// position[myMap.phi_1(dp)] = typename PFP::VEC3(0.5,-0.5,-0.5);
// position[myMap.phi_1(myMap.phi2(dp))] = typename PFP::VEC3(1.5f, 0.0f, 0.0f);
// Dart dtemp = myMap.phi_1(myMap.phi2(myMap.phi_1(myMap.phi_1(myMap.phi2(d)))));
// Dart dtemp = myMap.phi_1(myMap.phi2(myMap.phi_1(myMap.phi_1(myMap.phi2(d)))));
// myMap.sewVolumes(dtemp,dp);
// myMap.sewVolumes(dtemp,dp);
// Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 2, 1, 1);
// cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
// myMap.check();
// Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, 2, 1, 1);
// cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f);
// myMap.check();
// unsigned int nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// unsigned int nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices (equals 12) : " << nb << std::endl;
// assert(nb==12);
// std::cout << "Nb vertices (equals 12) : " << nb << std::endl;
// assert(nb==12);
// d = myMap.phi2(myMap.phi1(myMap.phi1(myMap.phi2(d))));
// d = myMap.phi2(myMap.phi1(myMap.phi1(myMap.phi2(d))));
// Dart dd = myMap.phi3(d);
// Dart dd = myMap.phi3(d);
// myMap.unsewVolumes(d);
// myMap.unsewVolumes(d);
// myMap.check();
// myMap.check();
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl;
// assert(nb==16);
// std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl;
// assert(nb==16);
// myMap.sewVolumes(d,dd);
// myMap.sewVolumes(d,dd);
// myMap.check();
// myMap.check();
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// nb=0;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// nb++;
// std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// assert(nb==12);
// std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// assert(nb==12);
}
......@@ -117,46 +116,46 @@ void SimpleMap3::cb_initGL()
m_render_topo_boundary->updateDataBoundary(myMap, position, 0.9f,0.9f,bb.maxSize()/50.0f);
m_render_topo_primal = new Algo::Render::GL2::Topo3PrimalRender<PFP>();
m_render_topo_primal->setDartWidth(2.0f);
m_render_topo_primal->setInitialDartsColor(1.0f,1.0f,1.0f);
m_render_topo_primal->setDartWidth(2.0f);
m_render_topo_primal->setInitialDartsColor(1.0f,1.0f,1.0f);
m_render_topo_primal->updateData(myMap, position, 0.95f,0.85f);
}
void SimpleMap3::cb_keyPress(int code)
{
switch(code)
{
case 'e':
{
time_t rawtime;
struct tm * timeinfo;
char buffer[80];
time (&rawtime);
timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break;
}
case 'E':
{
time_t rawtime;
struct tm * timeinfo;
char buffer[80];
time (&rawtime);
timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo_primal->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break;
}
}
switch(code)
{
case 'e':
{
time_t rawtime;
struct tm * timeinfo;
char buffer[80];
time (&rawtime);
timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break;
}
case 'E':
{
time_t rawtime;
struct tm * timeinfo;
char buffer[80];
time (&rawtime);
timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo_primal->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break;
}
}
}
......@@ -164,9 +163,9 @@ void SimpleMap3::cb_redraw()
{
glDisable(GL_LIGHTING);
glLineWidth(1.0f);
m_render_topo->drawTopo();
//m_render_topo_boundary->drawTopo();
//m_render_topo_primal->drawTopo();
m_render_topo->drawTopo();
//m_render_topo_boundary->drawTopo();
//m_render_topo_primal->drawTopo();
}
/**********************************************************************************************
......@@ -179,7 +178,7 @@ int main(int argc, char **argv)
SimpleMap3 sqt ;
sqt.setGeometry(0, 0, 1000, 800) ;
sqt.show() ;
sqt.show() ;
sqt.initGUI() ;
......
......@@ -45,7 +45,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
class SimpleMap3 : public Utils::QT::SimpleQT
......@@ -56,7 +55,7 @@ public:
MAP myMap ;
SelectorTrue allDarts ;
VertexAttribute<VEC3, MAP_IMPL> position ;
VertexAttribute<VEC3, MAP> position ;
Algo::Render::GL2::Topo3RenderMap<PFP>* m_render_topo;
Algo::Render::GL2::TopoRenderMap<PFP>* m_render_topo_boundary;
......
......@@ -89,9 +89,9 @@ void TexView::cb_initGL()
if (!m_obj.hasNormals())
{
VertexAttribute<Geom::Vec3f, MAP_IMPL> normal = myMap.getAttribute<VEC3, VERTEX>("normal") ;
VertexAttribute<Geom::Vec3f, MAP> normal = myMap.getAttribute<VEC3, VERTEX, MAP>("normal") ;
if(!normal.isValid())
normal = myMap.addAttribute<VEC3, VERTEX>("normal") ;
normal = myMap.addAttribute<VEC3, VERTEX, MAP>("normal") ;
Algo::Surface::Geometry::computeNormalVertices<PFP>(myMap, m_obj.m_positions, normal) ;
m_obj.setNormalAttribute(normal);
......@@ -206,8 +206,8 @@ void TexView::computeTore()
{
#define NB 96
VertexAttribute<VEC3, MAP_IMPL> position = myMap.addAttribute<VEC3, VERTEX>("position");
VertexAttribute<Geom::Vec2f, MAP_IMPL> texcoord = myMap.addAttribute<Geom::Vec2f, VERTEX>("texcoord");
VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
VertexAttribute<Geom::Vec2f, MAP> texcoord = myMap.addAttribute<Geom::Vec2f, VERTEX, MAP>("texcoord");
//Algo::Surface::Modelisation::Polyhedron<PFP> prim(myMap, position);
Algo::Surface::Tilings::Square::Tore<PFP> prim(myMap, NB, NB);
prim.embedIntoTore(position, 40.0f,20.0f);
......
......@@ -50,7 +50,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
/**
......
This diff is collapsed.
......@@ -64,7 +64,6 @@ struct PFP: public PFP_STANDARD
};
typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ;
//class Viewer : public Utils::QT::SimpleQT
......@@ -101,8 +100,8 @@ public:
bool m_drawTopo ;
bool m_drawBoundaryTopo;
VertexAttribute<VEC3, MAP_IMPL> position ;
VertexAttribute<VEC3, MAP_IMPL> normal ;
VertexAttribute<VEC3, MAP> position ;
VertexAttribute<VEC3, MAP> normal ;
Algo::Render::GL2::MapRender* m_render ;
Algo::Render::GL2::TopoRenderMap<PFP>* m_topoRender ;
......
......@@ -313,22 +313,18 @@ void ObjView::cb_redraw()
void ObjView::init(const std::string& fnm)
{
std::vector<std::string> attrNames;
m_obj.import(fnm,attrNames);
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, m_obj.m_positions);
float lWidthObj = std::max<PFP::REAL>(std::max<PFP::REAL>(bb.size(0), bb.size(1)), bb.size(2));
Geom::Vec3f lPosObj = (bb.min() + bb.max()) / PFP::REAL(2);
// send BB info to interface for centering on GL screen
setParamObject(lWidthObj, lPosObj.data());
}
int main(int argc, char**argv)
{
// interface:
......
......@@ -69,14 +69,13 @@ public:
Utils::Drawer* m_dr;
unsigned int m_currentGroupDrawn;
void drawBB( const Geom::BoundingBox<VEC3>& bb);
void drawBB(const Geom::BoundingBox<VEC3>& bb);
// VBO
Utils::VBO* m_positionVBO;
Utils::VBO* m_normalVBO;
Utils::VBO* m_texcoordVBO;
// shader simple texture
Utils::ShaderSimpleTexture* m_shader;
Utils::ShaderPhongTexture* m_shader2;
......@@ -96,8 +95,6 @@ public:
void cb_initGL();
void cb_keyPress(int k);
};
#endif
......@@ -36,8 +36,8 @@
#include "Algo/Export/exportVol.h"
MAP myMap;
VertexAttribute<VEC3, MAP_IMPL> position ;
VolumeAttribute<VEC3, MAP_IMPL> color ;
VertexAttribute<VEC3, MAP> position ;
VolumeAttribute<VEC3, MAP> color ;
void MyQT::volumes_onoff(bool /*x*/)
{
......@@ -56,7 +56,7 @@ void MyQT::topo_onoff(bool /*x*/)
render_topo = !render_topo;
if (render_topo)
{
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);
//TODO MapBrowser
m_topo_render->updateData(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor);
}
......@@ -121,7 +121,7 @@ void MyQT::slider_released()
render_topo = render_topoTemp;
if (render_topo)
{
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);
//TODO MapBrowser
m_topo_render->updateData(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor );
}
......@@ -151,7 +151,7 @@ void MyQT::cb_Open()
// }
// else
// {
// position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]) ;
// position = myMap.getAttribute<VEC3, VERTEX>(attrNames[0]) ;
// myMap.closeMap();
// }
// }
......@@ -163,22 +163,22 @@ void MyQT::cb_Open()
return ;
}
else
position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ;
position = myMap.getAttribute<VEC3, VERTEX, MAP>(attrNames[0]) ;
//}
color = myMap.addAttribute<PFP::VEC3, VOLUME>("color");
color = myMap.addAttribute<VEC3, VOLUME, MAP>("color");
TraversorCell<PFP::MAP, VOLUME> tra(myMap);
TraversorCell<MAP, VOLUME> tra(myMap);
float maxV = 0.0f;
for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
{
// float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
// color[d] = PFP::VEC3(v,0,0);
// color[d] = VEC3(v,0,0);
// if (v>maxV)
// maxV=v;
if(myMap.isVolumeIncidentToBoundary(d))
color[d] = PFP::VEC3(0,0,0);
color[d] = VEC3(0,0,0);
}
// for (unsigned int i = color.begin(); i != color.end(); color.next(i))
// {
......@@ -186,7 +186,7 @@ void MyQT::cb_Open()
// color[i][2] = 1.0f - color[i][0];
// }
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);
m_topo_render->updateData(myMap, position, 0.8f, 0.8f, 0.8f);
m_explode_render->updateData<PFP>(myMap, position, color);
......@@ -200,7 +200,7 @@ void MyQT::cb_Save()
if (filename.empty())
return ;
Algo::Volume::Export::exportMesh<PFP>(myMap,position,filename);
Algo::Volume::Export::exportMesh<PFP>(myMap, position, filename);
}
void MyQT::cb_initGL()
......@@ -212,7 +212,7 @@ void MyQT::cb_initGL()
m_topo_render = new Algo::Render::GL2::Topo3RenderMap<PFP>();
m_explode_render = new Algo::Render::GL2::ExplodeVolumeRender(true,true,true);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
// SelectorDartNoBoundary<MAP> nb(myMap);
m_topo_render->updateData(myMap, position, 0.8f, 0.8f, 0.8f);
m_explode_render->updateData<PFP>(myMap, position, color);
m_explode_render->setExplodeVolumes(0.8f);
......@@ -395,7 +395,7 @@ int main(int argc, char **argv)
}
else
{
position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]) ;
position = myMap.getAttribute<VEC3, VERTEX>(attrNames[0]) ;
myMap.closeMap();
}
}
......@@ -408,24 +408,24 @@ int main(int argc, char **argv)
return 1;
}
else
position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ;
position = myMap.getAttribute<VEC3, VERTEX, MAP>(attrNames[0]) ;
// }
color = myMap.addAttribute<PFP::VEC3, VOLUME>("color");
color = myMap.addAttribute<VEC3, VOLUME, MAP>("color");