Commit 9e0a96cf authored by Sylvain Thery's avatar Sylvain Thery

eradication of selector git diff | grep +++

parent 4f1ab1d0
......@@ -138,21 +138,21 @@ void Clipping::slot_drawFaces(bool b)
void Clipping::slot_explodTopoPhi1(double c)
{
m_coeffTopoExplod[0] = (float)c;
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
updateGL();
}
void Clipping::slot_explodTopoPhi2(double c)
{
m_coeffTopoExplod[1] = (float)c;
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
updateGL();
}
void Clipping::slot_explodTopoPhi3(double c)
{
m_coeffTopoExplod[2] = (float)c;
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
updateGL();
}
......@@ -823,7 +823,7 @@ void Clipping::importMesh(std::string& filename)
updateVBOprimitives(Algo::Render::GL2::TRIANGLES | Algo::Render::GL2::LINES | Algo::Render::GL2::POINTS) ;
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
m_bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
gPosObj = m_bb.center() ;
......@@ -883,13 +883,13 @@ void Clipping::cb_initGL()
void Clipping::updateVBOprimitives(int upType)
{
if(upType & Algo::Render::GL2::TRIANGLES)
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES) ;
if(upType & Algo::Render::GL2::LINES)
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES,false) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES,false) ;
if(upType & Algo::Render::GL2::POINTS)
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS) ;
}
void Clipping::cb_redraw()
......
......@@ -216,8 +216,8 @@ void MyQT::cb_keyPress(int code)
Algo::Surface::Modelisation::EarTriangulation<PFP> triangulation(myMap);
triangulation.triangule();
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
updateGL();
}
break;
......@@ -431,9 +431,9 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES, &position);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES, &position);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS, &position);
sqt.m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES, &position);
sqt.m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES, &position);
sqt.m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS, &position);
// show final pour premier redraw
sqt.show();
......
......@@ -150,8 +150,8 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update render primitives
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
sqt.m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
sqt.show();
return app.exec();
......
......@@ -155,8 +155,9 @@ void MCMesh::MC()
void MCMesh::updateRender()
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render->initPrimitives<PFP>(myMap, nb, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, nb, Algo::Render::GL2::TRIANGLES);
//TODO add Browser for no border
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
m_positionVBO->updateData(position);
......
......@@ -91,7 +91,7 @@ void SimpleMap3::cb_redraw()
{
glDisable(GL_LIGHTING);
glLineWidth(1.0f);
Algo::Render::GL1::renderTopoMD3<PFP>(myMap, position, true, true, true, 0.9f, 0.9f, 0.9f,allDarts);
Algo::Render::GL1::renderTopoMD3<PFP>(myMap, position, true, true, true, 0.9f, 0.9f, 0.9f);
}
/**********************************************************************************************
......
......@@ -83,7 +83,7 @@ void TexView::cb_initGL()
glEnable(GL_TEXTURE_2D);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
}
void TexView::cb_redraw()
......
......@@ -229,9 +229,9 @@ void Viewer::importMesh(std::string& filename)
myMap.enableQuickTraversal<VERTEX>() ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES) ;
m_topoRender->updateData<PFP>(myMap, position, 0.85f, 0.85f) ;
......@@ -258,7 +258,7 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
std::string extension = filename.substr(pos) ;
if (extension == std::string(".off"))
Algo::Surface::Export::exportOFF<PFP>(myMap, position, filename.c_str(), allDarts) ;
Algo::Surface::Export::exportOFF<PFP>(myMap, position, filename.c_str()) ;
else if (extension.compare(0, 4, std::string(".ply")) == 0)
{
int ascii = 0 ;
......@@ -267,7 +267,7 @@ void Viewer::exportMesh(std::string& filename, bool askExportMode)
std::vector<VertexAttribute<VEC3>*> attributes ;
attributes.push_back(&position) ;
Algo::Surface::Export::exportPLYnew<PFP>(myMap, attributes, filename.c_str(), !ascii, allDarts) ;
Algo::Surface::Export::exportPLYnew<PFP>(myMap, attributes, filename.c_str(), !ascii) ;
}
else if (extension == std::string(".map"))
myMap.saveMapBin(filename) ;
......
......@@ -55,8 +55,9 @@ void MyQT::topo_onoff(bool x)
render_topo = !render_topo;
if (render_topo)
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO MapBrowser
m_topo_render->updateData<PFP>(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor);
}
updateGL();
......@@ -123,8 +124,9 @@ void MyQT::slider_released()
render_topo = render_topoTemp;
if (render_topo)
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO MapBrowser
m_topo_render->updateData<PFP>(myMap, position, 0.8f, m_explode_factorf-0.05f, m_explode_factor );
}
updateGL();
}
......@@ -185,8 +187,8 @@ void MyQT::cb_Open()
color[i][2] = 1.0f - color[i][0];
}
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, 0.8f, 0.8f, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, 0.8f, 0.8f);
m_explode_render->updateData<PFP>(myMap, position, color);
updateGL() ;
......@@ -202,8 +204,8 @@ void MyQT::cb_initGL()
m_topo_render = new Algo::Render::GL2::Topo3Render();
m_explode_render = new Algo::Render::GL2::ExplodeVolumeRender(true,true,false);
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, 0.8f, 0.8f, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_topo_render->updateData<PFP>(myMap, position, 0.8f, 0.8f, 0.8f);
m_explode_render->updateData<PFP>(myMap, position, color);
m_explode_render->setExplodeVolumes(0.8f);
m_explode_render->setExplodeFaces(0.9f);
......
......@@ -118,8 +118,8 @@ void MyQT::cb_initGL()
m_render_topo = new Algo::Render::GL2::Topo3Render();
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f);
m_dm_topo = new DartMarker(myMap);
}
......@@ -145,8 +145,8 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if (Shift())
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart d = m_render_topo->picking<PFP>(myMap, x, y, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart d = m_render_topo->picking<PFP>(myMap, x, y);
if (d != Dart::nil())
{
CGoGNout << "Dart " << d << " clicked" << CGoGNendl;
......@@ -229,8 +229,8 @@ void MyQT::traverse2()
m_drawer.endList();
SelectorMarked sm(*m_dm_topo);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f, sm);
// SelectorMarked sm(*m_dm_topo);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f);
updateGL();
}
......@@ -293,7 +293,8 @@ void MyQT::traverse3()
Algo::Render::drawerCells<PFP>(VERTEX+m_first3, m_drawer, myMap, m_affDarts, position, m_expl);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f, sm);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f); //sm
for (std::vector<Dart>::iterator id = m_affDarts.begin(); id != m_affDarts.end(); ++id)
m_render_topo->setDartColor(*id,0.7f,0.0f,0.0f);
m_render_topo->setDartColor(m_selected,0.0f,0.7f,0.0f);
......@@ -313,7 +314,7 @@ void MyQT::traverse3()
Algo::Render::drawerCells<PFP>(VERTEX+m_first3, m_drawer, myMap,m_affDarts,position,m_expl);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f, sm);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f); //sm
for (std::vector<Dart>::iterator id=m_affDarts.begin(); id != m_affDarts.end(); ++id)
m_render_topo->setDartColor(*id,0.7f,0.0f,0.0f);
m_render_topo->setDartColor(m_selected,0.0f,0.7f,0.0f);
......
......@@ -24,6 +24,7 @@
#include "tuto1.h"
#include "Algo/Geometry/boundingbox.h"
#include "Topology/generic/mapBrowser.h"
using namespace CGoGN ;
......@@ -76,8 +77,7 @@ void MyQT::createMap()
show();
// render the topo of the map without boundary darts
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, nb);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,true );
}
// initialization GL callback
......
......@@ -101,9 +101,9 @@ void MyQT::createMap()
m_colorVBO2->updateData(colorE);
// construct rendering primities
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS); // special primitive for boundary edges
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS); // special primitive for boundary edges
// traverse of all dart of the map:
// and write informations
......
......@@ -69,8 +69,8 @@ void MyQT::traverseMap()
m1.markOrbit<VOLUME>(xd1);
// render the topo of the map without boundary darts
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f); // nb
for (Dart d = myMap.begin(); d != myMap.end(); myMap.next(d))
{
......@@ -201,8 +201,8 @@ void MyQT::createMap()
show();
// render the topo of the map without boundary darts
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f); // nb
}
// initialization GL callback
......
......@@ -156,14 +156,13 @@ void MyQT::cb_initGL()
registerShader(m_sprite);
registerShader(m_lines);
SelectorTrue allDarts;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS);
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, 0.9f, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, 0.9f); // nb
// timer example for animation
m_timer = new QTimer( this );
......@@ -217,8 +216,8 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if (Shift())
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart d = m_render_topo->picking<PFP>(myMap, x,y, nb);
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart d = m_render_topo->picking<PFP>(myMap, x,y); // nb
if (d != Dart::nil())
{
CGoGNout << "Dart "<< d << " clicked" << CGoGNendl;
......@@ -262,11 +261,11 @@ void MyQT::cb_keyPress(int code)
Algo::Volume::Modelisation::catmullClarkVol<PFP>(myMap, position);
m_positionVBO->updateData(position);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, 0.9f, allDarts);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, 0.9f);
}
}
......
......@@ -84,7 +84,7 @@ int main(int argc, char **argv)
if(dsave != NIL)
positionV[dsave] = PFP::VEC3(0.0);
//Algo::Modelisation::computeDual3<PFP>(myMap,allDarts) ;
//Algo::Modelisation::computeDual3<PFP>(myMap) ;
myMap.computeDual();
position = positionV ;
......
......@@ -160,7 +160,7 @@ void MyQT::createMap(const std::string& filename)
l_histo->histoColorizeVBO(*m_colorVBO2);
// construct rendering primities
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
}
......
......@@ -89,8 +89,8 @@ void MyQT::cb_initGL()
Algo::Surface::Geometry::computeNormalVertices<PFP>(myMap, position, normal) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::POINTS);
registerShader(m_shader);
registerShader(m_lines);
......
......@@ -193,7 +193,7 @@ void MyQT::createMap(int n)
m_render_topo->setDartWidth(5.0f);
m_render_topo->setInitialDartsColor(0.0f,0.0f,0.0f);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,nb);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f); // nb
for (Dart d=myMap.begin(); d!=myMap.end(); myMap.next(d))
{
......@@ -211,7 +211,7 @@ void MyQT::createMap(int n)
void MyQT::updateMap()
{
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,nb);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f); // nb
for (Dart d=myMap.begin(); d!=myMap.end(); myMap.next(d))
{
if (dm.isMarked(d) && (!myMap.isBoundaryMarked2(d)))
......@@ -251,7 +251,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if (Shift())
{
Dart d = m_render_topo->picking<PFP>(myMap, x,y, nb);
Dart d = m_render_topo->picking<PFP>(myMap, x,y); // nb
if (button == Qt::LeftButton)
{
if (d != Dart::nil())
......
......@@ -264,12 +264,12 @@ void MyQT::createMap(int n)
m_render_topo->setDartWidth(3.0f);
m_render_topo->setInitialDartsColor(0.0f,0.0f,0.0f);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
}
void MyQT::updateMap()
{
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
}
// initialization GL callback
......@@ -325,7 +325,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if (Shift())
{
Dart d = m_render_topo->picking<PFP>(myMap, x,y, nb);
Dart d = m_render_topo->picking<PFP>(myMap, x,y/*,nb*/);
if (button == Qt::LeftButton)
{
if (d != Dart::nil())
......@@ -365,7 +365,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
if (Control())
{
Dart d = m_render_topo->picking<PFP>(myMap, x,y, nb);
Dart d = m_render_topo->picking<PFP>(myMap, x,y/*, nb*/);
if (button == Qt::LeftButton)
{
if (d != Dart::nil())
......@@ -507,13 +507,13 @@ void MyQT::cb_keyPress(int keycode)
case 'w':
m_ex1 = 0.99f;
m_ex2 = 0.99f;
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
updateGL();
break;
case 'W':
m_ex1 = 0.9f;
m_ex2 = 0.9f;
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
updateGL();
break;
......@@ -630,7 +630,7 @@ void MyQT::importMesh(std::string& filename)
m_selected = NIL;
m_selected2 = NIL;
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
setParamObject(bb.maxSize(), bb.center().data()) ;
......@@ -645,6 +645,6 @@ void MyQT::importMesh(std::string& filename)
void MyQT::width(int w)
{
m_ex3 = 0.9f - 0.025f*w;
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3, nb);
m_render_topo->updateData<PFP>(myMap, position, m_ex1,m_ex2,m_ex3/*, nb*/);
updateGL();
}
......@@ -80,7 +80,7 @@ template< unsigned int ORBIT>
void MyQT::storeVerticesInfo(const AttributeHandler<int, ORBIT>* attrib)
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->computeDartMiddlePositions<PFP>(myMap, middleDarts, nb);
m_render_topo->computeDartMiddlePositions<PFP>(myMap, middleDarts/*, nb*/);
m_strings->clear();
for (Dart d = myMap.begin(); d != myMap.end(); myMap.next(d))
......@@ -143,7 +143,7 @@ void MyQT::cb_initGL()
m_render_topo = new Algo::Render::GL2::Topo3Render();
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.8f, 0.8f, nb);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.8f, 0.8f/*, nb*/);
m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f));
registerShader(m_strings);
......@@ -168,7 +168,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
if (Shift())
{
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_clicked = m_render_topo->picking<PFP>(myMap, x,y, nb);
m_clicked = m_render_topo->picking<PFP>(myMap, x,y/*, nb*/);
if (m_clicked != Dart::nil())
{
unsigned int orbs[9] = {VERTEX,EDGE,FACE,VOLUME,PFP::MAP::VERTEX_OF_PARENT,PFP::MAP::EDGE_OF_PARENT,PFP::MAP::FACE_OF_PARENT,PFP::MAP::VERTEX_OF_PARENT2,PFP::MAP::EDGE_OF_PARENT2};
......
......@@ -64,7 +64,6 @@ void decimate(
ApproximatorType a,
std::vector<VertexAttribute<typename PFP::VEC3> *>& position,
unsigned int nbWantedVertices,
const FunctorSelect& selected = allDarts,
EdgeAttribute<typename PFP::REAL> *edgeErrors = NULL,
void (*callback_wrapper)(void*, const void*) = NULL, void *callback_object = NULL
) ;
......
......@@ -37,7 +37,7 @@ namespace Decimation
template <typename PFP>
void decimate(
typename PFP::MAP& map, SelectorType s, ApproximatorType a,
std::vector<VertexAttribute<typename PFP::VEC3>* >& attribs, unsigned int nbWantedVertices, const FunctorSelect& selected,
std::vector<VertexAttribute<typename PFP::VEC3>* >& attribs, unsigned int nbWantedVertices,
EdgeAttribute<typename PFP::REAL> *edgeErrors,
void (*callback_wrapper)(void*, const void*), void* callback_object
)
......@@ -146,55 +146,55 @@ void decimate(
switch(s)
{
case S_MapOrder :
selector = new EdgeSelector_MapOrder<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_MapOrder<PFP>(map, position, approximators) ;
break ;
case S_Random :
selector = new EdgeSelector_Random<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_Random<PFP>(map, position, approximators) ;
break ;
case S_EdgeLength :
selector = new EdgeSelector_Length<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_Length<PFP>(map, position, approximators) ;
break ;
case S_QEMml :
selector = new EdgeSelector_QEMml<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_QEMml<PFP>(map, position, approximators) ;
break ;
case S_QEM :
selector = new EdgeSelector_QEM<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_QEM<PFP>(map, position, approximators) ;
break ;
case S_Curvature :
selector = new EdgeSelector_Curvature<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_Curvature<PFP>(map, position, approximators) ;
break ;
case S_NormalArea :
selector = new EdgeSelector_NormalArea<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_NormalArea<PFP>(map, position, approximators) ;
break ;
case S_CurvatureTensor :
selector = new EdgeSelector_CurvatureTensor<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_CurvatureTensor<PFP>(map, position, approximators) ;
break ;
case S_MinDetail :
selector = new EdgeSelector_MinDetail<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_MinDetail<PFP>(map, position, approximators) ;
break ;
case S_ColorNaive :
selector = new EdgeSelector_ColorNaive<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_ColorNaive<PFP>(map, position, approximators) ;
break ;
case S_QEMextColor :
selector = new EdgeSelector_QEMextColor<PFP>(map, position, approximators, selected) ;
selector = new EdgeSelector_QEMextColor<PFP>(map, position, approximators) ;
break ;
case S_hQEMextColor :
selector = new HalfEdgeSelector_QEMextColor<PFP>(map, position, approximators, selected) ;
selector = new HalfEdgeSelector_QEMextColor<PFP>(map, position, approximators) ;
break ;
case S_hQEMml :
selector = new HalfEdgeSelector_QEMml<PFP>(map, position, approximators, selected) ;
selector = new HalfEdgeSelector_QEMml<PFP>(map, position, approximators) ;
break ;