diff options
| author | chai <chaifix@163.com> | 2019-01-07 09:54:08 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-01-07 09:54:08 +0800 |
| commit | 2af7f2f5e3da8f6c236e7996781950e1bc6c1f9c (patch) | |
| tree | f6a8a9618e146c93e4d4d964a6e13cd16f528693 /src/libjin/graphics/fonts | |
| parent | 909e544ed322b28a6f59febf3213e05068e9e93c (diff) | |
| parent | da056982e50bdd9cb9f944691cc88ca98b053b77 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Jin
Diffstat (limited to 'src/libjin/graphics/fonts')
| -rw-r--r-- | src/libjin/graphics/fonts/je_texture_font.cpp | 3 | ||||
| -rw-r--r-- | src/libjin/graphics/fonts/je_ttf.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp index 016367c..49ac797 100644 --- a/src/libjin/graphics/fonts/je_texture_font.cpp +++ b/src/libjin/graphics/fonts/je_texture_font.cpp @@ -276,7 +276,7 @@ namespace JinEngine const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist; const vector<GlyphVertex>& glyphvertices = page->glyphvertices; Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0); - shader->prepare() + shader->begin() .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); for (int i = 0; i < glyphinfolist.size(); ++i) @@ -288,6 +288,7 @@ namespace JinEngine gl.drawArrays(GL_QUADS, 0, info.count); gl.bindTexture(0); } + shader->end(); } void TextureFont::render(const Content& text, int x, int y, int lineheight, int spacing) diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp index 1df7fa7..89aa096 100644 --- a/src/libjin/graphics/fonts/je_ttf.cpp +++ b/src/libjin/graphics/fonts/je_ttf.cpp @@ -295,7 +295,7 @@ namespace JinEngine const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist; const vector<GlyphVertex>& glyphvertices = page->glyphvertices; Matrix modelMatrix = gl.getModelViewMatrix(x, y, 1, 1, 0, 0, 0); - shader->prepare() + shader->begin() .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix) .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); for (int i = 0; i < glyphinfolist.size(); ++i) @@ -307,6 +307,7 @@ namespace JinEngine gl.drawArrays(GL_QUADS, 0, info.count); gl.bindTexture(0); } + shader->end(); } void TTF::render(const Text& text, int x, int y, int lineheight, int spacing /* = 0 */) |