aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-08 22:05:31 +0800
committerchai <chaifix@163.com>2018-12-08 22:05:31 +0800
commita16ce94158c9cf22a19c0e73dfe2e992a8302af1 (patch)
tree52d80d950cd410ba82af909e18f77e3b11cd6eda /src/libjin/graphics
parentd34e5c9d7c6135e805f2cc231411cdcc9910190c (diff)
*去除shared template
Diffstat (limited to 'src/libjin/graphics')
-rw-r--r--src/libjin/graphics/fonts/je_page.h2
-rw-r--r--src/libjin/graphics/fonts/je_texture_font.h2
-rw-r--r--src/libjin/graphics/fonts/je_ttf.h2
-rw-r--r--src/libjin/graphics/je_sprite_sheet.h2
-rw-r--r--src/libjin/graphics/shaders/je_shader.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/libjin/graphics/fonts/je_page.h b/src/libjin/graphics/fonts/je_page.h
index 707f53a..b3c831c 100644
--- a/src/libjin/graphics/fonts/je_page.h
+++ b/src/libjin/graphics/fonts/je_page.h
@@ -39,7 +39,7 @@ namespace JinEngine
/// A page is a pre-rendered text struct for reducing draw call. Each page
/// keeps a font pointer which should not be changed.
///
- struct Page
+ struct Page : public Object
{
Font* font;
std::vector<GlyphArrayDrawInfo> glyphinfolist;
diff --git a/src/libjin/graphics/fonts/je_texture_font.h b/src/libjin/graphics/fonts/je_texture_font.h
index a753cac..4875361 100644
--- a/src/libjin/graphics/fonts/je_texture_font.h
+++ b/src/libjin/graphics/fonts/je_texture_font.h
@@ -23,7 +23,7 @@ namespace JinEngine
///
///
///
- class TextureFont : public Font, public Graphic
+ class TextureFont : public Font, public Graphic, public Object
{
public:
///
diff --git a/src/libjin/graphics/fonts/je_ttf.h b/src/libjin/graphics/fonts/je_ttf.h
index c5e2af5..198594a 100644
--- a/src/libjin/graphics/fonts/je_ttf.h
+++ b/src/libjin/graphics/fonts/je_ttf.h
@@ -110,7 +110,7 @@ namespace JinEngine
};
- class TTF : public Font
+ class TTF : public Font, public Object
{
public:
//static TTF* createTTF(TTFData* ttfData, unsigned ttfSzie);
diff --git a/src/libjin/graphics/je_sprite_sheet.h b/src/libjin/graphics/je_sprite_sheet.h
index 70aa5e3..a71ea04 100644
--- a/src/libjin/graphics/je_sprite_sheet.h
+++ b/src/libjin/graphics/je_sprite_sheet.h
@@ -12,7 +12,7 @@ namespace JinEngine
namespace Graphics
{
- class SpriteSheet
+ class SpriteSheet : public Object
{
public:
SpriteSheet(const Graphic* graphic);
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h
index a30413c..d8be118 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/je_shader.h
@@ -29,7 +29,7 @@ namespace JinEngine
/// JSL program is compiled into glsl, so most glsl built in functions and structs are available in
/// JSL.
///
- class Shader
+ class Shader : public Object
{
public:
///