Commit 54bf6e17 authored by untereiner's avatar untereiner

Merge cgogn:~maire/CGoGN

parents 69a82e95 4f2f41b6
......@@ -26,6 +26,7 @@
#define __CGOGN_SHADER_CPV__
#include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Geometry/vector_gen.h"
namespace CGoGN
......@@ -34,7 +35,7 @@ namespace CGoGN
namespace Utils
{
class ShaderColorPerVertex : public GLSLShader
class ShaderColorPerVertex : public ClippingShader
{
protected:
// shader sources
......
......@@ -28,6 +28,7 @@
#include "Geometry/vector_gen.h"
#include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Utils/textures.h"
namespace CGoGN
......@@ -36,7 +37,7 @@ namespace CGoGN
namespace Utils
{
class ShaderSimpleTexture : public GLSLShader
class ShaderSimpleTexture : public ClippingShader
{
protected:
// shader sources
......
......@@ -28,6 +28,7 @@
#include "Geometry/vector_gen.h"
#include "Utils/GLSLShader.h"
#include "Utils/clippingShader.h"
#include "Utils/textures.h"
namespace CGoGN
......@@ -36,7 +37,7 @@ namespace CGoGN
namespace Utils
{
class ShaderTextureMask : public GLSLShader
class ShaderTextureMask : public ClippingShader
{
protected:
// shader sources
......
This diff is collapsed.
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