From 83ea12d1ead6a4e5c2052f186b48092b1d44dcab Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 7 Oct 2018 16:19:34 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9shader=E5=90=8D=E5=92=8C=E5=86=85?= =?UTF-8?q?=E5=BB=BA=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Font.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libjin/Graphics/Font.cpp') 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& glyphinfolist = page->glyphinfolist; const vector& 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]; -- cgit v1.1-26-g67d0