aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Font.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-07 16:19:34 +0800
committerchai <chaifix@163.com>2018-10-07 16:19:34 +0800
commit83ea12d1ead6a4e5c2052f186b48092b1d44dcab (patch)
treecaba904fd4a8c5007d7c4336fd87bc58a9cee9d2 /src/libjin/Graphics/Font.cpp
parente66058efea36a8c3b07e204002095db08a7182c9 (diff)
*修改shader名和内建变量名
Diffstat (limited to 'src/libjin/Graphics/Font.cpp')
-rw-r--r--src/libjin/Graphics/Font.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libjin/Graphics/Font.cpp b/src/libjin/Graphics/Font.cpp
index 72be567..77d48f7 100644
--- a/src/libjin/Graphics/Font.cpp
+++ b/src/libjin/Graphics/Font.cpp
@@ -201,12 +201,12 @@ namespace graphics
void Font::print(const Page* page, int x, int y)
{
- Shader* shader = Shader::getCurrentJSL();
+ Shader* shader = Shader::getCurrentShader();
const vector<GlyphArrayDrawInfo>& glyphinfolist = page->glyphinfolist;
const vector<GlyphVertex>& glyphvertices = page->glyphvertices;
gl.ModelMatrix.setTransformation(x, y, 0, 1, 1, 0, 0);
- shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
- shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+ shader->sendMatrix4(Shader::SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+ shader->sendMatrix4(Shader::SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
for (int i = 0; i < glyphinfolist.size(); ++i)
{
const GlyphArrayDrawInfo& info = glyphinfolist[i];