From f889c9c20fc09f26eb8a70674c1d60181835c38a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 25 Oct 2018 00:50:35 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/Graphics/Font/je_texture_font.cpp | 6 +++---
 src/libjin/Graphics/Font/je_ttf.cpp          | 4 ++--
 src/libjin/Graphics/Font/je_ttf.h            | 3 ++-
 3 files changed, 7 insertions(+), 6 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 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"
-- 
cgit v1.1-26-g67d0