diff options
Diffstat (limited to 'src/libjin/Graphics/Font')
-rw-r--r-- | src/libjin/Graphics/Font/je_texture_font.cpp | 6 | ||||
-rw-r--r-- | src/libjin/Graphics/Font/je_ttf.cpp | 4 | ||||
-rw-r--r-- | src/libjin/Graphics/Font/je_ttf.h | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/libjin/Graphics/Font/je_texture_font.cpp b/src/libjin/Graphics/Font/je_texture_font.cpp index 5834140..15d0ace 100644 --- a/src/libjin/Graphics/Font/je_texture_font.cpp +++ b/src/libjin/Graphics/Font/je_texture_font.cpp @@ -6,14 +6,14 @@ #include "je_texture_font.h" +using namespace std; +using namespace JinEngine::Math; + namespace JinEngine { namespace Graphics { - using namespace std; - using namespace Math; - TextureFont * TextureFont::createTextureFont(const Bitmap* bitmap, const Content& codepoints, int cellw, int cellh) { TextureFont* tf = new TextureFont(bitmap, codepoints, cellw, cellh); diff --git a/src/libjin/Graphics/Font/je_ttf.cpp b/src/libjin/Graphics/Font/je_ttf.cpp index 72e5da9..52547c9 100644 --- a/src/libjin/Graphics/Font/je_ttf.cpp +++ b/src/libjin/Graphics/Font/je_ttf.cpp @@ -13,7 +13,7 @@ #include "je_page.h" #define STB_TRUETYPE_IMPLEMENTATION -#include "../../3rdparty/stb/stb_truetype.h" +#include "stb/stb_truetype.h" namespace JinEngine { @@ -144,7 +144,7 @@ namespace JinEngine // TTF ///////////////////////////////////////////////////////////////////////////// - #include "../shader/je_font.shader.h" + #include "../shader/shaders/je_font.shader.h" using namespace std; using namespace JinEngine::Math; diff --git a/src/libjin/Graphics/Font/je_ttf.h b/src/libjin/Graphics/Font/je_ttf.h index 42e7e62..b2c1802 100644 --- a/src/libjin/Graphics/Font/je_ttf.h +++ b/src/libjin/Graphics/Font/je_ttf.h @@ -6,7 +6,8 @@ #include <vector> #include <map> -#include "../../3rdparty/stb/stb_truetype.h" +#include "stb/stb_truetype.h" + #include "../../math/je_quad.h" #include "../je_color.h" |