diff options
author | chai <chaifix@163.com> | 2018-12-05 12:34:26 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-12-05 12:34:26 +0800 |
commit | c78bd640228c0b6b9f7c294793c4f2f58b637c67 (patch) | |
tree | 2fbd941f8b88b2d9230e04a8b644e25d48f62476 /src/libjin/graphics/fonts | |
parent | adbc170d850a23b219f1718c2cf3e40fadd66ce0 (diff) |
*格式化代码
Diffstat (limited to 'src/libjin/graphics/fonts')
-rw-r--r-- | src/libjin/graphics/fonts/je_texture_font.cpp | 2 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/je_ttf.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp index 3599c58..8facc34 100644 --- a/src/libjin/graphics/fonts/je_texture_font.cpp +++ b/src/libjin/graphics/fonts/je_texture_font.cpp @@ -217,7 +217,7 @@ namespace JinEngine void TextureFont::render(const Page* page, int x, int y) { - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist; const vector<GlyphVertex>& glyphvertices = page->glyphvertices; Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0); diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp index d62798b..3f664fa 100644 --- a/src/libjin/graphics/fonts/je_ttf.cpp +++ b/src/libjin/graphics/fonts/je_ttf.cpp @@ -305,7 +305,7 @@ namespace JinEngine void TTF::render(const Page* page, int x, int y) { - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist; const vector<GlyphVertex>& glyphvertices = page->glyphvertices; Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0); |