diff options
Diffstat (limited to 'src/libjin')
| -rw-r--r-- | src/libjin/graphics/fonts/je_page.h | 2 | ||||
| -rw-r--r-- | src/libjin/graphics/fonts/je_texture_font.h | 2 | ||||
| -rw-r--r-- | src/libjin/graphics/fonts/je_ttf.h | 2 | ||||
| -rw-r--r-- | src/libjin/graphics/je_sprite_sheet.h | 2 | ||||
| -rw-r--r-- | src/libjin/graphics/shaders/je_shader.h | 2 | ||||
| -rw-r--r-- | src/libjin/net/je_socket.h | 4 | ||||
| -rw-r--r-- | src/libjin/time/je_timer.h | 6 |
7 files changed, 12 insertions, 8 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: /// diff --git a/src/libjin/net/je_socket.h b/src/libjin/net/je_socket.h index eb01719..4e7faa8 100644 --- a/src/libjin/net/je_socket.h +++ b/src/libjin/net/je_socket.h @@ -3,6 +3,8 @@ #include "../core/je_configuration.h" #if defined(jin_net) +#include "../common/je_object.h" + #include "tekcos/tekcos.h" namespace JinEngine @@ -32,7 +34,7 @@ namespace JinEngine /// /// /// - class Socket + class Socket : public Object { public: diff --git a/src/libjin/time/je_timer.h b/src/libjin/time/je_timer.h index f9feebe..a918d63 100644 --- a/src/libjin/time/je_timer.h +++ b/src/libjin/time/je_timer.h @@ -8,6 +8,8 @@ #include "SDL2/SDL.h" +#include "../common/je_object.h" + namespace JinEngine { namespace Time @@ -16,7 +18,7 @@ namespace JinEngine /// /// /// - class Timer + class Timer : public Object { public: @@ -27,7 +29,7 @@ namespace JinEngine /// /// /// - class Handler + class Handler : public Object { public: friend class Timer; |