From 4620c40753ad540042a53a35f8d3725dbd6af5c6 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 9 Oct 2018 07:53:47 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9base=20shader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Shader.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/libjin/Graphics/Shader.h') diff --git a/src/libjin/Graphics/Shader.h b/src/libjin/Graphics/Shader.h index d27d538..dcd0b62 100644 --- a/src/libjin/Graphics/Shader.h +++ b/src/libjin/Graphics/Shader.h @@ -9,6 +9,7 @@ #include "texture.h" #include "canvas.h" #include "../3rdparty/GLee/GLee.h" +#include "Shaders/base.shader.h" namespace jin { @@ -22,12 +23,6 @@ namespace graphics static inline Shader* getCurrentShader() { return currentShader; } static void unuse(); - static const char* SHADER_PROJECTION_MATRIX; - static const char* SHADER_MODEL_MATRIX; - static const char* SHADER_MAIN_TEXTURE; - static const char* SHADER_VERTEX_COORDS; - static const char* SHADER_TEXTURE_COORDS; - virtual ~Shader(); void use(); -- cgit v1.1-26-g67d0