aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Font/je_texture_font.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-24 22:08:46 +0800
committerchai <chaifix@163.com>2018-10-24 22:08:46 +0800
commitd8d7963b9b658799b806d516bbd6b44c4baa28f8 (patch)
tree4a8c7c247e5c429a4ee50baf3b5be2032575aab6 /src/libjin/Graphics/Font/je_texture_font.cpp
parente98acfb0d497e9c4560554cba73eb5c313ea034a (diff)
+粒子系统测试
Diffstat (limited to 'src/libjin/Graphics/Font/je_texture_font.cpp')
-rw-r--r--src/libjin/Graphics/Font/je_texture_font.cpp10
1 files changed, 5 insertions, 5 deletions
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;