Commit a002cfca authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

New folder for shaders in Utils/Shaders/

parent e9198c9b
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include <vector> #include <vector>
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
using namespace CGoGN; using namespace CGoGN;
......
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
#include "Algo/Import/import.h" #include "Algo/Import/import.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/shaderPhong.h" #include "Utils/Shaders/shaderPhong.h"
#include "Utils/drawer.h" #include "Utils/drawer.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/drawer.h" #include "Utils/drawer.h"
......
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include "tuto3.h" #include "tuto3.h"
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Algo/Render/GL2/topoRender.h" #include "Algo/Render/GL2/topoRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Algo/Modelisation/primitives3d.h" #include "Algo/Modelisation/primitives3d.h"
#include "Algo/Modelisation/polyhedron.h" #include "Algo/Modelisation/polyhedron.h"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "Utils/text3d.h" #include "Utils/text3d.h"
#include "Utils/pointSprite.h" #include "Utils/pointSprite.h"
#include "Utils/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
#include "Algo/Render/SVG/mapSVGRender.h" #include "Algo/Render/SVG/mapSVGRender.h"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/shaderPhong.h" #include "Utils/Shaders/shaderPhong.h"
#include <QApplication> #include <QApplication>
#include <QDesktopWidget> #include <QDesktopWidget>
......
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
#include "Algo/Render/GL2/topo3Render.h" #include "Algo/Render/GL2/topo3Render.h"
#include "Topology/generic/dart.h" #include "Topology/generic/dart.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include <string.h> #include <string.h>
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
*******************************************************************************/ *******************************************************************************/
#include "Algo/Render/GL2/topoRender.h" #include "Algo/Render/GL2/topoRender.h"
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
*******************************************************************************/ *******************************************************************************/
#include <GL/glew.h> #include <GL/glew.h>
#include "Utils/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include <GL/glew.h> #include <GL/glew.h>
#include "Utils/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*******************************************************************************/ *******************************************************************************/
#include <GL/glew.h> #include <GL/glew.h>
#include "Utils/shaderPhong.h" #include "Utils/Shaders/shaderPhong.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*******************************************************************************/ *******************************************************************************/
#include <GL/glew.h> #include <GL/glew.h>
#include "Utils/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*******************************************************************************/ *******************************************************************************/
#include <GL/glew.h> #include <GL/glew.h>
#include "Utils/shaderVectorPerVertex.h" #include "Utils/Shaders/shaderVectorPerVertex.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
*******************************************************************************/ *******************************************************************************/
#include "Utils/drawer.h" #include "Utils/drawer.h"
#include "Utils/shaderColorPerVertex.h" #include "Utils/Shaders/shaderColorPerVertex.h"
#include "Utils/vbo.h" #include "Utils/vbo.h"
namespace CGoGN namespace CGoGN
......
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