From b04c097db4bf8c45342bca403ca2c8a6d5783a84 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 26 Oct 2018 18:40:32 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=85=B3=E9=97=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Graphics/Font/je_texture_font.cpp | 4 ++-- src/libjin/Graphics/Font/je_texture_font.h | 4 ++-- 2 files changed, 4 insertions(+), 4 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 15d0ace..dcebdb2 100644 --- a/src/libjin/Graphics/Font/je_texture_font.cpp +++ b/src/libjin/Graphics/Font/je_texture_font.cpp @@ -246,7 +246,7 @@ namespace JinEngine } TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh) - : GraphicSingle(bitmap) + : Graphic(bitmap) , Font(cellh) { TextureGlyph glyph; @@ -267,7 +267,7 @@ namespace JinEngine } TextureFont::TextureFont(const Bitmap* bitmap, const Content& codepoints, Color mask, int cellh) - : GraphicSingle(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 5b08747..d61991a 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_single.h" +#include "../je_graphic.h" #include "../je_bitmap.h" #include "je_page.h" @@ -21,7 +21,7 @@ namespace JinEngine /// /// /// - class TextureFont : public Font , public GraphicSingle + class TextureFont : public Font , public Graphic { public: -- cgit v1.1-26-g67d0