Commit 917a9c5a authored by Thery Sylvain's avatar Thery Sylvain
Browse files

remove dependancies

parent 66f66943
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*******************************************************************************/ *******************************************************************************/
#include "clipping.h" #include "clipping.h"
#include "Utils/vbo.h"
#include "Utils/static_assert.h" #include "Utils/static_assert.h"
/******************************************************************************* /*******************************************************************************
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include <vector> #include <vector>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/vbo.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/MC/marchingcube.h" #include "Algo/MC/marchingcube.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "texturesExample.h" #include "texturesExample.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h" #include "Algo/Modelisation/polyhedron.h"
#include "Utils/vbo.h"
TexView::TexView(): TexView::TexView():
m_render(NULL), m_render(NULL),
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "Utils/Shaders/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/pointSprite.h" #include "Utils/pointSprite.h"
#include "Utils/text3d.h" #include "Utils/text3d.h"
#include "Utils/vboRender.h" #include "Utils/vbo.h"
#include "Utils/Qt/qtInputs.h" #include "Utils/Qt/qtInputs.h"
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "Topology/generic/cellmarker.h" #include "Topology/generic/cellmarker.h"
#include "Utils/text3d.h" #include "Utils/text3d.h"
#include "Utils/vbo.h"
#include "Utils/pointSprite.h" #include "Utils/pointSprite.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h"
#include "Algo/Histogram/histogram.h" #include "Algo/Histogram/histogram.h"
#include "Utils/Qt/qthistodraw.h" #include "Utils/Qt/qthistodraw.h"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/vbo.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Topology/generic/cellmarker.h" #include "Topology/generic/cellmarker.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/colorMaps.h" #include "Utils/colorMaps.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
namespace CGoGN namespace CGoGN
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "Topology/generic/dart.h" #include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h" #include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h" #include "Topology/generic/functor.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "Utils/GLSLShader.h" #include "Utils/GLSLShader.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "Topology/generic/dart.h" #include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h" #include "Topology/generic/attributeHandler.h"
#include "Topology/generic/functor.h" #include "Topology/generic/functor.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "Utils/Shaders/shaderExplodeVolumes.h" #include "Utils/Shaders/shaderExplodeVolumes.h"
#include "Utils/Shaders/shaderExplodeVolumesLines.h" #include "Utils/Shaders/shaderExplodeVolumesLines.h"
......
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
#include <set> #include <set>
#include <utility> #include <utility>
#include "Utils/gl_def.h"
#include "Topology/generic/dart.h" #include "Topology/generic/dart.h"
#include "Topology/generic/functor.h" #include "Topology/generic/functor.h"
#include "Topology/generic/attributeHandler.h" #include "Topology/generic/attributeHandler.h"
#include "Container/convert.h" #include "Container/convert.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/vbo.h"
// forward definition // forward definition
namespace CGoGN { namespace Utils { class GLSLShader; } } namespace CGoGN { namespace Utils { class GLSLShader; } }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "Topology/generic/cellmarker.h" #include "Topology/generic/cellmarker.h"
#include "Topology/generic/traversorCell.h" #include "Topology/generic/traversorCell.h"
#include "Utils/vbo.h" //#include "Utils/vbo.h"
#include "Geometry/intersection.h" #include "Geometry/intersection.h"
#include "Algo/Geometry/normal.h" #include "Algo/Geometry/normal.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h" #include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "Utils/svg.h" #include "Utils/svg.h"
// forward // forward
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Topology/generic/functor.h" #include "Topology/generic/functor.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "Utils/svg.h" #include "Utils/svg.h"
// forward // forward
......
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
#include "Utils/gl_def.h" #include "Utils/gl_def.h"
#include "Utils/os_spec.h" #include "Utils/os_spec.h"
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "Utils/gl_matrices.h" #include "Utils/gl_matrices.h"
#include "Utils/cgognStream.h"
#include "glm/glm.hpp" #include "glm/glm.hpp"
#include <GL/glew.h> #include <GL/glew.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#ifndef __FRAMEMANIPULATOR_H_ #ifndef __FRAMEMANIPULATOR_H_
#define __FRAMEMANIPULATOR_H_ #define __FRAMEMANIPULATOR_H_
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "glm/glm.hpp" #include "glm/glm.hpp"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/pickables.h" #include "Utils/pickables.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#ifndef __PICKABLES_H_ #ifndef __PICKABLES_H_
#define __PICKABLES_H_ #define __PICKABLES_H_
#include "Utils/vbo.h" #include "Utils/vbo_base.h"
#include "glm/glm.hpp" #include "glm/glm.hpp"
#include "Utils/Shaders/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
......
Markdown is supported
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