Commit 1a38e382 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge cgogn:~untereiner/CGoGN

parents ebf1b542 7e05804c
...@@ -31,6 +31,7 @@ Viewer::Viewer() : ...@@ -31,6 +31,7 @@ Viewer::Viewer() :
m_drawFaces(true), m_drawFaces(true),
m_drawNormals(false), m_drawNormals(false),
m_drawTopo(false), m_drawTopo(false),
m_drawBoundaryTopo(true),
m_render(NULL), m_render(NULL),
m_phongShader(NULL), m_phongShader(NULL),
m_flatShader(NULL), m_flatShader(NULL),
...@@ -78,8 +79,6 @@ void Viewer::cb_initGL() ...@@ -78,8 +79,6 @@ void Viewer::cb_initGL()
{ {
Utils::GLSLShader::setCurrentOGLVersion(2) ; Utils::GLSLShader::setCurrentOGLVersion(2) ;
setFocal(5.0f) ;
m_render = new Algo::Render::GL2::MapRender() ; m_render = new Algo::Render::GL2::MapRender() ;
m_topoRender = new Algo::Render::GL2::TopoRender() ; m_topoRender = new Algo::Render::GL2::TopoRender() ;
...@@ -109,7 +108,7 @@ void Viewer::cb_initGL() ...@@ -109,7 +108,7 @@ void Viewer::cb_initGL()
m_simpleColorShader = new Utils::ShaderSimpleColor() ; m_simpleColorShader = new Utils::ShaderSimpleColor() ;
m_simpleColorShader->setAttributePosition(m_positionVBO) ; m_simpleColorShader->setAttributePosition(m_positionVBO) ;
Geom::Vec4f c(0.1f, 0.1f, 0.1f, 1.0f) ; Geom::Vec4f c(0.0f, 0.0f, 0.0f, 1.0f) ;
m_simpleColorShader->setColor(c) ; m_simpleColorShader->setColor(c) ;
m_pointSprite = new Utils::PointSprite() ; m_pointSprite = new Utils::PointSprite() ;
...@@ -231,7 +230,7 @@ void Viewer::importMesh(std::string& filename) ...@@ -231,7 +230,7 @@ void Viewer::importMesh(std::string& filename)
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES) ; m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES) ;
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES) ; m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES) ;
m_topoRender->updateData<PFP>(myMap, position, 0.85f, 0.85f) ; m_topoRender->updateData<PFP>(myMap, position, 0.85f, 0.85f, m_drawBoundaryTopo) ;
bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ; bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
normalBaseSize = bb.diagSize() / 100.0f ; normalBaseSize = bb.diagSize() / 100.0f ;
...@@ -294,6 +293,17 @@ void Viewer::slot_drawEdges(bool b) ...@@ -294,6 +293,17 @@ void Viewer::slot_drawEdges(bool b)
void Viewer::slot_drawFaces(bool b) void Viewer::slot_drawFaces(bool b)
{ {
m_drawFaces = b ; m_drawFaces = b ;
if (b)
{
Geom::Vec4f c(0.0f, 0.0f, 0.0f, 1.0f) ;
m_simpleColorShader->setColor(c) ;
}
else
{
Geom::Vec4f c(0.9f, 0.9f, 0.1f, 1.0f) ;
m_simpleColorShader->setColor(c) ;
}
updateGL() ; updateGL() ;
} }
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include <iostream> #include <iostream>
#include "Utils/Qt/qtSimple.h" //#include "Utils/Qt/qtSimple.h"
#include "Utils/Qt/qtQGLV.h"
#include "ui_viewer.h" #include "ui_viewer.h"
#include "Utils/Qt/qtui.h" #include "Utils/Qt/qtui.h"
...@@ -65,7 +66,8 @@ struct PFP: public PFP_STANDARD ...@@ -65,7 +66,8 @@ struct PFP: public PFP_STANDARD
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
typedef PFP::VEC3 VEC3 ; typedef PFP::VEC3 VEC3 ;
class Viewer : public Utils::QT::SimpleQT //class Viewer : public Utils::QT::SimpleQT
class Viewer : public Utils::QT::SimpleQGLV
{ {
Q_OBJECT Q_OBJECT
...@@ -96,6 +98,7 @@ public: ...@@ -96,6 +98,7 @@ public:
bool m_drawFaces ; bool m_drawFaces ;
bool m_drawNormals ; bool m_drawNormals ;
bool m_drawTopo ; bool m_drawTopo ;
bool m_drawBoundaryTopo;
VertexAttribute<VEC3> position ; VertexAttribute<VEC3> position ;
VertexAttribute<VEC3> normal ; VertexAttribute<VEC3> normal ;
......
...@@ -146,21 +146,21 @@ void MyQT::cb_Open() ...@@ -146,21 +146,21 @@ void MyQT::cb_Open()
size_t pos = filename.rfind("."); // position of "." in filename size_t pos = filename.rfind("."); // position of "." in filename
std::string extension = filename.substr(pos); std::string extension = filename.substr(pos);
if(extension == std::string(".off")) // if(extension == std::string(".off"))
{ // {
if(!Algo::Volume::Import::importMeshToExtrude<PFP>(myMap, filename, attrNames)) // if(!Algo::Volume::Import::importMeshToExtrude<PFP>(myMap, filename, attrNames))
{ // {
std::cerr << "could not import " << filename << std::endl ; // std::cerr << "could not import " << filename << std::endl ;
return ; // return ;
} // }
else // else
{ // {
position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]) ; // position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]) ;
myMap.closeMap(); // myMap.closeMap();
} // }
} // }
else // else
{ // {
if(!Algo::Volume::Import::importMesh<PFP>(myMap, filename, attrNames)) if(!Algo::Volume::Import::importMesh<PFP>(myMap, filename, attrNames))
{ {
std::cerr << "could not import " << filename << std::endl ; std::cerr << "could not import " << filename << std::endl ;
...@@ -168,7 +168,7 @@ void MyQT::cb_Open() ...@@ -168,7 +168,7 @@ void MyQT::cb_Open()
} }
else else
position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ; position = myMap.getAttribute<PFP::VEC3,VERTEX>(attrNames[0]) ;
} // }
color = myMap.addAttribute<PFP::VEC3, VOLUME>("color"); color = myMap.addAttribute<PFP::VEC3, VOLUME>("color");
......
...@@ -357,8 +357,9 @@ void MyQT::cb_Open() ...@@ -357,8 +357,9 @@ void MyQT::cb_Open()
void MyQT::cb_Save() void MyQT::cb_Save()
{ {
std::string filename = selectFileSave("Export SVG file ",".","(*.off)"); std::string filename = selectFileSave("Export Off file ",".","(*.off)");
Algo::Surface::Export::exportOFF<PFP>(myMap,position,filename.c_str()); Algo::Surface::Export::exportOFF<PFP>(myMap,position,filename.c_str());
//std::cout << "could not save file : " << filename << std::endl;
} }
void MyQT::importMesh(std::string& filename) void MyQT::importMesh(std::string& filename)
......
...@@ -259,9 +259,20 @@ void MyQT::createMap(int n) ...@@ -259,9 +259,20 @@ void MyQT::createMap(int n)
position = myMap.getAttribute<VEC3, VERTEX>("position"); position = myMap.getAttribute<VEC3, VERTEX>("position");
if (!position.isValid()) if (!position.isValid())
position = myMap.addAttribute<VEC3, VERTEX>("position"); position = myMap.addAttribute<VEC3, VERTEX>("position");
Algo::Volume::Modelisation::Primitive3D<PFP> prim(myMap, position); // Algo::Volume::Modelisation::Primitive3D<PFP> prim(myMap, position);
prim.hexaGrid_topo(n,n,n); // prim.hexaGrid_topo(n,n,n);
prim.embedHexaGrid(1.0f,1.0f,1.0f); // prim.embedHexaGrid(1.0f,1.0f,1.0f);
// Algo::Surface::Modelisation::Polyhedron<PFP> poly(myMap, position);
// poly.cylinder_topo(6,1,true,true);
// poly.embedCylinder(6.0,6.0,5.0);
// myMap.closeMap();
Dart d = Algo::Surface::Modelisation::embedPrism<PFP>(myMap, position, 5, true,6.0,6.0,5.0);
Dart d2 = Algo::Surface::Modelisation::embedPyramid<PFP>(myMap, position, 4, true,6.0,5.0);
myMap.sewVolumes(myMap.phi2(d),d2);
position[myMap.phi_1(myMap.phi2(d2))] += VEC3(9.0,-5.0,-2.5);
myMap.check(); myMap.check();
...@@ -565,8 +576,8 @@ void MyQT::cb_keyPress(int keycode) ...@@ -565,8 +576,8 @@ void MyQT::cb_keyPress(int keycode)
updateGL(); updateGL();
break; break;
case 'W': case 'W':
m_ex1 = 0.9f; m_ex1 = 0.95f;
m_ex2 = 0.9f; m_ex2 = 0.95f;
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(); updateGL();
break; break;
......
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
virtual void keyPress(View* view, QKeyEvent* event) {} virtual void keyPress(View* view, QKeyEvent* event) {}
virtual void keyRelease(View* view, QKeyEvent* event) {} virtual void keyRelease(View* view, QKeyEvent* event) {}
virtual void mousePress(View* view, QMouseEvent* event) {} virtual void mousePress(View* view, QMouseEvent* event);
virtual void mouseRelease(View* view, QMouseEvent* event) {} virtual void mouseRelease(View* view, QMouseEvent* event) {}
virtual void mouseMove(View* view, QMouseEvent* event) {} virtual void mouseMove(View* view, QMouseEvent* event) {}
virtual void wheelEvent(View* view, QWheelEvent* event) {} virtual void wheelEvent(View* view, QWheelEvent* event) {}
...@@ -100,6 +100,9 @@ public slots: ...@@ -100,6 +100,9 @@ public slots:
void attributeModified(unsigned int orbit, QString nameAttr); void attributeModified(unsigned int orbit, QString nameAttr);
void connectivityModified(); void connectivityModified();
signals:
void dartSelected(Dart d);
}; };
} // namespace SCHNApps } // namespace SCHNApps
......
...@@ -86,6 +86,22 @@ void RenderTopoSurfacePlugin::redraw(View* view) ...@@ -86,6 +86,22 @@ void RenderTopoSurfacePlugin::redraw(View* view)
} }
} }
void RenderTopoSurfacePlugin::mousePress(View* view, QMouseEvent* event)
{
// if (Shift())
// {
// ParameterSet* params = h_viewParams[view];
// m_renderTopo->updateData<PFP>(myMap, position, m_coeff_topo_explod[0], m_coeff_topo_explod[1], m_coeff_topo_explod[2], *m_selNoBoundary) ;
// Dart d = m_renderTopo->picking<PFP>(myMap, x, y, *m_selNoBoundary);
// if (d != Dart::nil())
// {
// emit(dartSelected(d);
// }
// }
}
void RenderTopoSurfacePlugin::viewLinked(View* view, Plugin* plugin) void RenderTopoSurfacePlugin::viewLinked(View* view, Plugin* plugin)
{ {
if(plugin == this) if(plugin == this)
......
...@@ -37,14 +37,17 @@ namespace Algo ...@@ -37,14 +37,17 @@ namespace Algo
namespace Volume namespace Volume
{ {
namespace DecimationVolumes namespace Decimation
{ {
enum ApproximatorType enum ApproximatorType
{ {
A_QEM, A_QEM,
A_MidEdge, A_MidEdge,
A_hHalfCollapse A_MidFace,
A_MidVolume,
A_hHalfEdgeCollapse,
A_QEM
}; };
template <typename PFP> template <typename PFP>
...@@ -63,7 +66,7 @@ public: ...@@ -63,7 +66,7 @@ public:
{} {}
virtual ~ApproximatorGen() virtual ~ApproximatorGen()
{} {}
virtual const std::string& getApproximatedAttributeName() const = 0 ; virtual const std::string& getApproximatedAttributeName(unsigned int index = 0) const = 0 ;
virtual ApproximatorType getType() const = 0 ; virtual ApproximatorType getType() const = 0 ;
virtual bool init() = 0 ; virtual bool init() = 0 ;
virtual void approximate(Dart d) = 0 ; virtual void approximate(Dart d) = 0 ;
...@@ -73,67 +76,101 @@ public: ...@@ -73,67 +76,101 @@ public:
} ; } ;
template <typename PFP, typename T> template <typename PFP, typename T, unsigned int ORBIT>
class Approximator : public ApproximatorGen<PFP> class Approximator : public ApproximatorGen<PFP>
{ {
public: public:
typedef typename PFP::MAP MAP ; typedef typename PFP::MAP MAP ;
typedef typename PFP::VEC3 VEC3 ;
typedef typename PFP::REAL REAL; typedef typename PFP::REAL REAL;
protected: protected:
Predictor<PFP, T>* m_predictor ; Predictor<PFP, T>* m_predictor ;
//Vertex attribute to be approximated std::vector<VertexAttribute<T>* > m_attrV ; // vertex attributes to be approximated
VertexAttribute<T>& m_attrV; std::vector<AttributeHandler<T,ORBIT> > m_approx ; // attributes to store approximation result
//Attribute to store approximation result std::vector<AttributeHandler<T,ORBIT> > m_detail ; // attributes to store detail information for reconstruction
EdgeAttribute<T> m_approx; std::vector<T> m_app ;
// attribute to store detail information for reconstruction
EdgeAttribute<T> m_detail ;
T m_app;
public: public:
Approximator(MAP& m, VertexAttribute<T>& a, Predictor<PFP, T>* predictor) : Approximator(MAP& m, std::vector<VertexAttribute<T>* > va, Predictor<PFP, T> * predictor) :
ApproximatorGen<PFP>(m), m_predictor(predictor), m_attrV(a) ApproximatorGen<PFP>(m), m_predictor(predictor), m_attrV(va)
{ {
std::stringstream aname ; const unsigned int& size = m_attrV.size() ;
aname << "approx_" << m_attrV.name() ; assert(size > 0 || !"Approximator: no attributes provided") ;
m_approx = this->m_map.template addAttribute<T, EDGE>(aname.str()) ;
m_approx.resize(size) ;
if(m_predictor) // if a predictor is associated to the approximator m_detail.resize(size) ;
{ // create an attribute to store the detail needed for reconstruction m_app.resize(size) ;
std::stringstream dname ;
dname << "detail_" << m_attrV.name() ; for (unsigned int i = 0 ; i < size ; ++i)
m_detail = this->m_map.template addAttribute<T, EDGE>(dname.str()) ; {
if (!m_attrV[i]->isValid())
std::cerr << "Approximator Warning: attribute number " << i << " is not valid" << std::endl ;
std::stringstream aname ;
aname << "approx_" << m_attrV[i]->name() ;
m_approx[i] = this->m_map.template addAttribute<T, ORBIT>(aname.str()) ;
if(m_predictor) // if predictors are associated to the approximator
{ // create attributes to store the details needed for reconstruction
std::stringstream dname ;
dname << "detail_" << m_attrV[i]->name() ;
m_detail[i] = this->m_map.template addAttribute<T, ORBIT>(dname.str()) ;
}
} }
} }
virtual ~Approximator() virtual ~Approximator()
{ {
this->m_map.template removeAttribute(m_approx) ; for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
{
if(m_predictor) this->m_map.template removeAttribute(m_approx[i]) ;
this->m_map.template removeAttribute(m_detail) ; if(m_predictor)
this->m_map.template removeAttribute(m_detail[i]) ;
}
} }
const std::string& getApproximatedAttributeName() const const std::string& getApproximatedAttributeName(unsigned int index = 0) const
{ {
return m_attrV.name() ; return m_attrV[index]->name() ;
} }
const T& getApprox(Dart d) const unsigned int getNbApproximated() const
{ {
return m_approx[d] ; return m_attrV.size() ;
} }
void saveApprox(Dart d) void saveApprox(Dart d)
{ {
m_app = m_approx[d] ; for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
m_app[i] = m_approx[i][d] ;
} }
void affectApprox(Dart d) void affectApprox(Dart d)
{ {
m_attrV[d] = m_app ; for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
m_attrV[i]->operator[](d) = m_app[i] ;
}
const T& getApprox(Dart d, unsigned int index = 0) const
{
return m_approx[index][d] ;
}
const VertexAttribute<T>& getAttr(unsigned int index = 0) const
{
return *(m_attrV[index]) ;
}
std::vector<T> getAllApprox(Dart d) const
{
std::vector<T> res ;
res.resize(m_attrV.size()) ;
for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
res[i] = m_approx[i][d] ;
return res ;
} }
const Predictor<PFP, T>* getPredictor() const const Predictor<PFP, T>* getPredictor() const
...@@ -144,9 +181,9 @@ public: ...@@ -144,9 +181,9 @@ public:
}; };
} // namespace DecimationVolumes } // namespace Decimation
} } // namespace Volume
} // namespace Algo } // namespace Algo
......
...@@ -39,7 +39,7 @@ namespace Algo ...@@ -39,7 +39,7 @@ namespace Algo
namespace Volume namespace Volume
{ {
namespace DecimationVolumes namespace Decimation
{ {
template <typename PFP> template <typename PFP>
...@@ -51,9 +51,9 @@ void decimate( ...@@ -51,9 +51,9 @@ void decimate(
unsigned int percentWantedVertices unsigned int percentWantedVertices
); );
} //namespace DecimationVolumes } //namespace Decimation
} } //namesapce Volume
} //namespace Algo } //namespace Algo
......
...@@ -31,7 +31,7 @@ namespace Algo ...@@ -31,7 +31,7 @@ namespace Algo
namespace Volume namespace Volume
{ {
namespace DecimationVolumes namespace Decimation
{ {
template <typename PFP> template <typename PFP>
...@@ -56,10 +56,10 @@ void decimate(typename PFP::MAP& map, SelectorType s, ApproximatorType a, ...@@ -56,10 +56,10 @@ void decimate(typename PFP::MAP& map, SelectorType s, ApproximatorType a,
switch(s) switch(s)
{ {
case S_MapOrder : case S_MapOrder :
selector = new Algo::DecimationVolumes::EdgeSelector_MapOrder<PFP>(map, position, approximators) ; selector = new Algo::Volume::Decimation::EdgeSelector_MapOrder<PFP>(map, position, approximators) ;
break ; break ;
case S_Random : case S_Random :
selector = new Algo::DecimationVolumes::EdgeSelector_Random<PFP>(map, position, approximators) ; selector = new Algo::Volume::Decimation::EdgeSelector_Random<PFP>(map, position, approximators) ;
break ; break ;
default: default:
CGoGNout << "not yet implemented" << CGoGNendl; CGoGNout << "not yet implemented" << CGoGNendl;
...@@ -122,9 +122,9 @@ void decimate(typename PFP::MAP& map, SelectorType s, ApproximatorType a, ...@@ -122,9 +122,9 @@ void decimate(typename PFP::MAP& map, SelectorType s, ApproximatorType a,
delete (*it) ; delete (*it) ;
} }
} //namespace DecimationVolumes } //namespace Decimation
} } //namespace Volume
} //namespace Algo } //namespace Algo
......
...@@ -15,7 +15,7 @@ namespace Algo ...@@ -15,7 +15,7 @@ namespace Algo
namespace Volume namespace Volume
{ {
namespace DecimationVolumes namespace Decimation
{ {
/* /*
...@@ -186,9 +186,9 @@ public: ...@@ -186,9 +186,9 @@ public:
} //end namespace DecimationVolumes } //end namespace Decimation
} } //namespace Volume
} //end namespace Algo } //end namespace Algo
......