Commit 8da97c52 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge cgogn:~thery/CGoGN

parents dd6cef5c c4c86f8d
......@@ -137,21 +137,21 @@ void Clipping::slot_drawFaces(bool b)
void Clipping::slot_explodTopoPhi1(double c)
{
m_coeffTopoExplod[0] = (float)c;
m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
updateGL();
}
void Clipping::slot_explodTopoPhi2(double c)
{
m_coeffTopoExplod[1] = (float)c;
m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
updateGL();
}
void Clipping::slot_explodTopoPhi3(double c)
{
m_coeffTopoExplod[2] = (float)c;
m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
updateGL();
}
......@@ -830,7 +830,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, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
m_bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
gPosObj = m_bb.center() ;
......@@ -859,7 +859,7 @@ void Clipping::cb_initGL()
// create the render
m_render = new Algo::Render::GL2::MapRender();
m_render_topo = new Algo::Render::GL2::Topo3RenderMapD();
m_render_topo = new Algo::Render::GL2::Topo3Render();
// create VBO for position
m_positionVBO = new Utils::VBO();
......
......@@ -91,7 +91,7 @@ public:
bool m_drawTopo;
Algo::Render::GL2::MapRender* m_render;
Algo::Render::GL2::Topo3RenderMapD* m_render_topo;
Algo::Render::GL2::Topo3Render* m_render_topo;
Geom::BoundingBox<PFP::VEC3> m_bb;
......
......@@ -369,7 +369,7 @@ void MyQT::cb_initGL()
// create the render
m_render = new Algo::Render::GL2::MapRender();
m_render_topo = new Algo::Render::GL2::TopoRenderMapD() ;
m_render_topo = new Algo::Render::GL2::TopoRender() ;
m_ds = new Utils::Drawer();
......
......@@ -31,7 +31,7 @@
// forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } }
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class TopoRenderMapD; } } } }
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class TopoRender; } } } }
namespace CGoGN { namespace Utils { class VBO; } }
namespace CGoGN { namespace Utils { class ShaderPhong; } }
namespace CGoGN { namespace Utils { class ShaderSimpleColor; } }
......@@ -53,7 +53,7 @@ protected:
public:
// render
Algo::Render::GL2::MapRender* m_render;
Algo::Render::GL2::TopoRenderMapD* m_render_topo;
Algo::Render::GL2::TopoRender* m_render_topo;
// VBO
Utils::VBO* m_positionVBO;
......
......@@ -23,114 +23,32 @@
*******************************************************************************/
#include "tuto1.h"
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
#include "Algo/Import/import.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include <glm/gtc/type_ptr.hpp>
#include "Algo/Render/SVG/mapSVGRender.h"
using namespace CGoGN ;
/**
* Struct that contains some informations about the types of the manipulated objects
* Mainly here to be used by the algorithms that are parameterized by it
*/
struct PFP: public PFP_STANDARD
{
// definition of the type of the map
typedef EmbeddedMap2 MAP;
};
// declaration of the map
PFP::MAP myMap;
// and attribute of position
AttributeHandler<PFP::VEC3> position;
void MyQT::cb_initGL()
{
// choose to use GL version 2
Utils::GLSLShader::setCurrentOGLVersion(2);
// create the render
m_render = new Algo::Render::GL2::MapRender();
// create VBO for position
m_positionVBO = new Utils::VBO();
// using simple shader with color
m_shader = new Utils::ShaderSimpleColor();
m_shader->setAttributePosition(m_positionVBO);
m_shader->setColor(Geom::Vec4f(0.0f, 1.0f, 0.0f, 0.0f));
registerShader(m_shader);
}
void MyQT::cb_redraw()
int main(int argc, char **argv)
{
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glEnable(GL_CULL_FACE);
glEnable(GL_LIGHTING);
if (m_shader)
{
glLineWidth(2.0f);
m_shader->setColor(Geom::Vec4f(1.,1.,0.,0.));
m_render->draw(m_shader, Algo::Render::GL2::LINES);
m_shader->setColor(Geom::Vec4f(0.,1.,1.,0.));
m_render->draw(m_shader, Algo::Render::GL2::BOUNDARY);
glPointSize(7.0f);
m_shader->setColor(Geom::Vec4f(1.,1.,1.,0.));
m_render->draw(m_shader, Algo::Render::GL2::POINTS);
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0f, 1.0f);
m_shader->setColor(Geom::Vec4f(0.,1.,0.,0.));
m_render->draw(m_shader, Algo::Render::GL2::TRIANGLES);
// // interface
QApplication app(argc, argv);
MyQT sqt;
glDisable(GL_POLYGON_OFFSET_FILL);
}
}
// example code itself
sqt.createMap();
void MyQT::cb_keyPress(int code)
{
if ((code >65) && (code< 123 ))
CGoGNout << " key char " << char(code) << "pressed"<< CGoGNendl;
if ((code >'0') && (code<='9'))
CGoGNout << " key num " << code-'0' << "pressed"<< CGoGNendl;
if (code == 's')
{
std::string filename = selectFileSave("Export SVG file ");
CGoGNout << "Exporting "<<filename<<CGoGNendl;
Algo::Render::SVG::SVGOut svg(filename,modelViewMatrix(),projectionMatrix());
svg.renderLinesToSVG<PFP>(myMap,position);
svg.setColor(Geom::Vec3f(0.7f,0.0f,0.4f));
svg.renderFacesToSVG<PFP>(myMap,position,0.8f);
//svg destruction close the file
}
// set help message in menu
sqt.setHelpMsg("First Tuto: \nCreate two faces\nsew them\nand affect positions");
// final show for redraw
sqt.show();
// and wait for the end
return app.exec();
}
int main(int argc, char **argv)
void MyQT::createMap()
{
// creation of 2 new faces: 1 triangle and 1 square
Dart d1 = myMap.newFace(3);
Dart d2 = myMap.newFace(4);
......@@ -138,64 +56,45 @@ int main(int argc, char **argv)
// sew these faces along one of their edge
myMap.sewFaces(d1, d2);
// creation of a new attribute on vertices of type 3D vector
// a handler to this attribute is returned
position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
// creation of a new attribute on vertices of type 3D vector for position.
// a handler to this attribute is returned (TVEC3 is a typdef of AttributeHandler<PFP::VEC3>)
PFP::TVEC3 position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
//warning: at the end of scope of variable position, handler is destroyed but attribute stay
// affect a position to the vertices of the mesh
// affect position by moving in the map
position[d1] = PFP::VEC3(0, 0, 0);
position[myMap.phi1(d1)] = PFP::VEC3(2, 0, 0);
position[myMap.phi_1(d1)] = PFP::VEC3(1, 2, 0);
position[myMap.phi<11>(d2)] = PFP::VEC3(0, -2, 0);
position[myMap.phi_1(d2)] = PFP::VEC3(2, -2, 0);
// interface:
QApplication app(argc, argv);
MyQT sqt;
// ajout entree dans le menu application
sqt.add_menu_entry("entree1", SLOT(menu_slot1()));
// message d'aide
sqt.setHelpMsg("First Tuto:\n"
"create 2 faces\n"
"and sew them \n"
"simple interface in Qt");
position[PHI1(d1)] = PFP::VEC3(2, 0, 0);
position[PHI_1(d1)] = PFP::VEC3(1, 2, 0);
position[PHI<11>(d2)] = PFP::VEC3(0, -2, 0);
position[PHI_1(d2)] = PFP::VEC3(2, -2, 0);
// bounding box
// bounding box of scene
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);
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);
// envoit info BB a l'interface
sqt.setParamObject(lWidthObj, lPosObj.data());
// send BB info to interface for centering on GL screen
setParamObject(lWidthObj, lPosObj.data());
// show 1 pour GL context
sqt.show();
// update du VBO position (context GL necessaire)
sqt.m_positionVBO->updateData(position);
// first show for be sure that GL context is binded
show();
// update des primitives du renderer
SelectorEdgeNoBoundary<PFP::MAP> insideEdges(myMap);// just to draw only inside edges
// 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);
}
DartMarker dm(myMap);
dm.markOrbit(VERTEX,d2);
dm.markOrbit(VERTEX,d1);
CellMarker cm(myMap,FACE);
cm.mark(d2);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, insideEdges, Algo::Render::GL2::LINES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::BOUNDARY); // special primitive for boundary edges
// example of using boolean operator on Selectors
sqt.m_render->initPrimitives<PFP>(myMap, ( SelectorFalse() || ( SelectorTrue() && (SelectorMarked(dm) && SelectorCellMarked(cm)))) , Algo::Render::GL2::POINTS); // special primitive for boundary edges
// initialization GL callback
void MyQT::cb_initGL()
{
m_render_topo = new Algo::Render::GL2::TopoRender() ;
}
// redraw GL callback (clear and swap already done)
void MyQT::cb_redraw()
{
m_render_topo->drawTopo();
}
// show final pour premier redraw
sqt.show();
// et on attend la fin.
return app.exec();
}
......@@ -25,51 +25,67 @@
#ifndef _TUTO1_
#define _TUTO1_
#include <iostream>
//#define USE_GMAP
#include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h"
// forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } }
namespace CGoGN { namespace Utils { class VBO; } }
namespace CGoGN { namespace Utils { class ShaderSimpleColor; } }
#include "Topology/generic/parameters.h"
#ifdef USE_GMAP
#include "Topology/gmap/embeddedGMap2.h"
#else
#include "Topology/map/embeddedMap2.h"
#endif
#include "Algo/Render/GL2/topoRender.h"
using namespace CGoGN ;
/**
* A class for a little interface and rendering
* Struct that contains some informations about the types of the manipulated objects
* Mainly here to be used by the algorithms that are parameterized by it
*/
class MyQT : public Utils::QT::SimpleQT
struct PFP: public PFP_STANDARD
{
Q_OBJECT
public:
// render
Algo::Render::GL2::MapRender* m_render;
// definition of the type of the map
#ifdef USE_GMAP
typedef EmbeddedGMap2 MAP;
#else
typedef EmbeddedMap2 MAP;
#endif
};
// VBO
Utils::VBO* m_positionVBO;
// shader basic
Utils::ShaderSimpleColor* m_shader;
MyQT() : m_render(NULL), m_positionVBO(NULL), m_shader(NULL)
{}
class MyQT: public Utils::QT::SimpleQT
{
Q_OBJECT
public:
MyQT():m_render_topo(NULL) {}
// callbacks of simpleQT to overdefine:
void cb_redraw();
void cb_initGL();
void cb_redraw();
protected:
// declaration of the map
PFP::MAP myMap;
void cb_keyPress(int code);
// render (for the topo)
Algo::Render::GL2::TopoRender* m_render_topo;
void cb_New() { CGoGNout << "New ..." << CGoGNendl; }
void cb_Save() { CGoGNout << "Rien a sauver ..." << CGoGNendl; }
// just for more compact writing
inline Dart PHI1(Dart d) {return myMap.phi1(d);}
inline Dart PHI_1(Dart d) {return myMap.phi_1(d);}
inline Dart PHI2(Dart d) {return myMap.phi2(d);}
template<int X>
Dart PHI(Dart d) {return myMap.phi<X>(d);}
// callbacks (slots) locally defined
public slots:
void menu_slot1() { CGoGNout << "Exemple de menu" << CGoGNendl; }
public:
// example of simple map creation
void createMap();
};
#endif
This diff is collapsed.
......@@ -25,58 +25,81 @@
#ifndef _TUTO2_
#define _TUTO2_
#include <iostream>
//#define USE_GMAP
#include "Utils/Qt/qtSimple.h"
#include "ui_tuto2.h"
#include "Utils/Qt/qtui.h"
#include "Utils/cgognStream.h"
#include "Topology/generic/parameters.h"
#ifdef USE_GMAP
#include "Topology/gmap/embeddedGMap2.h"
#else
#include "Topology/map/embeddedMap2.h"
#endif
#include "Geometry/vector_gen.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
// forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } }
namespace CGoGN { namespace Utils { class VBO; } }
namespace CGoGN { namespace Utils { class ShaderSimpleColor; } }
using namespace CGoGN ;
/**
* Utilisation de designer-qt4:
* Faire un DockWiget (laisser le nom par defaut
* dans le Contents ajouter le layout choisi (vertical classiquement)
* Ajouter les widgets necessaires, mettre des noms clairs pour
* les utiliser dans le .cpp (pour les call back principalement)
* Struct that contains some informations about the types of the manipulated objects
* Mainly here to be used by the algorithms that are parameterized by it
*/
struct PFP: public PFP_STANDARD
{
// definition of the type of the map
#ifdef USE_GMAP
typedef EmbeddedGMap2 MAP;
#else
typedef EmbeddedMap2 MAP;
#endif
};
class MyQT: public Utils::QT::SimpleQT
{
Q_OBJECT
public:
MyQT(): m_render(NULL), m_positionVBO(NULL), m_shader(NULL) {}
bool m_with_lines;
Geom::Vec4f m_color;
int m_line_width;
void cb_redraw();
void cb_initGL();
protected:
// declaration of the map
PFP::MAP myMap;
// render (for the topo)
// Algo::Render::GL2::TopoRenderMapD* m_render_topo;
public:
// render
Algo::Render::GL2::MapRender* m_render;
// VBO
Utils::VBO* m_positionVBO;
Utils::VBO* m_positionVBO; // position 3D
Utils::VBO* m_colorVBO1; // color per vertex for face drawing
Utils::VBO* m_colorVBO2; // color per vertex for edge drawing
// shader basic
//shaders
Utils::ShaderSimpleColor* m_shader;
Utils::ShaderColorPerVertex* m_shader2;
MyQT():m_render(NULL), m_positionVBO(NULL), m_shader(NULL)
{}
// just for more compact writing
inline Dart PHI1(Dart d) {return myMap.phi1(d);}
inline Dart PHI_1(Dart d) {return myMap.phi_1(d);}
inline Dart PHI2(Dart d) {return myMap.phi2(d);}
template<int X>
Dart PHI(Dart d) {return myMap.phi<X>(d);}
void cb_redraw();
public:
// example of simple map creation
void createMap();
};
void cb_initGL();
// slots locaux
public slots:
void lines_slot(bool x);
void line_width_slot(int x);
void color_slot();
};
#endif
......@@ -22,219 +22,164 @@
* *
*******************************************************************************/
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/cellmarker.h"
#include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "tuto3.h"
MyQT* sqt1_ptr;
MyQT* sqt2_ptr;
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Selection/raySelector.h"
#include "Algo/Modelisation/polyhedron.h"
using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef Map2 MAP;
};
void MyQT::cb_initGL()
int main(int argc, char **argv)
{
// choose to use GL version 2
Utils::GLSLShader::setCurrentOGLVersion(2);
// // interface
QApplication app(argc, argv);
MyQT sqt;
// copy output tout Qt console of application (shift enter)
CGoGNout.toConsole(&sqt);
// create the render
m_render = new Algo::Render::GL2::MapRender();
// example code itself
sqt.createMap();
// create VBO for position
m_positionVBO = new Utils::VBO();
m_colorVBO = new Utils::VBO();
sqt.traverseMap();
// using simple shader with color
m_shader = new Utils::ShaderSimpleColor();
m_shader->setAttributePosition(m_positionVBO);
// set help message in menu
sqt.setHelpMsg("Tuto 3: \nUsage of DartMarker and CellMarker\nPick of dart with mouse");
// final show for redraw
sqt.show();
m_shader2 = new Utils::ShaderColorPerVertex();
m_shader2->setAttributePosition(m_positionVBO);
m_shader2->setAttributeColor(m_colorVBO);
CGoGNout << "You can pick darts dans see it's id with left mouse button"<< CGoGNendl;
registerShader(m_shader);
registerShader(m_shader2);
// and wait for the end
return app.exec();
}
void MyQT::cb_redraw()
void MyQT::traverseMap()
{
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glLineWidth(2.0f);
m_shader->setColor(Geom::Vec4f(1.,1.,0.,0.));
m_render->draw(m_shader, Algo::Render::GL2::LINES);
//traverse cells of map using topological markers on darts
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0f, 1.0f);
m_render->draw(m_shader2, Algo::Render::GL2::TRIANGLES);
glDisable(GL_POLYGON_OFFSET_FILL);
}
void MyQT::cb_keyPress(int code)
{
switch(code)
CGoGNout << "Traverse with DartMarkers:"<< CGoGNendl;
DartMarker dmV(myMap);
DartMarker dmE(myMap);
DartMarker dmF(myMap);
for (Dart d = myMap.begin(); d != myMap.end(); myMap.next(d))
{
case 's':
if (this == sqt2_ptr)
sqt1_ptr->synchronize(sqt2_ptr);
if (this == sqt1_ptr)
sqt2_ptr->synchronize(sqt1_ptr);
break;
if (!dmV.isMarked(d))
{
CGoGNout << "Vertex of dart "<<d<<CGoGNendl;
dmV.markOrbit(VERTEX,d);
}
if (!dmE.isMarked(d))
{
CGoGNout << "Edgee of dart "<<d<<CGoGNendl;
dmE.markOrbit(EDGE,d);
}
if (!dmF.isMarked(d))
{
CGoGNout << "Face of dart "<<d<<CGoGNendl;
dmF.markOrbit(FACE,d);
}
}
}
int main(int argc, char **argv)
{
PFP::MAP myMap;
PFP::TVEC3 position ;
PFP::TVEC3 normal ;
AttributeHandler<Geom::Vec3f> color ;
Dart d2 = myMap.newFace(3);
Dart d3 = myMap.newFace(4);
myMap.sewFaces(d2,d3);
// traverses cells of map with markers on embedded cells.
// More efficients but more memory costly if cells are not already embedded.
// Avoid using construction of objects not ell embedded
position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
color = myMap.addAttribute<PFP::VEC3>(VERTEX, "couleur");
position[d2] = PFP::VEC3(0.0f, 0.0f, 0.0f);
color[d2] = PFP::VEC3(1.0f, 0.0f, 0.0f);
d2 = myMap.phi1(d2);
position[d2] = PFP::VEC3(2.0f, 0.0f, 0.0f);
color[d2] = PFP::VEC3(0.0f, 1.0f, 0.0f);
d2 = myMap.phi1(d2);
position[d2] = PFP::VEC3(1.0f, 3.0f, 0.0f);
color[d2] = PFP::VEC3(0.0f, 0.0f, 1.0f);
d2 = myMap.phi1(d2);
d3 = myMap.phi<11>(d3);
position[d3] = PFP::VEC3(0.0f, -2.0f, 0.0f);
color[d3] = PFP::VEC3(1.0f, 0.0f, 1.0f);
d3 = myMap.phi1(d3);
position[d3] = PFP::VEC3(2.0f, -2.0f, 0.0f);
color[d3] = PFP::VEC3(0.0f, 1.0f, 1.0f);
d3 = myMap.phi1(d3);
//MARK !!!
// on reserve des marqueur de brins
DartMarkerStore mf(myMap);