From d8d7963b9b658799b806d516bbd6b44c4baa28f8 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 24 Oct 2018 22:08:46 +0800 Subject: =?UTF-8?q?+=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Shader/je_default.shader.h | 21 --------------------- src/libjin/Graphics/Shader/je_font.shader.h | 21 --------------------- src/libjin/Graphics/Shader/je_shader.cpp | 4 ++-- src/libjin/Graphics/Shader/je_texture.shader.h | 21 --------------------- .../Graphics/Shader/shaders/je_default.shader.h | 21 +++++++++++++++++++++ src/libjin/Graphics/Shader/shaders/je_font.shader.h | 21 +++++++++++++++++++++ .../Graphics/Shader/shaders/je_texture.shader.h | 21 +++++++++++++++++++++ 7 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 src/libjin/Graphics/Shader/je_default.shader.h delete mode 100644 src/libjin/Graphics/Shader/je_font.shader.h delete mode 100644 src/libjin/Graphics/Shader/je_texture.shader.h create mode 100644 src/libjin/Graphics/Shader/shaders/je_default.shader.h create mode 100644 src/libjin/Graphics/Shader/shaders/je_font.shader.h create mode 100644 src/libjin/Graphics/Shader/shaders/je_texture.shader.h (limited to 'src/libjin/Graphics/Shader') diff --git a/src/libjin/Graphics/Shader/je_default.shader.h b/src/libjin/Graphics/Shader/je_default.shader.h deleted file mode 100644 index 3f57c44..0000000 --- a/src/libjin/Graphics/Shader/je_default.shader.h +++ /dev/null @@ -1,21 +0,0 @@ -// ĬÈÏshader -static const char* default_shader = R"( - -#VERTEX_SHADER - -Vertex vert(Vertex v) -{ - return v; -} - -#END_VERTEX_SHADER - -#FRAGMENT_SHADER - -Color frag(Color col, Texture tex, Vertex v) -{ - return col * texel(tex, v.uv); -} - -#END_FRAGMENT_SHADER -)"; \ No newline at end of file diff --git a/src/libjin/Graphics/Shader/je_font.shader.h b/src/libjin/Graphics/Shader/je_font.shader.h deleted file mode 100644 index e04c225..0000000 --- a/src/libjin/Graphics/Shader/je_font.shader.h +++ /dev/null @@ -1,21 +0,0 @@ -// ×ÖÌåshader -static const char* font_shader = R"( - -#VERTEX_SHADER - -Vertex vert(Vertex v) -{ - return v; -} - -#END_VERTEX_SHADER - -#FRAGMENT_SHADER - -Color frag(Color col, Texture tex, Vertex v) -{ - return Color(col.rgb, texel(tex, v.uv).a); -} - -#END_FRAGMENT_SHADER -)"; \ No newline at end of file diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp index b0e7506..e6f82a4 100644 --- a/src/libjin/Graphics/Shader/je_shader.cpp +++ b/src/libjin/Graphics/Shader/je_shader.cpp @@ -196,7 +196,7 @@ if (success == GL_FALSE) \ } gl.activeTexUnit(unit); glUniform1i(location, unit); - gl.bindTexture(tex->getTexture()); + gl.bindTexture(tex->getGLTexture()); gl.activeTexUnit(0); } @@ -214,7 +214,7 @@ if (success == GL_FALSE) \ } glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0 + unit); - gl.bindTexture(canvas->getTexture()); + gl.bindTexture(canvas->getGLTexture()); glActiveTexture(GL_TEXTURE0); } diff --git a/src/libjin/Graphics/Shader/je_texture.shader.h b/src/libjin/Graphics/Shader/je_texture.shader.h deleted file mode 100644 index d1fc86f..0000000 --- a/src/libjin/Graphics/Shader/je_texture.shader.h +++ /dev/null @@ -1,21 +0,0 @@ -// Ìùͼshader -static const char* texture_shader = R"( - -#VERTEX_SHADER - -Vertex vert(Vertex v) -{ - return v; -} - -#END_VERTEX_SHADER - -#FRAGMENT_SHADER - -Color frag(Color col, Texture tex, Vertex v) -{ - return col * texel(tex, v.uv); -} - -#END_FRAGMENT_SHADER -)"; \ No newline at end of file diff --git a/src/libjin/Graphics/Shader/shaders/je_default.shader.h b/src/libjin/Graphics/Shader/shaders/je_default.shader.h new file mode 100644 index 0000000..3f57c44 --- /dev/null +++ b/src/libjin/Graphics/Shader/shaders/je_default.shader.h @@ -0,0 +1,21 @@ +// ĬÈÏshader +static const char* default_shader = R"( + +#VERTEX_SHADER + +Vertex vert(Vertex v) +{ + return v; +} + +#END_VERTEX_SHADER + +#FRAGMENT_SHADER + +Color frag(Color col, Texture tex, Vertex v) +{ + return col * texel(tex, v.uv); +} + +#END_FRAGMENT_SHADER +)"; \ No newline at end of file diff --git a/src/libjin/Graphics/Shader/shaders/je_font.shader.h b/src/libjin/Graphics/Shader/shaders/je_font.shader.h new file mode 100644 index 0000000..e04c225 --- /dev/null +++ b/src/libjin/Graphics/Shader/shaders/je_font.shader.h @@ -0,0 +1,21 @@ +// ×ÖÌåshader +static const char* font_shader = R"( + +#VERTEX_SHADER + +Vertex vert(Vertex v) +{ + return v; +} + +#END_VERTEX_SHADER + +#FRAGMENT_SHADER + +Color frag(Color col, Texture tex, Vertex v) +{ + return Color(col.rgb, texel(tex, v.uv).a); +} + +#END_FRAGMENT_SHADER +)"; \ No newline at end of file diff --git a/src/libjin/Graphics/Shader/shaders/je_texture.shader.h b/src/libjin/Graphics/Shader/shaders/je_texture.shader.h new file mode 100644 index 0000000..d1fc86f --- /dev/null +++ b/src/libjin/Graphics/Shader/shaders/je_texture.shader.h @@ -0,0 +1,21 @@ +// Ìùͼshader +static const char* texture_shader = R"( + +#VERTEX_SHADER + +Vertex vert(Vertex v) +{ + return v; +} + +#END_VERTEX_SHADER + +#FRAGMENT_SHADER + +Color frag(Color col, Texture tex, Vertex v) +{ + return col * texel(tex, v.uv); +} + +#END_FRAGMENT_SHADER +)"; \ No newline at end of file -- cgit v1.1-26-g67d0