From b3712ebdf148bd8d2d31e70734a4b7923f6038f8 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 6 Dec 2018 13:12:29 +0800 Subject: *remove create function --- src/libjin/graphics/shaders/je_shader.cpp | 4 ++-- src/libjin/graphics/shaders/je_shader.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/libjin/graphics/shaders') diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp index f33adaf..017231a 100644 --- a/src/libjin/graphics/shaders/je_shader.cpp +++ b/src/libjin/graphics/shaders/je_shader.cpp @@ -53,7 +53,7 @@ namespace JinEngine // texture unit 0, and did not just forget to set the value. // const int DEFAULT_TEXTURE_UNIT = 0; - +/* Shader* Shader::createShader(const string& program) { Shader* shader = nullptr; @@ -67,7 +67,7 @@ namespace JinEngine } return shader; } - +*/ Shader::Shader(const string& program) : mCurrentTextureUnit(DEFAULT_TEXTURE_UNIT) { diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h index 2f53ab0..a30413c 100644 --- a/src/libjin/graphics/shaders/je_shader.h +++ b/src/libjin/graphics/shaders/je_shader.h @@ -37,7 +37,12 @@ namespace JinEngine /// /// @param source The shader source code. /// - static Shader* createShader(const std::string& source); + //static Shader* createShader(const std::string& source); + + /// + /// Shader constructor. + /// + Shader(const std::string& program); /// /// Destructor of shader. @@ -155,11 +160,6 @@ namespace JinEngine /// GLint claimTextureUnit(const std::string& name); - /// - /// Shader constructor. - /// - Shader(const std::string& program); - /// /// Compile JSL program into GLSL source. /// -- cgit v1.1-26-g67d0