From d8d7963b9b658799b806d516bbd6b44c4baa28f8 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 24 Oct 2018 22:08:46 +0800 Subject: =?UTF-8?q?+=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Font/je_texture_font.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libjin/Graphics/Font/je_texture_font.cpp') diff --git a/src/libjin/Graphics/Font/je_texture_font.cpp b/src/libjin/Graphics/Font/je_texture_font.cpp index 30a927c..5834140 100644 --- a/src/libjin/Graphics/Font/je_texture_font.cpp +++ b/src/libjin/Graphics/Font/je_texture_font.cpp @@ -90,9 +90,9 @@ namespace JinEngine } glyph = findGlyph(c); if (glyph == nullptr) continue; - if (texture != mTexture) + if (texture != getGLTexture()) { - texture = mTexture; + texture = getGLTexture(); GlyphArrayDrawInfo info; info.start = i; info.count = 0; @@ -246,7 +246,7 @@ namespace JinEngine } TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh) - : Graphic(bitmap) + : GraphicSingle(bitmap) , Font(cellh) { TextureGlyph glyph; @@ -265,9 +265,9 @@ namespace JinEngine } } } - + TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh) - : Graphic(bitmap) + : GraphicSingle(bitmap) , Font(cellh) { TextureGlyph glyph; -- cgit v1.1-26-g67d0