remove dependancies

Apps/Examples/clipping.cpp

@@ -23,6 +23,7 @@
 *******************************************************************************/
 
 #include "clipping.h"
+#include "Utils/vbo.h"
 #include "Utils/static_assert.h"
 
 /*******************************************************************************

Apps/Examples/concave_rendering.cpp

@@ -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>
 

Apps/Examples/extrusionView.cpp

@@ -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>
 

Apps/Examples/mcmesh.h

@@ -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"

Apps/Examples/texturesExample.cpp

@@ -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),

Apps/Examples/viewer.h

@@ -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"
 

Apps/Tuto/tuto2.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 ;

Apps/Tuto/tuto5.h

@@ -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"

Apps/Tuto/tuto_histo.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"

Apps/Tuto/tuto_mt.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"
 

include/Algo/Histogram/histogram.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

include/Algo/Render/GL2/colorPerFaceRender.h

@@ -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"
 
 

include/Algo/Render/GL2/explodeVolumeRender.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"
 

include/Algo/Render/GL2/mapRender.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; } }

include/Algo/Render/GL2/mapRender.hpp

@@ -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"

include/Algo/Render/GL2/topo3Render.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

include/Algo/Render/GL2/topoRender.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

include/Utils/GLSLShader.h

@@ -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>

include/Utils/frameManipulator.h

@@ -26,7 +26,7 @@
 #ifndef __FRAMEMANIPULATOR_H_
 #define __FRAMEMANIPULATOR_H_
 
-#include "Utils/vbo.h"
+#include "Utils/vbo_base.h"
 #include "glm/glm.hpp"
 #include "Utils/Shaders/shaderSimpleColor.h"
 #include "Utils/pickables.h"

include/Utils/pickables.h

@@ -26,7 +26,7 @@
 #ifndef __PICKABLES_H_
 #define __PICKABLES_H_
 
-#include "Utils/vbo.h"
+#include "Utils/vbo_base.h"
 #include "glm/glm.hpp"
 #include "Utils/Shaders/shaderColorPerVertex.h"
 #include "Utils/Shaders/shaderSimpleColor.h"