diff options
Diffstat (limited to 'src/libjin/graphics/fonts')
-rw-r--r-- | src/libjin/graphics/fonts/decoder.cpp (renamed from src/libjin/graphics/fonts/je_decoder.cpp) | 2 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/decoder.h (renamed from src/libjin/graphics/fonts/je_decoder.h) | 4 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/font.h (renamed from src/libjin/graphics/fonts/je_font.h) | 4 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/page.h (renamed from src/libjin/graphics/fonts/je_page.h) | 4 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/text.cpp (renamed from src/libjin/graphics/fonts/je_text.cpp) | 4 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/text.h (renamed from src/libjin/graphics/fonts/je_text.h) | 2 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/texture_font.cpp (renamed from src/libjin/graphics/fonts/je_texture_font.cpp) | 6 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/texture_font.h (renamed from src/libjin/graphics/fonts/je_texture_font.h) | 12 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/ttf.cpp (renamed from src/libjin/graphics/fonts/je_ttf.cpp) | 16 | ||||
-rw-r--r-- | src/libjin/graphics/fonts/ttf.h (renamed from src/libjin/graphics/fonts/je_ttf.h) | 14 |
10 files changed, 34 insertions, 34 deletions
diff --git a/src/libjin/graphics/fonts/je_decoder.cpp b/src/libjin/graphics/fonts/decoder.cpp index a7f4f32..5c74258 100644 --- a/src/libjin/graphics/fonts/je_decoder.cpp +++ b/src/libjin/graphics/fonts/decoder.cpp @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include "je_decoder.h" +#include "decoder.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_decoder.h b/src/libjin/graphics/fonts/decoder.h index 43fa155..8ff7bd7 100644 --- a/src/libjin/graphics/fonts/je_decoder.h +++ b/src/libjin/graphics/fonts/decoder.h @@ -3,9 +3,9 @@ #include <vector> -#include "../../common/je_object.h" +#include "../../common/object.h" -#include "je_text.h" +#include "text.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_font.h b/src/libjin/graphics/fonts/font.h index 9c231de..166cd6b 100644 --- a/src/libjin/graphics/fonts/je_font.h +++ b/src/libjin/graphics/fonts/font.h @@ -3,9 +3,9 @@ #include <vector> -#include "../je_renderable.h" +#include "../renderable.h" -#include "je_text.h" +#include "text.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_page.h b/src/libjin/graphics/fonts/page.h index d831691..75f1840 100644 --- a/src/libjin/graphics/fonts/je_page.h +++ b/src/libjin/graphics/fonts/page.h @@ -1,9 +1,9 @@ #ifndef __JE_PAGE_H__ #define __JE_PAGE_H__ -#include "../../math/je_vector2.hpp" +#include "../../math/vector2.hpp" -#include "je_font.h" +#include "font.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_text.cpp b/src/libjin/graphics/fonts/text.cpp index f9909a6..9684b81 100644 --- a/src/libjin/graphics/fonts/je_text.cpp +++ b/src/libjin/graphics/fonts/text.cpp @@ -1,7 +1,7 @@ #include <cstring> -#include "je_text.h" -#include "je_decoder.h" +#include "text.h" +#include "decoder.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_text.h b/src/libjin/graphics/fonts/text.h index 6837bfc..c3bb8db 100644 --- a/src/libjin/graphics/fonts/je_text.h +++ b/src/libjin/graphics/fonts/text.h @@ -3,7 +3,7 @@ #include <vector> -#include "../../common/je_object.h" +#include "../../common/object.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/texture_font.cpp index 542fe7d..31e5293 100644 --- a/src/libjin/graphics/fonts/je_texture_font.cpp +++ b/src/libjin/graphics/fonts/texture_font.cpp @@ -1,10 +1,10 @@ #include <vector> -#include "../../math/je_vector2.hpp" +#include "../../math/vector2.hpp" -#include "../shaders/je_shader.h" +#include "../shaders/shader.h" -#include "je_texture_font.h" +#include "texture_font.h" using namespace std; using namespace JinEngine::Math; diff --git a/src/libjin/graphics/fonts/je_texture_font.h b/src/libjin/graphics/fonts/texture_font.h index 9192276..1d7f0d2 100644 --- a/src/libjin/graphics/fonts/je_texture_font.h +++ b/src/libjin/graphics/fonts/texture_font.h @@ -4,14 +4,14 @@ #include <map> #include <vector> -#include "../../math/je_vector4.hpp" +#include "../../math/vector4.hpp" -#include "../je_graphic.h" -#include "../je_bitmap.h" +#include "../graphic.h" +#include "../bitmap.h" -#include "je_page.h" -#include "je_font.h" -#include "je_text.h" +#include "page.h" +#include "font.h" +#include "text.h" namespace JinEngine { diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/ttf.cpp index d145395..f47e7e4 100644 --- a/src/libjin/graphics/fonts/je_ttf.cpp +++ b/src/libjin/graphics/fonts/ttf.cpp @@ -1,16 +1,16 @@ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) #include <stdio.h> -#include "../../common/je_array.hpp" +#include "../../common/array.hpp" -#include "../je_gl.h" -#include "../je_color.h" -#include "../shaders/je_shader.h" +#include "../gl.h" +#include "../color.h" +#include "../shaders/shader.h" -#include "je_ttf.h" -#include "je_page.h" +#include "ttf.h" +#include "page.h" #define STB_TRUETYPE_IMPLEMENTATION #include "stb/stb_truetype.h" @@ -134,7 +134,7 @@ namespace JinEngine // TTF ////////////////////////////////////////////////////////////////////////////////////////////////////// -#include "../shaders/built-in/je_font.shader.h" +#include "../shaders/built-in/font.shader.h" using namespace std; using namespace JinEngine::Math; diff --git a/src/libjin/graphics/fonts/je_ttf.h b/src/libjin/graphics/fonts/ttf.h index feabf33..8439cd7 100644 --- a/src/libjin/graphics/fonts/je_ttf.h +++ b/src/libjin/graphics/fonts/ttf.h @@ -1,6 +1,6 @@ #ifndef __JE_TTF_H__ #define __JE_TTF_H__ -#include "../../core/je_configuration.h" +#include "../../core/configuration.h" #if defined(jin_graphics) #include <vector> @@ -8,14 +8,14 @@ #include "stb/stb_truetype.h" -#include "../../math/je_quad.h" +#include "../../math/quad.h" -#include "../je_color.h" -#include "../je_graphic.h" +#include "../color.h" +#include "../graphic.h" -#include "je_page.h" -#include "je_font.h" -#include "je_text.h" +#include "page.h" +#include "font.h" +#include "text.h" namespace JinEngine { |