*修改项目结构

10 files changed, 18 insertions, 14 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"
diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp
index e6f82a4..8e909d8 100644
--- a/src/libjin/Graphics/Shader/je_shader.cpp
+++ b/src/libjin/Graphics/Shader/je_shader.cpp
@@ -23,7 +23,7 @@ namespace JinEngine
 		// SHADER_FORMAT_SIZE
 		// formatShader
 		// 
-		#include "je_default.shader.h"
+		#include "shaders/je_default.shader.h"
 
 		// 
 		// https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
diff --git a/src/libjin/Graphics/Shader/je_shader.h b/src/libjin/Graphics/Shader/je_shader.h
index f721b5d..039efb5 100644
--- a/src/libjin/Graphics/Shader/je_shader.h
+++ b/src/libjin/Graphics/Shader/je_shader.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <map>
 
-#include "../../3rdparty/GLee/GLee.h"
+#include "GLee/GLee.h"
 
 #include "../je_color.h"
 #include "../je_texture.h"
diff --git a/src/libjin/Graphics/je_bitmap.cpp b/src/libjin/Graphics/je_bitmap.cpp
index 0747f0b..14cf3c6 100644
--- a/src/libjin/Graphics/je_bitmap.cpp
+++ b/src/libjin/Graphics/je_bitmap.cpp
@@ -1,5 +1,5 @@
 #define STB_IMAGE_IMPLEMENTATION
-#include "../3rdparty/stb/stb_image.h"
+#include "stb/stb_image.h"
 
 #include "../filesystem/je_asset_database.h"
 #include "../math/je_math.h"
diff --git a/src/libjin/Graphics/je_bitmap.h b/src/libjin/Graphics/je_bitmap.h
index 8f0c30d..9d10106 100644
--- a/src/libjin/Graphics/je_bitmap.h
+++ b/src/libjin/Graphics/je_bitmap.h
@@ -3,7 +3,8 @@
 #include "../core/je_configuration.h"
 #if defined(jin_graphics)
 
-#include "../3rdparty/GLee/GLee.h"
+#include "GLee/GLee.h"
+
 #include "../common/je_types.h"
 #include "../math/je_vector2.hpp"
 
diff --git a/src/libjin/Graphics/je_gl.h b/src/libjin/Graphics/je_gl.h
index cda8bf9..f1e7a2b 100644
--- a/src/libjin/Graphics/je_gl.h
+++ b/src/libjin/Graphics/je_gl.h
@@ -1,8 +1,9 @@
 #ifndef __JE_OPENGL_H
 #define __JE_OPENGL_H
 
-#include "../3rdparty/GLee/GLee.h"
-#include "../3rdparty/ogl/OpenGL.h"
+#include "GLee/GLee.h"
+#include "ogl/OpenGL.h"
+
 #include "../math/je_matrix.h"
 
 namespace JinEngine
diff --git a/src/libjin/Graphics/je_image.cpp b/src/libjin/Graphics/je_image.cpp
index f800423..171bba0 100644
--- a/src/libjin/Graphics/je_image.cpp
+++ b/src/libjin/Graphics/je_image.cpp
@@ -1,4 +1,5 @@
-#include "../3rdparty/stb/stb_image.h"
+#include "stb/stb_image.h"
+
 #include "../filesystem/je_asset_database.h"
 
 #include "je_image.h"
diff --git a/src/libjin/Graphics/je_texture.h b/src/libjin/Graphics/je_texture.h
index 656ccd7..dff3f40 100644
--- a/src/libjin/Graphics/je_texture.h
+++ b/src/libjin/Graphics/je_texture.h
@@ -3,7 +3,7 @@
 #include "../core/je_configuration.h"
 #if defined(jin_graphics)
 
-#include "../3rdparty/GLee/GLee.h"
+#include "GLee/GLee.h"
 
 #include "je_color.h"
 #include "je_graphic_single.h"