From 58d09aa3ca4409e2a15473b0ac3c0446f0acb1a2 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 22 Oct 2018 21:30:21 +0800 Subject: *misc --- src/libjin/Graphics/Font/je_texture_font.cpp | 4 ++-- src/libjin/Graphics/Font/je_texture_font.h | 4 ++-- src/libjin/Graphics/Font/je_ttf.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libjin/Graphics/Font') diff --git a/src/libjin/Graphics/Font/je_texture_font.cpp b/src/libjin/Graphics/Font/je_texture_font.cpp index f85a8ce..2c04815 100644 --- a/src/libjin/Graphics/Font/je_texture_font.cpp +++ b/src/libjin/Graphics/Font/je_texture_font.cpp @@ -245,7 +245,7 @@ namespace JinEngine } TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh) - : Drawable(bitmap) + : Graphic(bitmap) , Font(cellh) { TextureGlyph glyph; @@ -266,7 +266,7 @@ namespace JinEngine } TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh) - : Drawable(bitmap) + : Graphic(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 43d92c8..6276350 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_drawable.h" +#include "../je_graphic.h" #include "../je_bitmap.h" #include "je_page.h" @@ -22,7 +22,7 @@ namespace JinEngine /// /// class TextureFont : public Font - , public Drawable + , public Graphic { public: diff --git a/src/libjin/Graphics/Font/je_ttf.h b/src/libjin/Graphics/Font/je_ttf.h index 7bc6934..e3d63b2 100644 --- a/src/libjin/Graphics/Font/je_ttf.h +++ b/src/libjin/Graphics/Font/je_ttf.h @@ -10,7 +10,7 @@ #include "../../math/je_quad.h" #include "../je_color.h" -#include "../je_drawable.h" +#include "../je_graphic.h" #include "je_page.h" #include "je_font.h" -- cgit v1.1-26-g67d0