From 83ea12d1ead6a4e5c2052f186b48092b1d44dcab Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 7 Oct 2018 16:19:34 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9shader=E5=90=8D=E5=92=8C=E5=86=85?= =?UTF-8?q?=E5=BB=BA=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Shader.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/libjin/Graphics/Shader.h') diff --git a/src/libjin/Graphics/Shader.h b/src/libjin/Graphics/Shader.h index 2ea9e04..d27d538 100644 --- a/src/libjin/Graphics/Shader.h +++ b/src/libjin/Graphics/Shader.h @@ -15,19 +15,18 @@ namespace jin namespace graphics { - /* Jin Shading Language Program*/ class Shader { public: static Shader* createShader(const std::string& program); - static inline Shader* getCurrentJSL() { return currentShader; } + static inline Shader* getCurrentShader() { return currentShader; } static void unuse(); - static const char* PROJECTION_MATRIX; - static const char* MODEL_MATRIX; - static const char* MAIN_TEXTURE; - static const char* VERTEX_COORDS; - static const char* TEXTURE_COORDS; + 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(); -- cgit v1.1-26-g67d0