change file tree

31 files changed, 117 insertions, 51 deletions

diff --git a/bin/jin.exe b/bin/jin.exe
index b0b3b9c..9cb4cba 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index eedeae5..3f1ec4a 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -202,14 +202,17 @@
     <ClCompile Include="..\..\src\libjin\render\image.cpp" />
     <ClCompile Include="..\..\src\libjin\render\jsl.cpp" />
     <ClCompile Include="..\..\src\libjin\render\window.cpp" />
-    <ClCompile Include="..\..\src\utils\matrix.cpp" />
+    <ClCompile Include="..\..\src\libjin\utils\matrix.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\libjin\audio\audio.h" />
+    <ClInclude Include="..\..\src\libjin\core\core.h" />
     <ClInclude Include="..\..\src\libjin\core\game.h" />
     <ClInclude Include="..\..\src\libjin\fs\buffer.h" />
     <ClInclude Include="..\..\src\libjin\fs\filesystem.h" />
+    <ClInclude Include="..\..\src\libjin\fs\fs.h" />
     <ClInclude Include="..\..\src\libjin\input\event.h" />
+    <ClInclude Include="..\..\src\libjin\input\input.h" />
     <ClInclude Include="..\..\src\libjin\input\keyboard.h" />
     <ClInclude Include="..\..\src\libjin\input\mouse.h" />
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h" />
@@ -243,6 +246,8 @@
     <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h" />
     <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h" />
     <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h" />
+    <ClInclude Include="..\..\src\libjin\jin.h" />
+    <ClInclude Include="..\..\src\libjin\render\render.h" />
     <ClInclude Include="..\..\src\script\embed\debug.lua.h" />
     <ClInclude Include="..\..\src\script\embed\embed.h" />
     <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
@@ -264,11 +269,11 @@
     <ClInclude Include="..\..\src\libjin\render\window.h" />
     <ClInclude Include="..\..\src\res\font.ttf.h" />
     <ClInclude Include="..\..\src\res\icon.png.h" />
-    <ClInclude Include="..\..\src\utils\endian.h" />
-    <ClInclude Include="..\..\src\utils\macros.h" />
-    <ClInclude Include="..\..\src\utils\math.h" />
-    <ClInclude Include="..\..\src\utils\matrix.h" />
-    <ClInclude Include="..\..\src\utils\utils.h" />
+    <ClInclude Include="..\..\src\libjin\utils\endian.h" />
+    <ClInclude Include="..\..\src\libjin\utils\macros.h" />
+    <ClInclude Include="..\..\src\libjin\utils\math.h" />
+    <ClInclude Include="..\..\src\libjin\utils\matrix.h" />
+    <ClInclude Include="..\..\src\libjin\utils\utils.h" />
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\..\src\res\font.ttf" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 6f376a0..d02d6ab 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -4,7 +4,7 @@
     <Filter Include="src">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier>
     </Filter>
-	<Filter Include="src\libjin">
+    <Filter Include="src\libjin">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\libjin\audio">
@@ -28,7 +28,7 @@
     <Filter Include="src\res">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\utils">
+    <Filter Include="src\libjin\utils">
       <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\3rdparty\GLee">
@@ -231,8 +231,8 @@
     <ClCompile Include="..\..\src\libjin\render\drawable.cpp">
       <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\utils\matrix.cpp">
-      <Filter>src\utils</Filter>
+    <ClCompile Include="..\..\src\libjin\utils\matrix.cpp">
+      <Filter>src\libjin\utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp">
       <Filter>src\libjin\fs</Filter>
@@ -410,8 +410,8 @@
     <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h">
       <Filter>src\3rdparty\stb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\utils.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\utils.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\3rdparty\lua51\luax.h">
       <Filter>src\3rdparty\lua51</Filter>
@@ -425,14 +425,14 @@
     <ClInclude Include="..\..\src\libjin\core\game.h">
       <Filter>src\libjin\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\matrix.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\matrix.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\endian.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\endian.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\math.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\math.h">
+      <Filter>src\libjin\utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\script\embed\debug.lua.h">
       <Filter>src\script\embed</Filter>
@@ -491,8 +491,23 @@
     <ClInclude Include="..\..\src\script\luaopen_types.h">
       <Filter>src\script</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\macros.h">
