Commit 4f2f41b6 authored by Maire Nicolas's avatar Maire Nicolas
Browse files

Faire dériver de ClippingShader tous les shaders (restants) n'utilisant pas de geometry shader.

parent 0300d533
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define __CGOGN_SHADER_CPV__ #define __CGOGN_SHADER_CPV__
#include "Utils/GLSLShader.h" #include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
namespace CGoGN namespace CGoGN
...@@ -34,7 +35,7 @@ namespace CGoGN ...@@ -34,7 +35,7 @@ namespace CGoGN
namespace Utils namespace Utils
{ {
class ShaderColorPerVertex : public GLSLShader class ShaderColorPerVertex : public ClippingShader
{ {
protected: protected:
// shader sources // shader sources
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/GLSLShader.h" #include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Utils/textures.h" #include "Utils/textures.h"
namespace CGoGN namespace CGoGN
...@@ -36,7 +37,7 @@ namespace CGoGN ...@@ -36,7 +37,7 @@ namespace CGoGN
namespace Utils namespace Utils
{ {
class ShaderSimpleTexture : public GLSLShader class ShaderSimpleTexture : public ClippingShader
{ {
protected: protected:
// shader sources // shader sources
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Utils/GLSLShader.h" #include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Utils/textures.h" #include "Utils/textures.h"
namespace CGoGN namespace CGoGN
...@@ -36,7 +37,7 @@ namespace CGoGN ...@@ -36,7 +37,7 @@ namespace CGoGN
namespace Utils namespace Utils
{ {
class ShaderTextureMask : public GLSLShader class ShaderTextureMask : public ClippingShader
{ {
protected: protected:
// shader sources // shader sources
......
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