Commit e207d5be authored by Jund Thomas's avatar Jund Thomas
Browse files

Merge cgogn.unistra.fr:~thery/CGoGN

parents b7042bdc 2cb5349c
......@@ -23,6 +23,7 @@
*******************************************************************************/
#include "clipping.h"
#include "Utils/vbo.h"
#include "Utils/static_assert.h"
/*******************************************************************************
......
......@@ -35,6 +35,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <glm/gtc/type_ptr.hpp>
......
......@@ -40,6 +40,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <vector>
......
......@@ -38,6 +38,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/MC/marchingcube.h"
......
......@@ -25,6 +25,7 @@
#include "texturesExample.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h"
#include "Utils/vbo.h"
TexView::TexView():
m_render(NULL),
......
......@@ -46,7 +46,7 @@
#include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/pointSprite.h"
#include "Utils/text3d.h"
#include "Utils/vboRender.h"
#include "Utils/vbo.h"
#include "Utils/Qt/qtInputs.h"
......
......@@ -41,6 +41,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
using namespace CGoGN ;
......
......@@ -45,7 +45,7 @@
#include "Topology/generic/cellmarker.h"
#include "Utils/text3d.h"
#include "Utils/vbo.h"
#include "Utils/pointSprite.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h"
......
......@@ -35,7 +35,7 @@
#include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
#include "Algo/Histogram/histogram.h"
#include "Utils/Qt/qthistodraw.h"
......
......@@ -37,6 +37,7 @@
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/vbo.h"
#include "Utils/cgognStream.h"
#include "Utils/Qt/qtSimple.h"
......
......@@ -33,7 +33,7 @@
#include "Topology/generic/cellmarker.h"
#include "Geometry/vector_gen.h"
#include "Utils/colorMaps.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
namespace CGoGN
......
......@@ -29,7 +29,7 @@
#include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
#include "Utils/GLSLShader.h"
......
......@@ -31,7 +31,7 @@
#include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
#include "Utils/Shaders/shaderExplodeVolumes.h"
#include "Utils/Shaders/shaderExplodeVolumesLines.h"
......
......@@ -33,13 +33,13 @@
#include <set>
#include <utility>
#include "Utils/gl_def.h"
#include "Topology/generic/dart.h"
#include "Topology/generic/functor.h"
#include "Topology/generic/attributeHandler.h"
#include "Container/convert.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
// forward definition
namespace CGoGN { namespace Utils { class GLSLShader; } }
......
......@@ -27,7 +27,7 @@
#include "Topology/generic/cellmarker.h"
#include "Topology/generic/traversorCell.h"
#include "Utils/vbo.h"
//#include "Utils/vbo.h"
#include "Geometry/intersection.h"
#include "Algo/Geometry/normal.h"
......
......@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
#include "Utils/svg.h"
// forward
......
......@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
#include "Utils/svg.h"
// forward
......
......@@ -39,6 +39,11 @@ class EmbeddedGMap2 : public GMap2
public:
typedef GMap2 TOPO_MAP;
/**
* create a new face with managed embeddings
*/
virtual Dart newFace(unsigned int nbEdges, bool withBoundary = true) ;
/**
* The attributes attached to the old vertex are duplicated on both resulting vertices
* No attribute is attached to the new edge
......
......@@ -50,7 +50,8 @@ inline unsigned int GMap0::dimension() const
inline void GMap0::clear(bool removeAttrib)
{
AttribMap::clear(removeAttrib) ;
init() ;
if (removeAttrib)
init() ;
}
inline void GMap0::update_topo_shortcuts()
......
......@@ -31,8 +31,9 @@
#include "Utils/gl_def.h"
#include "Utils/os_spec.h"
#include "Utils/vbo.h"
#include "Utils/vbo_base.h"
#include "Utils/gl_matrices.h"
#include "Utils/cgognStream.h"
#include "glm/glm.hpp"
#include <GL/glew.h>
......
Supports Markdown
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