aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics/fonts/je_ttf.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-23 01:06:46 +0800
committerchai <chaifix@163.com>2018-12-23 01:06:46 +0800
commit5b8b5c95589e615afda3f0d67db612b64297c2a0 (patch)
tree976de20f8a317c1dfb07ed1914ff8bebc4242005 /src/libjin/graphics/fonts/je_ttf.cpp
parent6afaad9b9490d4b70a0bea4a8289cc637194abc7 (diff)
*shader and time
Diffstat (limited to 'src/libjin/graphics/fonts/je_ttf.cpp')
-rw-r--r--src/libjin/graphics/fonts/je_ttf.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp
index 5d341fa..0e9f672 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/je_ttf.cpp
@@ -295,15 +295,14 @@ 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->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix);
shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
for (int i = 0; i < glyphinfolist.size(); ++i)
{
const GlyphArrayDrawInfo& info = glyphinfolist[i];
- shader->beginUploadAttributes();
shader->uploadVertices(2, GL_INT, sizeof(GlyphVertex), &glyphvertices[info.start].x);
shader->uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
- shader->endUploadAttributes();
gl.bindTexture(info.texture);
gl.drawArrays(GL_QUADS, 0, info.count);
gl.bindTexture(0);