New folder for shaders in Utils/Shaders/

Apps/Examples/extrusionView.cpp

@@ -39,8 +39,8 @@
 #include "Topology/generic/parameters.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderFlat.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include <vector>
 

Apps/Examples/polyhedronsView.cpp

@@ -39,8 +39,8 @@
 #include "Topology/generic/parameters.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderFlat.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 using namespace CGoGN;
 

Apps/Tuto/tp_master.cpp

@@ -44,8 +44,8 @@
 #include "Algo/Import/import.h"
 #include "Algo/Geometry/boundingbox.h"
 
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 #include "Utils/drawer.h"
 

Apps/Tuto/tuto1.cpp

@@ -35,7 +35,7 @@
 #include "Algo/Geometry/boundingbox.h"
 
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include <glm/gtc/type_ptr.hpp>
 

Apps/Tuto/tuto2.cpp

@@ -30,7 +30,7 @@
 
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include "Utils/drawer.h"
 

Apps/Tuto/tuto3.cpp

@@ -31,8 +31,9 @@
 #include "Geometry/vector_gen.h"
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 #include "tuto3.h"
 

Apps/Tuto/tuto4.cpp

@@ -37,8 +37,8 @@
 
 #include "Algo/Render/GL2/mapRender.h"
 #include "Algo/Render/GL2/topoRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderFlat.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderFlat.h"
 
 #include "Utils/cgognStream.h"
 

Apps/Tuto/tuto5.cpp

@@ -34,7 +34,7 @@
 #include "Geometry/vector_gen.h"
 #include "Algo/Geometry/boundingbox.h"
 #include "Algo/Render/GL2/mapRender.h"
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 #include "Algo/Modelisation/primitives3d.h"
 #include "Algo/Modelisation/polyhedron.h"
@@ -46,7 +46,7 @@
 #include "Utils/text3d.h"
 
 #include "Utils/pointSprite.h"
-#include "Utils/shaderVectorPerVertex.h"
+#include "Utils/Shaders/shaderVectorPerVertex.h"
 #include "Utils/cgognStream.h"
 
 #include "Algo/Render/SVG/mapSVGRender.h"

Apps/Tuto/tuto_ogl3.h

@@ -38,7 +38,7 @@
 #include "Algo/Render/GL2/mapRender.h"
 #include "Geometry/vector_gen.h"
 
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 #include <QApplication>
 #include <QDesktopWidget>

src/Algo/Render/topo3Render.cpp

@@ -24,8 +24,9 @@
 
 #include "Algo/Render/GL2/topo3Render.h"
 #include "Topology/generic/dart.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 #include <string.h>
 

src/Algo/Render/topoRender.cpp

@@ -23,8 +23,9 @@
 *******************************************************************************/
 
 #include "Algo/Render/GL2/topoRender.h"
-#include "Utils/shaderSimpleColor.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 namespace CGoGN
 {

src/Utils/shaderColorPerVertex.cpp → src/Utils/Shaders/shaderColorPerVertex.cpp

@@ -23,7 +23,8 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 
 namespace CGoGN
 {

src/Utils/shaderFlat.cpp → src/Utils/Shaders/shaderFlat.cpp

@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <GL/glew.h>
-#include "Utils/shaderFlat.h"
+#include "Utils/Shaders/shaderFlat.h"
 
 namespace CGoGN
 {

src/Utils/shaderPhong.cpp → src/Utils/Shaders/shaderPhong.cpp

@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderPhong.h"
+#include "Utils/Shaders/shaderPhong.h"
 
 namespace CGoGN
 {

src/Utils/shaderSimpleColor.cpp → src/Utils/Shaders/shaderSimpleColor.cpp

@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderSimpleColor.h"
+#include "Utils/Shaders/shaderSimpleColor.h"
 
 namespace CGoGN
 {

src/Utils/shaderVectorPerVertex.cpp → src/Utils/Shaders/shaderVectorPerVertex.cpp

@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <GL/glew.h>
-#include "Utils/shaderVectorPerVertex.h"
+#include "Utils/Shaders/shaderVectorPerVertex.h"
 
 namespace CGoGN
 {

src/Utils/drawer.cpp

@@ -23,7 +23,8 @@
 *******************************************************************************/
 
 #include "Utils/drawer.h"
-#include "Utils/shaderColorPerVertex.h"
+#include "Utils/Shaders/shaderColorPerVertex.h"
+
 #include "Utils/vbo.h"
 
 namespace CGoGN