+add modules

12 files changed, 59 insertions, 37 deletions

diff --git a/bin/jin.exe b/bin/jin.exe
index 42c0c76..e7f708a 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 18f965f..c67d6c5 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -190,6 +190,8 @@
     <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c" />
     <ClCompile Include="..\..\src\libjin\math\matrix.cpp" />
     <ClCompile Include="..\..\src\libjin\math\vector.cpp" />
+    <ClCompile Include="..\..\src\libjin\net\net.cpp" />
+    <ClCompile Include="..\..\src\libjin\thread\thread.cpp" />
     <ClCompile Include="..\..\src\libjin\utils\log.cpp" />
     <ClCompile Include="..\..\src\libjin\utils\unittest.cpp" />
     <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
@@ -232,8 +234,6 @@
     <ClInclude Include="..\..\src\libjin\audio\sdl\source.h" />
     <ClInclude Include="..\..\src\libjin\audio\source.h" />
     <ClInclude Include="..\..\src\libjin\common\data.h" />
-    <ClInclude Include="..\..\src\libjin\common\factory.h" />
-    <ClInclude Include="..\..\src\libjin\common\modules.h" />
     <ClInclude Include="..\..\src\libjin\common\singleton.h" />
     <ClInclude Include="..\..\src\libjin\common\subsystem.h" />
     <ClInclude Include="..\..\src\libjin\core\core.h" />
@@ -287,10 +287,14 @@
     <ClInclude Include="..\..\src\libjin\math\matrix.h" />
     <ClInclude Include="..\..\src\libjin\math\quad.h" />
     <ClInclude Include="..\..\src\libjin\math\vector.h" />
+    <ClInclude Include="..\..\src\libjin\modules.h" />
     <ClInclude Include="..\..\src\libjin\physics\physics.h" />
     <ClInclude Include="..\..\src\libjin\physics\rigid.h" />
     <ClInclude Include="..\..\src\libjin\render\render.h" />
+    <ClInclude Include="..\..\src\libjin\thread\thread.h" />
     <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h" />
+    <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" />
+    <ClInclude Include="..\..\src\libjin\ui\ui.h" />
     <ClInclude Include="..\..\src\libjin\utils\log.h" />
     <ClInclude Include="..\..\src\lua\embed\debug.lua.h" />
     <ClInclude Include="..\..\src\lua\embed\embed.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index bdc8af6..95fd77e 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -124,6 +124,18 @@
     <Filter Include="src\3rdparty\cmixer">
       <UniqueIdentifier>{9bd498bc-1624-44f5-8cb6-e2f98f5c0aca}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\thread">
+      <UniqueIdentifier>{31ad905a-11d7-4a67-ab7a-66caa3ae54fc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\ui">
+      <UniqueIdentifier>{bdf3096e-923f-4c91-bafe-03cf47f25ff2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\tools">
+      <UniqueIdentifier>{8fb29df7-e8de-4bce-944b-b8822e21f4c5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\tools\EventMsgCenter">
+      <UniqueIdentifier>{f7c7c527-a154-4bfe-a3a9-d34a3828da58}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -369,6 +381,12 @@
     <ClCompile Include="..\..\src\libjin\render\texture.cpp">
       <Filter>src\libjin\render</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\thread\thread.cpp">
+      <Filter>src\libjin\thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\net\net.cpp">
+      <Filter>src\libjin\net</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
@@ -632,9 +650,6 @@
     <ClInclude Include="..\..\src\libjin\physics\rigid.h">
       <Filter>src\libjin\physics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\common\factory.h">
-      <Filter>src\libjin\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\3rdparty\cmixer\cmixer.h">
       <Filter>src\3rdparty\cmixer</Filter>
     </ClInclude>
@@ -647,12 +662,21 @@
     <ClInclude Include="..\..\src\libjin\utils\log.h">
       <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\common\modules.h">
-      <Filter>src\libjin\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\render\texture.h">
       <Filter>src\libjin\render</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\thread\thread.h">
+      <Filter>src\libjin\thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\ui\ui.h">
+      <Filter>src\libjin\ui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\modules.h">
+      <Filter>src\libjin</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h">
+      <Filter>src\libjin\tools\EventMsgCenter</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">
diff --git a/src/libjin/common/factory.h b/src/libjin/common/factory.h
deleted file mode 100644
index af22605..0000000
--- a/src/libjin/common/factory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __JIN_COMMON_FACTORY_H
-#define __JIN_COMMON_FACTORY_H
-
-class Factory
-{
-
-public:
-
-
-};
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/common/modules.h b/src/libjin/common/modules.h
deleted file mode 100644
index 52b0160..0000000
--- a/src/libjin/common/modules.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __JIN_COMMON_MODULES_H
-#define __JIN_COMMON_MODULES_H
-
-#define JIN_MODULES_AUDIO 1 
-#define JIN_MODULES_RENDER 1 
-#define JIN_MODULES_DEBUG 1 
-#define JIN_MODULES_FILESYSTEM 1 
-#define JIN_MODULES_INPUT 1 
-#define JIN_MODULES_MATH 1 
-#define JIN_MODULES_NET 1 
-#define JIN_MODULES_PHYSICS 1 
-#define JIN_MODULES_TILEMAP 1 
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/modules.h b/src/libjin/modules.h
new file mode 100644
index 0000000..d8ff096
--- /dev/null
+++ b/src/libjin/modules.h
@@ -0,0 +1,16 @@
+#ifndef __JIN_COMMON_MODULES_H
+#define __JIN_COMMON_MODULES_H
+
+#define JIN_MODULES_AUDIO      1 
+#define JIN_MODULES_RENDER     1 
+#define JIN_MODULES_DEBUG      1
+#define JIN_MODULES_FILESYSTEM 1 
+#define JIN_MODULES_INPUT      1 
+#define JIN_MODULES_MATH       1 
+#define JIN_MODULES_NET        1 
+#define JIN_MODULES_PHYSICS    1 
+#define JIN_MODULES_TILEMAP    1
+#define JIN_MODULES_UI         1
+#define JIN_MODULES_TOOLS      1
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/net/net.cpp b/src/libjin/net/net.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/libjin/net/net.cpp
diff --git a/src/libjin/render/graphics.h b/src/libjin/render/graphics.h
index 579158d..b4f1fb0 100644
--- a/src/libjin/render/graphics.h
+++ b/src/libjin/render/graphics.h
@@ -1,6 +1,7 @@
 #ifndef __JIN_GRAPHICS_H
 #define __JIN_GRAPHICS_H
-
+#include "../modules.h"
+#if JIN_MODULES_RENDER
 #include "color.h"
 #include "canvas.h"
 #include "texture.h"
@@ -34,5 +35,5 @@ namespace render
     extern void polygon(RENDER_MODE mode, float* p, int count);
 }
 }
-
-#endif
+#endif // JIN_MODULES_RENDER
+#endif // __JIN_GRAPHICS_H
diff --git a/src/libjin/thread/thread.cpp b/src/libjin/thread/thread.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/libjin/thread/thread.cpp
diff --git a/src/libjin/thread/thread.h b/src/libjin/thread/thread.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/thread/thread.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/src/libjin/tools/EventMsgCenter/EventMsgCenter.h b/src/libjin/tools/EventMsgCenter/EventMsgCenter.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/tools/EventMsgCenter/EventMsgCenter.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/src/libjin/ui/ui.h b/src/libjin/ui/ui.h
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/src/libjin/ui/ui.h
@@ -0,0 +1 @@
+#pragma once