From a002cfcaca7952cb2aaeb72c76bbdae12ddc8330 Mon Sep 17 00:00:00 2001 From: Kenneth Vanhoey Date: Wed, 25 May 2011 18:40:21 +0200 Subject: [PATCH] New folder for shaders in Utils/Shaders/ --- Apps/Examples/extrusionView.cpp | 4 ++-- Apps/Examples/polyhedronsView.cpp | 4 ++-- Apps/Tuto/tp_master.cpp | 4 ++-- Apps/Tuto/tuto1.cpp | 2 +- Apps/Tuto/tuto2.cpp | 2 +- Apps/Tuto/tuto3.cpp | 5 +++-- Apps/Tuto/tuto4.cpp | 4 ++-- Apps/Tuto/tuto5.cpp | 4 ++-- Apps/Tuto/tuto_ogl3.h | 2 +- include/Utils/{ => Shaders}/shaderColorPerVertex.h | 0 include/Utils/{ => Shaders}/shaderFlat.h | 0 include/Utils/{ => Shaders}/shaderPhong.h | 0 include/Utils/{ => Shaders}/shaderSimpleColor.h | 0 include/Utils/{ => Shaders}/shaderVectorPerVertex.h | 0 src/Algo/Render/topo3Render.cpp | 5 +++-- src/Algo/Render/topoRender.cpp | 5 +++-- src/Utils/{ => Shaders}/shaderColorPerVertex.cpp | 3 ++- src/Utils/{ => Shaders}/shaderFlat.cpp | 2 +- src/Utils/{ => Shaders}/shaderPhong.cpp | 2 +- src/Utils/{ => Shaders}/shaderSimpleColor.cpp | 2 +- src/Utils/{ => Shaders}/shaderVectorPerVertex.cpp | 2 +- src/Utils/drawer.cpp | 3 ++- 22 files changed, 30 insertions(+), 25 deletions(-) rename include/Utils/{ => Shaders}/shaderColorPerVertex.h (100%) rename include/Utils/{ => Shaders}/shaderFlat.h (100%) rename include/Utils/{ => Shaders}/shaderPhong.h (100%) rename include/Utils/{ => Shaders}/shaderSimpleColor.h (100%) rename include/Utils/{ => Shaders}/shaderVectorPerVertex.h (100%) rename src/Utils/{ => Shaders}/shaderColorPerVertex.cpp (98%) rename src/Utils/{ => Shaders}/shaderFlat.cpp (99%) rename src/Utils/{ => Shaders}/shaderPhong.cpp (99%) rename src/Utils/{ => Shaders}/shaderSimpleColor.cpp (98%) rename src/Utils/{ => Shaders}/shaderVectorPerVertex.cpp (98%) diff --git a/Apps/Examples/extrusionView.cpp b/Apps/Examples/extrusionView.cpp index 1e062ffba..c2eeef169 100644 --- a/Apps/Examples/extrusionView.cpp +++ b/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 diff --git a/Apps/Examples/polyhedronsView.cpp b/Apps/Examples/polyhedronsView.cpp index 4eb46e6fd..c2ba08da5 100644 --- a/Apps/Examples/polyhedronsView.cpp +++ b/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; diff --git a/Apps/Tuto/tp_master.cpp b/Apps/Tuto/tp_master.cpp index 9b7bc4d47..5659facaa 100644 --- a/Apps/Tuto/tp_master.cpp +++ b/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" diff --git a/Apps/Tuto/tuto1.cpp b/Apps/Tuto/tuto1.cpp index f9f47f695..eb45c6944 100644 --- a/Apps/Tuto/tuto1.cpp +++ b/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 diff --git a/Apps/Tuto/tuto2.cpp b/Apps/Tuto/tuto2.cpp index 1ada56bd1..e9c8e610f 100644 --- a/Apps/Tuto/tuto2.cpp +++ b/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" diff --git a/Apps/Tuto/tuto3.cpp b/Apps/Tuto/tuto3.cpp index 97128ecbf..373b0b005 100644 --- a/Apps/Tuto/tuto3.cpp +++ b/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" diff --git a/Apps/Tuto/tuto4.cpp b/Apps/Tuto/tuto4.cpp index a42137e3a..f031e9b97 100644 --- a/Apps/Tuto/tuto4.cpp +++ b/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" diff --git a/Apps/Tuto/tuto5.cpp b/Apps/Tuto/tuto5.cpp index 31382af6e..e8e6ab79f 100644 --- a/Apps/Tuto/tuto5.cpp +++ b/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" diff --git a/Apps/Tuto/tuto_ogl3.h b/Apps/Tuto/tuto_ogl3.h index bf8318b28..82132001f 100644 --- a/Apps/Tuto/tuto_ogl3.h +++ b/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 #include diff --git a/include/Utils/shaderColorPerVertex.h b/include/Utils/Shaders/shaderColorPerVertex.h similarity index 100% rename from include/Utils/shaderColorPerVertex.h rename to include/Utils/Shaders/shaderColorPerVertex.h diff --git a/include/Utils/shaderFlat.h b/include/Utils/Shaders/shaderFlat.h similarity index 100% rename from include/Utils/shaderFlat.h rename to include/Utils/Shaders/shaderFlat.h diff --git a/include/Utils/shaderPhong.h b/include/Utils/Shaders/shaderPhong.h similarity index 100% rename from include/Utils/shaderPhong.h rename to include/Utils/Shaders/shaderPhong.h diff --git a/include/Utils/shaderSimpleColor.h b/include/Utils/Shaders/shaderSimpleColor.h similarity index 100% rename from include/Utils/shaderSimpleColor.h rename to include/Utils/Shaders/shaderSimpleColor.h diff --git a/include/Utils/shaderVectorPerVertex.h b/include/Utils/Shaders/shaderVectorPerVertex.h similarity index 100% rename from include/Utils/shaderVectorPerVertex.h rename to include/Utils/Shaders/shaderVectorPerVertex.h diff --git a/src/Algo/Render/topo3Render.cpp b/src/Algo/Render/topo3Render.cpp index 5bd74105f..62caa79ba 100644 --- a/src/Algo/Render/topo3Render.cpp +++ b/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 diff --git a/src/Algo/Render/topoRender.cpp b/src/Algo/Render/topoRender.cpp index 4a181c6f2..49e44a95c 100644 --- a/src/Algo/Render/topoRender.cpp +++ b/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 { diff --git a/src/Utils/shaderColorPerVertex.cpp b/src/Utils/Shaders/shaderColorPerVertex.cpp similarity index 98% rename from src/Utils/shaderColorPerVertex.cpp rename to src/Utils/Shaders/shaderColorPerVertex.cpp index 1e4c16a69..006f73b36 100644 --- a/src/Utils/shaderColorPerVertex.cpp +++ b/src/Utils/Shaders/shaderColorPerVertex.cpp @@ -23,7 +23,8 @@ *******************************************************************************/ #include -#include "Utils/shaderColorPerVertex.h" +#include "Utils/Shaders/shaderColorPerVertex.h" + namespace CGoGN { diff --git a/src/Utils/shaderFlat.cpp b/src/Utils/Shaders/shaderFlat.cpp similarity index 99% rename from src/Utils/shaderFlat.cpp rename to src/Utils/Shaders/shaderFlat.cpp index 05da7e728..d8c3c24a8 100644 --- a/src/Utils/shaderFlat.cpp +++ b/src/Utils/Shaders/shaderFlat.cpp @@ -24,7 +24,7 @@ #include #include -#include "Utils/shaderFlat.h" +#include "Utils/Shaders/shaderFlat.h" namespace CGoGN { diff --git a/src/Utils/shaderPhong.cpp b/src/Utils/Shaders/shaderPhong.cpp similarity index 99% rename from src/Utils/shaderPhong.cpp rename to src/Utils/Shaders/shaderPhong.cpp index 94460d045..29eff8065 100644 --- a/src/Utils/shaderPhong.cpp +++ b/src/Utils/Shaders/shaderPhong.cpp @@ -23,7 +23,7 @@ *******************************************************************************/ #include -#include "Utils/shaderPhong.h" +#include "Utils/Shaders/shaderPhong.h" namespace CGoGN { diff --git a/src/Utils/shaderSimpleColor.cpp b/src/Utils/Shaders/shaderSimpleColor.cpp similarity index 98% rename from src/Utils/shaderSimpleColor.cpp rename to src/Utils/Shaders/shaderSimpleColor.cpp index b453ef0ab..7b5fd1f97 100644 --- a/src/Utils/shaderSimpleColor.cpp +++ b/src/Utils/Shaders/shaderSimpleColor.cpp @@ -23,7 +23,7 @@ *******************************************************************************/ #include -#include "Utils/shaderSimpleColor.h" +#include "Utils/Shaders/shaderSimpleColor.h" namespace CGoGN { diff --git a/src/Utils/shaderVectorPerVertex.cpp b/src/Utils/Shaders/shaderVectorPerVertex.cpp similarity index 98% rename from src/Utils/shaderVectorPerVertex.cpp rename to src/Utils/Shaders/shaderVectorPerVertex.cpp index c98e18957..62b7ea7e7 100644 --- a/src/Utils/shaderVectorPerVertex.cpp +++ b/src/Utils/Shaders/shaderVectorPerVertex.cpp @@ -23,7 +23,7 @@ *******************************************************************************/ #include -#include "Utils/shaderVectorPerVertex.h" +#include "Utils/Shaders/shaderVectorPerVertex.h" namespace CGoGN { diff --git a/src/Utils/drawer.cpp b/src/Utils/drawer.cpp index 6bddbe894..6e923d027 100644 --- a/src/Utils/drawer.cpp +++ b/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 -- 2.26.2