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

no more virtual foreach_dart / no more MAP_IMPL parameter in AttributeHandler

parent a3be313e
...@@ -798,7 +798,7 @@ void Clipping::importMesh(std::string& filename) ...@@ -798,7 +798,7 @@ void Clipping::importMesh(std::string& filename)
return; return;
} }
else else
position = myMap.getAttribute<VEC3, VERTEX>("position") ; position = myMap.getAttribute<VEC3, VERTEX ,MAP>("position") ;
} }
else else
{ {
...@@ -808,10 +808,9 @@ void Clipping::importMesh(std::string& filename) ...@@ -808,10 +808,9 @@ void Clipping::importMesh(std::string& filename)
return ; return ;
} }
else 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) ; 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]); 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) ...@@ -1114,7 +1113,7 @@ int main(int argc, char** argv)
} }
else 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); Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(sqt.myMap, 10,10,10);
cubic.embedIntoGrid(sqt.position, 1.0f, 1.0f, 1.0f); cubic.embedIntoGrid(sqt.position, 1.0f, 1.0f, 1.0f);
......
...@@ -71,7 +71,6 @@ struct PFP: public PFP_STANDARD ...@@ -71,7 +71,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP; typedef PFP::MAP MAP;
typedef PFP::MAP::IMPL MAP_IMPL;
typedef PFP::VEC3 VEC3; typedef PFP::VEC3 VEC3;
class Clipping: public Utils::QT::SimpleQT class Clipping: public Utils::QT::SimpleQT
...@@ -81,7 +80,7 @@ class Clipping: public Utils::QT::SimpleQT ...@@ -81,7 +80,7 @@ class Clipping: public Utils::QT::SimpleQT
public: public:
//Manip Carte //Manip Carte
MAP myMap ; MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position; VertexAttribute<VEC3, MAP> position;
Dart dglobal; Dart dglobal;
//Render //Render
......
...@@ -128,13 +128,12 @@ struct PFP: public PFP_STANDARD ...@@ -128,13 +128,12 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
// declaration of the map // declaration of the map
MAP myMap; MAP myMap;
// and attribute of position // and attribute of position
VertexAttribute<VEC3, MAP_IMPL> position; VertexAttribute<VEC3, MAP> position;
unsigned int nb_ears; unsigned int nb_ears;
...@@ -245,7 +244,7 @@ void MyQT::cb_keyPress(int code) ...@@ -245,7 +244,7 @@ void MyQT::cb_keyPress(int code)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
position = myMap.addAttribute<VEC3, VERTEX>("position"); position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Dart d0 = myMap.newFace(12); Dart d0 = myMap.newFace(12);
position[d0] = PFP::VEC3(0, 20, 0); position[d0] = PFP::VEC3(0, 20, 0);
......
...@@ -53,7 +53,6 @@ struct PFP: public PFP_STANDARD ...@@ -53,7 +53,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
MAP myMap; MAP myMap;
...@@ -104,7 +103,7 @@ int main(int argc, char **argv) ...@@ -104,7 +103,7 @@ int main(int argc, char **argv)
QApplication app(argc, argv); QApplication app(argc, argv);
MyQT sqt; 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) // define the face extruded (here a cross)
std::vector<PFP::VEC3> objV; std::vector<PFP::VEC3> objV;
...@@ -134,7 +133,7 @@ int main(int argc, char **argv) ...@@ -134,7 +133,7 @@ int main(int argc, char **argv)
} }
// extrusion // 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 // bounding box
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position); Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);
......
...@@ -138,9 +138,9 @@ void MCMesh::MC() ...@@ -138,9 +138,9 @@ void MCMesh::MC()
SAlgo::MC::WindowingGreater<DATATYPE> myWindFunc; SAlgo::MC::WindowingGreater<DATATYPE> myWindFunc;
myWindFunc.setIsoValue(DATATYPE(127)); myWindFunc.setIsoValue(DATATYPE(127));
position = myMap.getAttribute<VEC3, VERTEX>("position"); position = myMap.getAttribute<VEC3, VERTEX, MAP>("position");
if (!position.isValid()) if (!position.isValid())
position = myMap.addAttribute<VEC3, VERTEX>("position"); position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
// instanciation du mc // instanciation du mc
SAlgo::MC::MarchingCube<DATATYPE, SAlgo::MC::WindowingGreater,PFP> mc(myImgFr, &myMap, position, myWindFunc, false); SAlgo::MC::MarchingCube<DATATYPE, SAlgo::MC::WindowingGreater,PFP> mc(myImgFr, &myMap, position, myWindFunc, false);
......
...@@ -54,7 +54,6 @@ struct PFP: public PFP_STANDARD ...@@ -54,7 +54,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
typedef unsigned char DATATYPE; typedef unsigned char DATATYPE;
...@@ -75,7 +74,7 @@ public: ...@@ -75,7 +74,7 @@ public:
bool m_drawEdges ; bool m_drawEdges ;
bool m_drawFaces ; bool m_drawFaces ;
VertexAttribute<VEC3, MAP_IMPL> position ; VertexAttribute<VEC3, MAP> position ;
Algo::Render::GL2::MapRender* m_render ; Algo::Render::GL2::MapRender* m_render ;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SimpleGMap2::SimpleGMap2() SimpleGMap2::SimpleGMap2()
{ {
position = myMap.addAttribute<VEC3, VERTEX>("position"); position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
Dart d = Algo::Surface::Modelisation::createTetrahedron<PFP>(myMap); Dart d = Algo::Surface::Modelisation::createTetrahedron<PFP>(myMap);
position[d] = VEC3(0,0,0); position[d] = VEC3(0,0,0);
...@@ -62,7 +62,7 @@ void SimpleGMap2::cb_initGL() ...@@ -62,7 +62,7 @@ void SimpleGMap2::cb_initGL()
{ {
Utils::GLSLShader::setCurrentOGLVersion(1) ; 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() ; VEC3 gPosObj = bb.center() ;
float tailleX = bb.size(0) ; float tailleX = bb.size(0) ;
float tailleY = bb.size(1) ; float tailleY = bb.size(1) ;
......
...@@ -42,7 +42,6 @@ struct PFP: public PFP_STANDARD ...@@ -42,7 +42,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
class SimpleGMap2 : public Utils::QT::SimpleQT class SimpleGMap2 : public Utils::QT::SimpleQT
...@@ -52,7 +51,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT ...@@ -52,7 +51,7 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public: public:
MAP myMap ; MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position ; VertexAttribute<VEC3, MAP> position ;
SimpleGMap2() ; SimpleGMap2() ;
...@@ -61,4 +60,3 @@ public: ...@@ -61,4 +60,3 @@ public:
void cb_initGL() ; void cb_initGL() ;
void cb_redraw() ; void cb_redraw() ;
}; };
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
SimpleGMap3::SimpleGMap3() SimpleGMap3::SimpleGMap3()
{ {
position = myMap.addAttribute<VEC3, VERTEX>("position"); position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
volume = myMap.addAttribute<VEC3, VOLUME>("volume"); volume = myMap.addAttribute<VEC3, VOLUME, MAP>("volume");
// CellMarker<EDGE> mE(myMap); // CellMarker<EDGE> mE(myMap);
......
...@@ -43,7 +43,6 @@ struct PFP: public PFP_STANDARD ...@@ -43,7 +43,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
class SimpleGMap3 : public Utils::QT::SimpleQT class SimpleGMap3 : public Utils::QT::SimpleQT
...@@ -53,8 +52,8 @@ class SimpleGMap3 : public Utils::QT::SimpleQT ...@@ -53,8 +52,8 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public: public:
MAP myMap ; MAP myMap ;
VertexAttribute<VEC3, MAP_IMPL> position ; VertexAttribute<VEC3, MAP> position ;
VolumeAttribute<VEC3, MAP_IMPL> volume ; VolumeAttribute<VEC3, MAP> volume ;
Algo::Render::GL2::Topo3Render<PFP>* m_render_topo; Algo::Render::GL2::Topo3Render<PFP>* m_render_topo;
......
...@@ -30,63 +30,62 @@ ...@@ -30,63 +30,62 @@
SimpleMap3::SimpleMap3() 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); // Dart dtemp = myMap.phi_1(myMap.phi2(myMap.phi_1(myMap.phi_1(myMap.phi2(d)))));
// 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))))); // 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); // unsigned int nb=0;
// cubic.embedIntoGrid(position, 1.0f, 1.0f, 1.0f); // for(unsigned int i = position.begin(); i!=position.end(); position.next(i))
// myMap.check(); // nb++;
// unsigned int nb=0; // std::cout << "Nb vertices (equals 12) : " << nb << std::endl;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i)) // assert(nb==12);
// nb++;
// 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; // std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i)) // assert(nb==16);
// nb++;
// std::cout << "Nb vertices after unsew (equals 16) : " << nb << std::endl; // myMap.sewVolumes(d,dd);
// assert(nb==16);
// 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; // std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// for(unsigned int i = position.begin(); i!=position.end(); position.next(i)) // assert(nb==12);
// nb++;
// std::cout << "Nb vertices after resew (equals 12) : " << nb << std::endl;
// assert(nb==12);
} }
...@@ -117,46 +116,46 @@ void SimpleMap3::cb_initGL() ...@@ -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_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 = new Algo::Render::GL2::Topo3PrimalRender<PFP>();
m_render_topo_primal->setDartWidth(2.0f); m_render_topo_primal->setDartWidth(2.0f);
m_render_topo_primal->setInitialDartsColor(1.0f,1.0f,1.0f); m_render_topo_primal->setInitialDartsColor(1.0f,1.0f,1.0f);
m_render_topo_primal->updateData(myMap, position, 0.95f,0.85f); m_render_topo_primal->updateData(myMap, position, 0.95f,0.85f);
} }
void SimpleMap3::cb_keyPress(int code) void SimpleMap3::cb_keyPress(int code)
{ {
switch(code) switch(code)
{ {
case 'e': case 'e':
{ {
time_t rawtime; time_t rawtime;
struct tm * timeinfo; struct tm * timeinfo;
char buffer[80]; char buffer[80];
time (&rawtime); time (&rawtime);
timeinfo = localtime (&rawtime); timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo); strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg"); std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo->svgout2D(filename, modelViewMatrix(), projectionMatrix()); m_render_topo->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break; break;
} }
case 'E': case 'E':
{ {
time_t rawtime; time_t rawtime;
struct tm * timeinfo; struct tm * timeinfo;
char buffer[80]; char buffer[80];
time (&rawtime); time (&rawtime);
timeinfo = localtime (&rawtime); timeinfo = localtime (&rawtime);
strftime (buffer,80,".%F.%H:%M:%S",timeinfo); strftime (buffer,80,".%F.%H:%M:%S",timeinfo);
std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg"); std::string filename = std::string("topo_screenshot") + std::string(buffer) + std::string(".svg");
m_render_topo_primal->svgout2D(filename, modelViewMatrix(), projectionMatrix()); m_render_topo_primal->svgout2D(filename, modelViewMatrix(), projectionMatrix());
break; break;
} }
} }
} }
...@@ -164,9 +163,9 @@ void SimpleMap3::cb_redraw() ...@@ -164,9 +163,9 @@ void SimpleMap3::cb_redraw()
{ {
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glLineWidth(1.0f); glLineWidth(1.0f);
m_render_topo->drawTopo(); m_render_topo->drawTopo();
//m_render_topo_boundary->drawTopo(); //m_render_topo_boundary->drawTopo();
//m_render_topo_primal->drawTopo(); //m_render_topo_primal->drawTopo();
} }
/********************************************************************************************** /**********************************************************************************************
...@@ -179,7 +178,7 @@ int main(int argc, char **argv) ...@@ -179,7 +178,7 @@ int main(int argc, char **argv)
SimpleMap3 sqt ; SimpleMap3 sqt ;
sqt.setGeometry(0, 0, 1000, 800) ; sqt.setGeometry(0, 0, 1000, 800) ;
sqt.show() ; sqt.show() ;
sqt.initGUI() ; sqt.initGUI() ;
......
...@@ -45,7 +45,6 @@ struct PFP: public PFP_STANDARD ...@@ -45,7 +45,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
class SimpleMap3 : public Utils::QT::SimpleQT class SimpleMap3 : public Utils::QT::SimpleQT
...@@ -56,7 +55,7 @@ public: ...@@ -56,7 +55,7 @@ public:
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ; SelectorTrue allDarts ;
VertexAttribute<VEC3, MAP_IMPL> position ; VertexAttribute<VEC3, MAP> position ;
Algo::Render::GL2::Topo3RenderMap<PFP>* m_render_topo; Algo::Render::GL2::Topo3RenderMap<PFP>* m_render_topo;
Algo::Render::GL2::TopoRenderMap<PFP>* m_render_topo_boundary; Algo::Render::GL2::TopoRenderMap<PFP>* m_render_topo_boundary;
......
...@@ -89,9 +89,9 @@ void TexView::cb_initGL() ...@@ -89,9 +89,9 @@ void TexView::cb_initGL()
if (!m_obj.hasNormals()) 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()) 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) ; Algo::Surface::Geometry::computeNormalVertices<PFP>(myMap, m_obj.m_positions, normal) ;
m_obj.setNormalAttribute(normal); m_obj.setNormalAttribute(normal);
...@@ -206,8 +206,8 @@ void TexView::computeTore() ...@@ -206,8 +206,8 @@ void TexView::computeTore()
{ {
#define NB 96 #define NB 96
VertexAttribute<VEC3, MAP_IMPL> position = myMap.addAttribute<VEC3, VERTEX>("position"); VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
VertexAttribute<Geom::Vec2f, MAP_IMPL> texcoord = myMap.addAttribute<Geom::Vec2f, VERTEX>("texcoord"); VertexAttribute<Geom::Vec2f, MAP> texcoord = myMap.addAttribute<Geom::Vec2f, VERTEX, MAP>("texcoord");
//Algo::Surface::Modelisation::Polyhedron<PFP> prim(myMap, position); //Algo::Surface::Modelisation::Polyhedron<PFP> prim(myMap, position);
Algo::Surface::Tilings::Square::Tore<PFP> prim(myMap, NB, NB); Algo::Surface::Tilings::Square::Tore<PFP> prim(myMap, NB, NB);
prim.embedIntoTore(position, 40.0f,20.0f); prim.embedIntoTore(position, 40.0f,20.0f);
......
...@@ -50,7 +50,6 @@ struct PFP: public PFP_STANDARD ...@@ -50,7 +50,6 @@ struct PFP: public PFP_STANDARD
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::MAP::IMPL MAP_IMPL ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;