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

Merge branch 'no_boundary' of cgogn:~kraemer/CGoGN into no_boundary

parents 935a7816 31c3e326
......@@ -213,7 +213,6 @@ void MyQT::cb_keyPress(int code)
Algo::Modelisation::EarTriangulation<PFP> triangulation(myMap);
triangulation.triangule();
SelectorTrue allDarts;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
updateGL();
......@@ -439,7 +438,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
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, allDarts, Algo::Render::GL2::POINTS);
......
......@@ -79,7 +79,6 @@ public:
//Manip Carte
MAP myMap ;
SelectorTrue allDarts ;
TVEC3 position;
Dart dglobal;
......
......@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
};
PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ;
PFP::TREAL scalar;
Dart dglobal;
......
......@@ -155,7 +155,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
......@@ -56,7 +56,6 @@ struct PFP: public PFP_STANDARD
typedef PFP::MAP MAP;
MAP myMap ;
SelectorTrue allDarts ;
class MyGlutWin : public Utils::GlutWin_ATB
{
......
......@@ -154,7 +154,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
......@@ -140,8 +140,6 @@ void myGlutWin::init()
void myGlutWin::updateRender()
{
SelectorTrue allDarts;
// create the renderer (first call only)
if (m_render == NULL)
m_render = new Algo::Render::GL2::MapRender_VBO() ;
......
......@@ -50,7 +50,6 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public:
MAP myMap ;
SelectorTrue allDarts ;
PFP::TVEC3 position ;
......
......@@ -50,7 +50,6 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public:
MAP myMap ;
SelectorTrue allDarts ;
PFP::TVEC3 position ;
......
......@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ;
Dart dglobal;
......
......@@ -119,10 +119,6 @@ int main(int argc, char **argv)
// declaration of the map
PFP::MAP myMap;
// this selector is going to select all the darts
SelectorTrue allDarts;
std::vector<std::string> attrNames ;
if(!Algo::Import::importMesh<PFP>(myMap, argv[1], attrNames))
{
......
......@@ -63,7 +63,6 @@ protected:
public:
MAP myMap ;
SelectorTrue allDarts ;
// render
Algo::Render::GL2::MapRender* m_render;
......
......@@ -144,9 +144,6 @@ int main(int argc, char **argv)
// declaration of the map
PFP::MAP myMap;
// this selector is going to select all the darts
SelectorTrue allDarts;
// creation of a new attribute on vertices of type 3D vector
// a handler to this attribute is returned
AttributeHandler<PFP::VEC3> position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
......
......@@ -64,7 +64,6 @@ class Viewer : public Utils::QT::SimpleQT
public:
MAP myMap ;
SelectorTrue allDarts ;
Utils::QT::uiDockInterface dock ;
......
......@@ -48,7 +48,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ;
......
......@@ -69,9 +69,6 @@ AttributeHandler<PFP::VEC3> position;
// handler d'attribut de normale par sommet
AttributeHandler<PFP::VEC3> normal;
/// fonction qui renvoit vrai (appliquée à un brin)
//SelectorTrue allDarts;
/// encore 1 typedef pour simplifier l'ecriture du code
typedef PFP::VEC3 Point3D;
......@@ -615,7 +612,6 @@ int main(int argc, char **argv)
sqt.m_normalVBO->updateData(normal);
// update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
......@@ -178,7 +178,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
SelectorEdgeNoBoundary<PFP::MAP> insideEdges(myMap);// just to draw only inside edges
DartMarker dm(myMap);
......
......@@ -46,8 +46,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ;
PFP::TVEC3 normal ;
AttributeHandler<Geom::Vec4f> color ;
......@@ -251,7 +249,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
......@@ -103,7 +103,6 @@ void MyQT::cb_keyPress(int code)
int main(int argc, char **argv)
{
PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ;
PFP::TVEC3 normal ;
......
......@@ -51,7 +51,6 @@ struct PFP: public PFP_STANDARD
};
PFP::MAP myMap;
SelectorTrue allDarts ;
PFP::TVEC3 position ;
PFP::TVEC3 normal ;
......@@ -218,7 +217,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
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