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) ...@@ -137,21 +137,21 @@ void Clipping::slot_drawFaces(bool b)
void Clipping::slot_explodTopoPhi1(double c) void Clipping::slot_explodTopoPhi1(double c)
{ {
m_coeffTopoExplod[0] = (float)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(); updateGL();
} }
void Clipping::slot_explodTopoPhi2(double c) void Clipping::slot_explodTopoPhi2(double c)
{ {
m_coeffTopoExplod[1] = (float)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(); updateGL();
} }
void Clipping::slot_explodTopoPhi3(double c) void Clipping::slot_explodTopoPhi3(double c)
{ {
m_coeffTopoExplod[2] = (float)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(); updateGL();
} }
...@@ -830,7 +830,7 @@ void Clipping::importMesh(std::string& filename) ...@@ -830,7 +830,7 @@ void Clipping::importMesh(std::string& filename)
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<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) ; m_bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
gPosObj = m_bb.center() ; gPosObj = m_bb.center() ;
...@@ -859,7 +859,7 @@ void Clipping::cb_initGL() ...@@ -859,7 +859,7 @@ void Clipping::cb_initGL()
// create the render // create the render
m_render = new Algo::Render::GL2::MapRender(); 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 // create VBO for position
m_positionVBO = new Utils::VBO(); m_positionVBO = new Utils::VBO();
......
...@@ -91,7 +91,7 @@ public: ...@@ -91,7 +91,7 @@ public:
bool m_drawTopo; bool m_drawTopo;
Algo::Render::GL2::MapRender* m_render; 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; Geom::BoundingBox<PFP::VEC3> m_bb;
......
...@@ -369,7 +369,7 @@ void MyQT::cb_initGL() ...@@ -369,7 +369,7 @@ void MyQT::cb_initGL()
// create the render // create the render
m_render = new Algo::Render::GL2::MapRender(); 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(); m_ds = new Utils::Drawer();
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
// forward definitions (minimize includes) // forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } } 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 VBO; } }
namespace CGoGN { namespace Utils { class ShaderPhong; } } namespace CGoGN { namespace Utils { class ShaderPhong; } }
namespace CGoGN { namespace Utils { class ShaderSimpleColor; } } namespace CGoGN { namespace Utils { class ShaderSimpleColor; } }
...@@ -53,7 +53,7 @@ protected: ...@@ -53,7 +53,7 @@ protected:
public: public:
// render // render
Algo::Render::GL2::MapRender* m_render; Algo::Render::GL2::MapRender* m_render;
Algo::Render::GL2::TopoRenderMapD* m_render_topo; Algo::Render::GL2::TopoRender* m_render_topo;
// VBO // VBO
Utils::VBO* m_positionVBO; Utils::VBO* m_positionVBO;
......
...@@ -23,114 +23,32 @@ ...@@ -23,114 +23,32 @@
*******************************************************************************/ *******************************************************************************/
#include "tuto1.h" #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/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 ; 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 int main(int argc, char **argv)
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()
{ {
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); // // interface
glEnable(GL_CULL_FACE); QApplication app(argc, argv);
glEnable(GL_LIGHTING); MyQT sqt;
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);
glDisable(GL_POLYGON_OFFSET_FILL); // example code itself
} sqt.createMap();
}
void MyQT::cb_keyPress(int code) // set help message in menu
{ sqt.setHelpMsg("First Tuto: \nCreate two faces\nsew them\nand affect positions");
if ((code >65) && (code< 123 )) // final show for redraw
CGoGNout << " key char " << char(code) << "pressed"<< CGoGNendl; sqt.show();
// and wait for the end
if ((code >'0') && (code<='9')) return app.exec();
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
}
} }
int main(int argc, char **argv) void MyQT::createMap()
{ {
// creation of 2 new faces: 1 triangle and 1 square // creation of 2 new faces: 1 triangle and 1 square
Dart d1 = myMap.newFace(3); Dart d1 = myMap.newFace(3);
Dart d2 = myMap.newFace(4); Dart d2 = myMap.newFace(4);
...@@ -138,64 +56,45 @@ int main(int argc, char **argv) ...@@ -138,64 +56,45 @@ int main(int argc, char **argv)
// sew these faces along one of their edge // sew these faces along one of their edge
myMap.sewFaces(d1, d2); myMap.sewFaces(d1, d2);
// creation of a new attribute on vertices of type 3D vector // creation of a new attribute on vertices of type 3D vector for position.
// a handler to this attribute is returned // a handler to this attribute is returned (TVEC3 is a typdef of AttributeHandler<PFP::VEC3>)
position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position"); 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[d1] = PFP::VEC3(0, 0, 0);
position[myMap.phi1(d1)] = PFP::VEC3(2, 0, 0); position[PHI1(d1)] = PFP::VEC3(2, 0, 0);
position[myMap.phi_1(d1)] = PFP::VEC3(1, 2, 0); position[PHI_1(d1)] = PFP::VEC3(1, 2, 0);
position[PHI<11>(d2)] = PFP::VEC3(0, -2, 0);
position[myMap.phi<11>(d2)] = PFP::VEC3(0, -2, 0); position[PHI_1(d2)] = PFP::VEC3(2, -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");
// bounding box // bounding box of scene
Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position); 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)); 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); Geom::Vec3f lPosObj = (bb.min() + bb.max()) / PFP::REAL(2);
// envoit info BB a l'interface // send BB info to interface for centering on GL screen
sqt.setParamObject(lWidthObj, lPosObj.data()); setParamObject(lWidthObj, lPosObj.data());
// show 1 pour GL context // first show for be sure that GL context is binded
sqt.show(); show();
// update du VBO position (context GL necessaire)
sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // render the topo of the map without boundary darts
SelectorEdgeNoBoundary<PFP::MAP> insideEdges(myMap);// just to draw only inside edges 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); // initialization GL callback
sqt.m_render->initPrimitives<PFP>(myMap, insideEdges, Algo::Render::GL2::LINES); void MyQT::cb_initGL()
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::BOUNDARY); // special primitive for boundary edges {
// example of using boolean operator on Selectors m_render_topo = new Algo::Render::GL2::TopoRender() ;
sqt.m_render->initPrimitives<PFP>(myMap, ( SelectorFalse() || ( SelectorTrue() && (SelectorMarked(dm) && SelectorCellMarked(cm)))) , Algo::Render::GL2::POINTS); // special primitive for boundary edges }
// 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 @@ ...@@ -25,51 +25,67 @@
#ifndef _TUTO1_ #ifndef _TUTO1_
#define _TUTO1_ #define _TUTO1_
#include <iostream> //#define USE_GMAP
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
// forward definitions (minimize includes) #include "Topology/generic/parameters.h"
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } }
namespace CGoGN { namespace Utils { class VBO; } } #ifdef USE_GMAP
namespace CGoGN { namespace Utils { class ShaderSimpleColor; } } #include "Topology/gmap/embeddedGMap2.h"
#else
#include "Topology/map/embeddedMap2.h"
#endif
#include "Algo/Render/GL2/topoRender.h"
using namespace CGoGN ; 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 // definition of the type of the map
#ifdef USE_GMAP
public: typedef EmbeddedGMap2 MAP;
// render #else
Algo::Render::GL2::MapRender* m_render; 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_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; } // just for more compact writing
void cb_Save() { CGoGNout << "Rien a sauver ..." << CGoGNendl; } 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:
public slots: // example of simple map creation
void menu_slot1() { CGoGNout << "Exemple de menu" << CGoGNendl; } void createMap();
}; };
#endif #endif
...@@ -22,239 +22,176 @@ ...@@ -22,239 +22,176 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/mapBrowser.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/drawer.h"
#include "tuto2.h" #include "tuto2.h"
#include "Algo/Geometry/boundingbox.h"
using namespace CGoGN ; using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef Map2 MAP;
};
PFP::MAP myMap;
PFP::TVEC3 position ;
PFP::TVEC3 normal ;
AttributeHandler<Geom::Vec4f> color ;
void MyQT::cb_initGL() int main(int argc, char **argv)
{ {
// choose to use GL version 2 // // interface
Utils::GLSLShader::setCurrentOGLVersion(2); QApplication app(argc, argv);
MyQT sqt;
// create the render // copy output tout Qt console of application (shift enter)
m_render = new Algo::Render::GL2::MapRender(); CGoGNout.toConsole(&sqt);
// 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_color = Geom::Vec4f(0.,1.,0.,0.);
m_shader->setColor(m_color);
registerShader(m_shader); // example code itself
sqt.createMap();
// set help message in menu
sqt.setHelpMsg("Tuto 2: \nCreate and use multiple attributes\nrender with multiple shaders");
m_with_lines = true; // final show for redraw
m_line_width = 4.0; sqt.show();
// and wait for the end
return app.exec();
} }
void MyQT::cb_redraw()
{
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glEnable(GL_LIGHTING);
if (m_shader)
{
if (m_with_lines)
{
glLineWidth(m_line_width);
m_shader->setColor(Geom::Vec4f(1.,1.,0.,0.));
m_render->draw(m_shader, Algo::Render::GL2::LINES);
}
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0f, 1.0f);
m_shader->setColor(m_color);
m_render->draw(m_shader, Algo::Render::GL2::TRIANGLES);
glDisable(GL_POLYGON_OFFSET_FILL);
}
}
void MyQT::lines_slot(bool x) void MyQT::createMap()
{ {
m_with_lines = x;
updateGL();
}
void MyQT::line_width_slot(int x) // creation of 2 new faces: 1 triangle and 1 square, sew and embed (see tuto1 for details)
{ Dart d1 = myMap.newFace(3);
Dart d2 = myMap.newFace(4);
myMap.sewFaces(d1, d2);
PFP::TVEC3 position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
position[d1] = PFP::VEC3(0, 0, 0);
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);
m_line_width=x;
updateGL();
}
void MyQT::color_slot() // create another attribute on vertices (for faces drawing)
{ AttributeHandler<Geom::Vec3f> colorF = myMap.addAttribute<PFP::VEC3>(VERTEX, "colorF");
QColor col = QColorDialog::getColor ();
if (col.isValid())
{