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.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/libjin/Graphics/Shader.cpp') diff --git a/src/libjin/Graphics/Shader.cpp b/src/libjin/Graphics/Shader.cpp index a45fcf0..688fa51 100644 --- a/src/libjin/Graphics/Shader.cpp +++ b/src/libjin/Graphics/Shader.cpp @@ -21,15 +21,8 @@ namespace graphics * SHADER_FORMAT_SIZE * formatShader */ - #include "Shaders/base.shader.h" #include "Shaders/default.shader.h" - const char* Shader::SHADER_PROJECTION_MATRIX = "jin_ProjectionMatrix"; - const char* Shader::SHADER_MODEL_MATRIX = "jin_ModelMatrix"; - const char* Shader::SHADER_MAIN_TEXTURE = "jin_MainTexture"; - const char* Shader::SHADER_VERTEX_COORDS = "jin_VertexCoords"; - const char* Shader::SHADER_TEXTURE_COORDS = "jin_TextureCoords"; - /** * https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value * The default value of a sampler variable is 0. From the GLSL 3.30 spec, @@ -140,7 +133,7 @@ namespace graphics { glUseProgram(pid); currentShader = this; - sendInt(Shader::SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT); + sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT); } /*static*/ void Shader::unuse() -- cgit v1.1-26-g67d0