diff options
| author | chai <chaifix@163.com> | 2018-10-24 22:08:46 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-24 22:08:46 +0800 |
| commit | d8d7963b9b658799b806d516bbd6b44c4baa28f8 (patch) | |
| tree | 4a8c7c247e5c429a4ee50baf3b5be2032575aab6 /src/libjin/Graphics/Font | |
| parent | e98acfb0d497e9c4560554cba73eb5c313ea034a (diff) | |
+粒子系统测试
Diffstat (limited to 'src/libjin/Graphics/Font')
| -rw-r--r-- | src/libjin/Graphics/Font/je_texture_font.cpp | 10 | ||||
| -rw-r--r-- | src/libjin/Graphics/Font/je_texture_font.h | 5 |
2 files changed, 7 insertions, 8 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; diff --git a/src/libjin/Graphics/Font/je_texture_font.h b/src/libjin/Graphics/Font/je_texture_font.h index 0cafff1..5b08747 100644 --- a/src/libjin/Graphics/Font/je_texture_font.h +++ b/src/libjin/Graphics/Font/je_texture_font.h @@ -6,7 +6,7 @@ #include "../../math/je_vector4.hpp" -#include "../je_graphic.h" +#include "../je_graphic_single.h" #include "../je_bitmap.h" #include "je_page.h" @@ -21,8 +21,7 @@ namespace JinEngine /// /// /// - class TextureFont : public Font - , public Graphic + class TextureFont : public Font , public GraphicSingle { public: |