-      <Filter>src\utils</Filter>
+    <ClInclude Include="..\..\src\libjin\utils\macros.h">
+      <Filter>src\libjin\utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\jin.h">
+      <Filter>src\libjin</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\render\render.h">
+      <Filter>src\libjin\render</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\input\input.h">
+      <Filter>src\libjin\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\fs\fs.h">
+      <Filter>src\libjin\fs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\core\core.h">
+      <Filter>src\libjin\core</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libjin/core/core.h b/src/libjin/core/core.h
new file mode 100644
index 0000000..dd902b4
--- /dev/null
+++ b/src/libjin/core/core.h
@@ -0,0 +1,6 @@
+#ifndef __JIN_CORE_H
+#define __JIN_CORE_H
+
+#include "game.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/fs/buffer.h b/src/libjin/fs/buffer.h
index d727d84..dfdea21 100644
--- a/src/libjin/fs/buffer.h
+++ b/src/libjin/fs/buffer.h
@@ -1,3 +1,6 @@
+#ifndef __JIN_BUFFER_H
+#define __JIN_BUFFER_H
+
 #include <string.h>
 
 namespace jin
@@ -5,9 +8,6 @@ namespace jin
 namespace fs
 {
 
-    /**
-    * A file data buffer. 
-    */
     class Buffer
     {
     public:
@@ -30,7 +30,7 @@ namespace fs
 
     public:
 
-        // data position in memory     
+        // data position in memory
         void* data;
 
         // data buffer size 
@@ -39,4 +39,6 @@ namespace fs
     };
 
 }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/fs/fs.h b/src/libjin/fs/fs.h
new file mode 100644
index 0000000..6fbf33f
--- /dev/null
+++ b/src/libjin/fs/fs.h
@@ -0,0 +1,7 @@
+#ifndef __JIN_FS_H
+#define __JIN_FS_H
+
+#include "buffer.h"
+#include "filesystem.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/input/input.h b/src/libjin/input/input.h
new file mode 100644
index 0000000..217edd2
--- /dev/null
+++ b/src/libjin/input/input.h
@@ -0,0 +1,8 @@
+#ifndef __JIN_INPUT_H
+#define __JIN_INPUT_H
+
+#include "event.h"
+#include "keyboard.h"
+#include "mouse.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/jin.h b/src/libjin/jin.h
new file mode 100644
index 0000000..95895f7
--- /dev/null
+++ b/src/libjin/jin.h
@@ -0,0 +1,12 @@
+#ifndef __JIN_H
+#define __JIN_H
+
+#include "utils/utils.h"
+#include "audio/audio.h"
+#include "core/core.h"
+#include "fs/fs.h"
+#include "input/input.h"
+#include "net/net.h"
+#include "render/render.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/render/canvas.cpp b/src/libjin/render/canvas.cpp
index 494b0fa..376c076 100644
--- a/src/libjin/render/canvas.cpp
+++ b/src/libjin/render/canvas.cpp
@@ -1,4 +1,4 @@
-#include "utils/macros.h"
+#include "../utils/macros.h"
 #include "canvas.h" 
 #include "window.h"
 
diff --git a/src/libjin/render/color.h b/src/libjin/render/color.h
index dfb02e1..6f34b4a 100644
--- a/src/libjin/render/color.h
+++ b/src/libjin/render/color.h
@@ -3,7 +3,7 @@
 */
 #ifndef __JIN_COLOR_H
 #define __JIN_COLOR_H
