*update

3 files changed, 65 insertions, 75 deletions

diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index 5a1fd76..ef402f1 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -4,69 +4,66 @@
     <Filter Include="src">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua">
-      <UniqueIdentifier>{e082b09b-1cdc-4c21-967b-eaf7130cf620}</UniqueIdentifier>
-    </Filter>
     <Filter Include="res">
       <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules">
+    <Filter Include="src\common">
+      <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libraries">
+      <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libraries\luax">
+      <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\modules">
       <UniqueIdentifier>{923b475a-00e2-4b8f-925a-ca1e5f9b4689}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\thread">
+    <Filter Include="src\modules\thread">
       <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\time">
+    <Filter Include="src\modules\time">
       <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\net">
+    <Filter Include="src\modules\net">
       <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\audio">
+    <Filter Include="src\modules\audio">
       <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\bit">
+    <Filter Include="src\modules\bit">
       <UniqueIdentifier>{b042ed61-32e5-4e86-b4f3-1a293de8918d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\core">
+    <Filter Include="src\modules\core">
       <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\event">
+    <Filter Include="src\modules\event">
       <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\filesystem">
+    <Filter Include="src\modules\filesystem">
       <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\graphics">
+    <Filter Include="src\modules\graphics">
       <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\joypad">
+    <Filter Include="src\modules\joypad">
       <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\keyboard">
+    <Filter Include="src\modules\keyboard">
       <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\math">
+    <Filter Include="src\modules\math">
       <UniqueIdentifier>{98c4385b-893c-4d60-bb82-2a19ee5ff527}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\mouse">
+    <Filter Include="src\modules\mouse">
       <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\common">
-      <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\libraries">
-      <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\libraries\luax">
-      <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
+    <Filter Include="src\modules\embed">
+      <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\resources">
+    <Filter Include="src\resources">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\modules\embed">
-      <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -76,67 +73,67 @@
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\audio\audio.cpp">
-      <Filter>src\lua\modules\audio</Filter>
+      <Filter>src\modules\audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\audio\source.cpp">
-      <Filter>src\lua\modules\audio</Filter>
+      <Filter>src\modules\audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\bit\bit.cpp">
-      <Filter>src\lua\modules\bit</Filter>
+      <Filter>src\modules\bit</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\core\core.cpp">
-      <Filter>src\lua\modules\core</Filter>
+      <Filter>src\modules\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\event\event.cpp">
-      <Filter>src\lua\modules\event</Filter>
+      <Filter>src\modules\event</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\filesystem\filesystem.cpp">
-      <Filter>src\lua\modules\filesystem</Filter>
+      <Filter>src\modules\filesystem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp">
-      <Filter>src\lua\modules\graphics</Filter>
+      <Filter>src\modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\font.cpp">
-      <Filter>src\lua\modules\graphics</Filter>
+      <Filter>src\modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp">
-      <Filter>src\lua\modules\graphics</Filter>
+      <Filter>src\modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\jsl.cpp">
-      <Filter>src\lua\modules\graphics</Filter>
+      <Filter>src\modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp">
-      <Filter>src\lua\modules\joypad</Filter>
+      <Filter>src\modules\joypad</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp">
-      <Filter>src\lua\modules\keyboard</Filter>
+      <Filter>src\modules\keyboard</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\math\math.cpp">
-      <Filter>src\lua\modules\math</Filter>
+      <Filter>src\modules\math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp">
-      <Filter>src\lua\modules\mouse</Filter>
+      <Filter>src\modules\mouse</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\net\Buffer.cpp">
-      <Filter>src\lua\modules\net</Filter>
+      <Filter>src\modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\net\net.cpp">
-      <Filter>src\lua\modules\net</Filter>
+      <Filter>src\modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\net\socket.cpp">
-      <Filter>src\lua\modules\net</Filter>
+      <Filter>src\modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\thread\thread.cpp">
-      <Filter>src\lua\modules\thread</Filter>
+      <Filter>src\modules\thread</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\time\time.cpp">
-      <Filter>src\lua\modules\time</Filter>
+      <Filter>src\modules\time</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\jin.cpp">
-      <Filter>src\lua\modules</Filter>
+      <Filter>src\modules</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp">
-      <Filter>src\lua\modules\graphics</Filter>
+      <Filter>src\modules\graphics</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -144,58 +141,58 @@
       <Filter>res</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\common\Reference.hpp">
-      <Filter>src\lua\common</Filter>
+      <Filter>src\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\common\Proxy.h">
-      <Filter>src\lua\common</Filter>
+      <Filter>src\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\common\common.h">
-      <Filter>src\lua\common</Filter>
+      <Filter>src\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\common\constant.h">
-      <Filter>src\lua\common</Filter>
+      <Filter>src\common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\embed.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\graphics.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\keyboard.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\mouse.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\net.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\path.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\net\Buffer.h">
-      <Filter>src\lua\modules\net</Filter>
+      <Filter>src\modules\net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\luax.h">
-      <Filter>src\lua\modules</Filter>
+      <Filter>src\modules</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\libraries\luax\luax.h">
-      <Filter>src\lua\libraries\luax</Filter>
+      <Filter>src\libraries\luax</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\resources\font.ttf.h">
-      <Filter>src\lua\resources</Filter>
+      <Filter>src\resources</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\types.h">
-      <Filter>src\lua\modules</Filter>
+      <Filter>src\modules</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\thread\thread.h">
-      <Filter>src\lua\modules\thread</Filter>
+      <Filter>src\modules\thread</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\jin.h">
-      <Filter>src\lua\modules</Filter>
+      <Filter>src\modules</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h">
-      <Filter>src\lua\modules\embed</Filter>
+      <Filter>src\modules\embed</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index a85c3a1..98fd116 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -174,7 +174,6 @@
     <ClInclude Include="..\..\..\src\libjin\Net\Net.h" />
     <ClInclude Include="..\..\..\src\libjin\Net\Socket.h" />
     <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h" />
-    <ClInclude Include="..\..\..\src\libjin\Tilemap\Tilemap.h" />
     <ClInclude Include="..\..\..\src\libjin\Time\Timer.h" />
     <ClInclude Include="..\..\..\src\libjin\Utils\endian.h" />
     <ClInclude Include="..\..\..\src\libjin\Utils\Log.h" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 93a6518..63f78ed 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -52,9 +52,6 @@
     <Filter Include="Source\Thread">
       <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\Tilemap">
-      <UniqueIdentifier>{7a39e6c4-8899-4bb7-bbad-cfb294fcd729}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source\Time">
       <UniqueIdentifier>{492364c7-464b-488e-aae0-15aca7824f32}</UniqueIdentifier>
     </Filter>
@@ -147,9 +144,6 @@
     <ClInclude Include="..\..\..\src\libjin\Thread\Thread.h">
       <Filter>Source\Thread</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Tilemap\Tilemap.h">
-      <Filter>Source\Tilemap</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\endian.h">
       <Filter>Source\Utils</Filter>
     </ClInclude>