-#include "utils/endian.h"
+#include "../utils/endian.h"
 
 namespace jin 
 {
diff --git a/src/libjin/render/drawable.cpp b/src/libjin/render/drawable.cpp
index 45d6044..7acd3bf 100644
--- a/src/libjin/render/drawable.cpp
+++ b/src/libjin/render/drawable.cpp
@@ -1,6 +1,7 @@
 #include "drawable.h"
-#include "utils/matrix.h"
+#include "../utils/matrix.h"
 #include <stdlib.h>
+
 namespace jin
 {
 namespace render
diff --git a/src/libjin/render/graphics.cpp b/src/libjin/render/graphics.cpp
index 15d8a9c..254b6a4 100644
--- a/src/libjin/render/graphics.cpp
+++ b/src/libjin/render/graphics.cpp
@@ -1,5 +1,5 @@
 #include "graphics.h" 
-#include "utils/math.h"
+#include "../utils/math.h"
 #include <string>
 namespace jin
 {
diff --git a/src/libjin/render/image.cpp b/src/libjin/render/image.cpp
index ac5947a..b27b9a6 100644
--- a/src/libjin/render/image.cpp
+++ b/src/libjin/render/image.cpp
@@ -1,6 +1,6 @@
 #include "image.h"
 #include "3rdparty/stb/stb_image.h"
-#include "utils/utils.h"
+#include "../utils/utils.h"
 namespace jin
 {
 namespace render
diff --git a/src/libjin/render/jsl.cpp b/src/libjin/render/jsl.cpp
index 6fcee53..1fb4482 100644
--- a/src/libjin/render/jsl.cpp
+++ b/src/libjin/render/jsl.cpp
@@ -1,4 +1,4 @@
-#include "utils/macros.h"
+#include "../utils/macros.h"
 #include "jsl.h"
 namespace jin
 {
diff --git a/src/libjin/render/render.h b/src/libjin/render/render.h
new file mode 100644
index 0000000..8939480
--- /dev/null
+++ b/src/libjin/render/render.h
@@ -0,0 +1,14 @@
+#ifndef __JIN_RENDER_H
+#define __JIN_RENDER_H
+
+#include "canvas.h"
+#include "color.h"
+#include "font.h"
+#include "graphics.h"
+#include "image.h"
+#include "jsl.h"
+#include "quad.h"
+#include "rect.h"
+#include "window.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/render/window.cpp b/src/libjin/render/window.cpp
index 20a6adc..e5d26a7 100644
--- a/src/libjin/render/window.cpp
+++ b/src/libjin/render/window.cpp
@@ -1,7 +1,7 @@
 #include "window.h"
 #include "3rdparty/GLee/GLee.h"
 #include "canvas.h"
-#include "utils/macros.h"
+#include "../utils/macros.h"
 namespace jin
 {
 namespace render
diff --git a/src/utils/endian.h b/src/libjin/utils/endian.h
index df28ddb..df28ddb 100644
--- a/src/utils/endian.h
+++ b/src/libjin/utils/endian.h
diff --git a/src/utils/macros.h b/src/libjin/utils/macros.h
index 4f739a9..4f739a9 100644
--- a/src/utils/macros.h
+++ b/src/libjin/utils/macros.h
diff --git a/src/utils/math.h b/src/libjin/utils/math.h
index 5e44ce7..5e44ce7 100644
--- a/src/utils/math.h
+++ b/src/libjin/utils/math.h
diff --git a/src/utils/matrix.cpp b/src/libjin/utils/matrix.cpp
index b970ec0..b970ec0 100644
--- a/src/utils/matrix.cpp
+++ b/src/libjin/utils/matrix.cpp
diff --git a/src/utils/matrix.h b/src/libjin/utils/matrix.h
index 51d7980..51d7980 100644
--- a/src/utils/matrix.h
+++ b/src/libjin/utils/matrix.h
diff --git a/src/utils/utils.h b/src/libjin/utils/utils.h
index f1a340b..45c8ff9 100644
--- a/src/utils/utils.h
+++ b/src/libjin/utils/utils.h
@@ -8,4 +8,9 @@
 #define within(a,min,max)        (a >= min && a <= max)
 #define without(a,min,max)        (a < min || a > max)
 
+#include "macros.h"
+#include "endian.h"
+#include "math.h"
+#include "matrix.h"
+
 #endif
\ No newline at end of file
diff --git a/src/script/audio/luaopen_audio.cpp b/src/script/audio/luaopen_audio.cpp
index 361eeeb..f170115 100644
--- a/src/script/audio/luaopen_audio.cpp
+++ b/src/script/audio/luaopen_audio.cpp
@@ -1,7 +1,7 @@
 #include <SDL2/SDL.h>
 
 #include "3rdparty/luax/luax.h"
-#include "libjin/audio/audio.h"
+#include "libjin/jin.h"
 
 namespace jin
 {
diff --git a/src/script/core/luaopen_core.cpp b/src/script/core/luaopen_core.cpp
index 82065c2..0d76ada 100644
--- a/src/script/core/luaopen_core.cpp
+++ b/src/script/core/luaopen_core.cpp
@@ -1,5 +1,5 @@
 #include "3rdparty/luax/luax.h"
-#include "libjin/core/game.h"
+#include "libjin/jin.h"
 
 namespace jin
 {
diff --git a/src/script/event/luaopen_event.cpp b/src/script/event/luaopen_event.cpp
index 2935761..87882e7 100644
--- a/src/script/event/luaopen_event.cpp
+++ b/src/script/event/luaopen_event.cpp
@@ -4,10 +4,7 @@
 #include <SDl2/SDL.h>
 
 #include "3rdparty/luax/luax.h"
-#include "libjin/input/event.h"
-#include "libjin/input/event.h"
-#include "libjin/input/mouse.h"
-#include "libjin/input/keyboard.h"
+#include "libjin/jin.h"
 
 using namespace jin::input;
 
diff --git a/src/script/filesystem/luaopen_filesystem.cpp b/src/script/filesystem/luaopen_filesystem.cpp
index d02feb9..2060d40 100644
--- a/src/script/filesystem/luaopen_filesystem.cpp
+++ b/src/script/filesystem/luaopen_filesystem.cpp
@@ -1,5 +1,5 @@
 #include "3rdparty/luax/luax.h"
-#include "libjin/fs/filesystem.h"
+#include "libjin/jin.h"
 #include <string>
 
 using namespace jin::fs;
diff --git a/src/script/graphics/luaopen_Canvas.cpp b/src/script/graphics/luaopen_Canvas.cpp
index 7371020..f869882 100644
--- a/src/script/graphics/luaopen_Canvas.cpp
+++ b/src/script/graphics/luaopen_Canvas.cpp
@@ -1,6 +1,6 @@
 #include "3rdparty/luax/luax.h"
 #include "../luaopen_types.h"
-#include "libjin/render/canvas.h"
+#include "libjin/jin.h"
 
 namespace jin
 {
diff --git a/src/script/graphics/luaopen_Font.cpp b/src/script/graphics/luaopen_Font.cpp
index 2bdb421..82dc078 100644
--- a/src/script/graphics/luaopen_Font.cpp
+++ b/src/script/graphics/luaopen_Font.cpp
@@ -1,6 +1,6 @@
 #include "3rdparty/luax/luax.h"
 #include "../luaopen_types.h"
-#include "libjin/render/font.h"
+#include "libjin/jin.h"
 
 using namespace jin::render;
 
diff --git a/src/script/graphics/luaopen_Image.cpp b/src/script/graphics/luaopen_Image.cpp
index 6fe089f..7b9b96a 100644
--- a/src/script/graphics/luaopen_Image.cpp
+++ b/src/script/graphics/luaopen_Image.cpp
@@ -1,5 +1,5 @@
 #include "3rdparty/luax/luax.h"
-#include "libjin/render/image.h"
+#include "libjin/jin.h"
 #include "../luaopen_types.h"
 
 using namespace jin::render;
diff --git a/src/script/graphics/luaopen_JSL.cpp b/src/script/graphics/luaopen_JSL.cpp
index c7b4e5e..218a973 100644
--- a/src/script/graphics/luaopen_JSL.cpp
+++ b/src/script/graphics/luaopen_JSL.cpp
@@ -1,6 +1,7 @@
 #include "3rdparty/luax/luax.h"
-#include "libjin/render/jsl.h"
+#include "libjin/jin.h"
 #include "../luaopen_types.h"
+
 namespace jin
 {
 namespace lua
diff --git a/src/script/graphics/luaopen_graphics.cpp b/src/script/graphics/luaopen_graphics.cpp
index 379cdf5..71637a9 100644
--- a/src/script/graphics/luaopen_graphics.cpp
+++ b/src/script/graphics/luaopen_graphics.cpp
@@ -1,13 +1,6 @@
-#include "utils/macros.h"
 #include "3rdparty/luax/luax.h"
 
-#include "libjin/render/image.h"
-#include "libjin/render/canvas.h"
-#include "libjin/render/jsl.h"
-#include "libjin/render/graphics.h"
-#include "libjin/render/window.h"
-#include "libjin/render/font.h"
-#include "libjin/fs/filesystem.h"
+#include "libjin/jin.h"
 
 #include "../luaopen_types.h"
 #include "../embed/graphics.lua.h"