*update

2 files changed, 67 insertions, 67 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index a446ab8..930aca4 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -183,6 +183,13 @@
     <ClCompile Include="..\..\src\3rdparty\lua51\lvm.c" />
     <ClCompile Include="..\..\src\3rdparty\lua51\lzio.c" />
     <ClCompile Include="..\..\src\3rdparty\lua51\print.c" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Canvas.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Drawable.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Font.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Geometry.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\JSL.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Texture.cpp" />
+    <ClCompile Include="..\..\src\libjin\Graphics\Window.cpp" />
     <ClCompile Include="..\..\src\libjin\Input\Event.cpp" />
     <ClCompile Include="..\..\src\libjin\Input\Joypad.cpp" />
     <ClCompile Include="..\..\src\libjin\Input\Keyboard.cpp" />
@@ -190,13 +197,6 @@
     <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\Render\Canvas.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\Drawable.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\Font.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\Graphics.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\JSL.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\Texture.cpp" />
-    <ClCompile Include="..\..\src\libjin\Render\Window.cpp" />
     <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\Log.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp" />
@@ -273,6 +273,15 @@
     <ClInclude Include="..\..\src\3rdparty\lua51\lvm.h" />
     <ClInclude Include="..\..\src\3rdparty\lua51\lzio.h" />
     <ClInclude Include="..\..\src\3rdparty\luax\luax.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Canvas.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Color.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Drawable.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Font.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Geometry.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Graphics.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\JSL.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Texture.h" />
+    <ClInclude Include="..\..\src\libjin\Graphics\Window.h" />
     <ClInclude Include="..\..\src\libjin\Input\Event.h" />
     <ClInclude Include="..\..\src\libjin\Input\Input.h" />
     <ClInclude Include="..\..\src\libjin\Input\Joypad.h" />
@@ -288,15 +297,6 @@
     <ClInclude Include="..\..\src\libjin\Net\Net.h" />
     <ClInclude Include="..\..\src\libjin\Physics\Physics.h" />
     <ClInclude Include="..\..\src\libjin\Physics\Rigid.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Canvas.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Color.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Drawable.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Font.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Graphics.h" />
-    <ClInclude Include="..\..\src\libjin\Render\JSL.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Render.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Texture.h" />
-    <ClInclude Include="..\..\src\libjin\Render\Window.h" />
     <ClInclude Include="..\..\src\libjin\Thread\Thread.h" />
     <ClInclude Include="..\..\src\libjin\Tilemap\Tilemap.h" />
     <ClInclude Include="..\..\src\libjin\tools\EventMsgCenter\EventMsgCenter.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 9a8cce5..e8ba812 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -91,9 +91,6 @@
     <Filter Include="src\libjin\Physics">
       <UniqueIdentifier>{3eded42e-5a27-433d-9b0a-c25190008be7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libjin\Render">
-      <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\libjin\Thread">
       <UniqueIdentifier>{31ad905a-11d7-4a67-ab7a-66caa3ae54fc}</UniqueIdentifier>
     </Filter>
@@ -136,6 +133,9 @@
     <Filter Include="src\libjin\3rdparty\smount">
       <UniqueIdentifier>{2add7117-cbae-4454-a5f1-93eaed51b3e6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\Graphics">
+      <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -327,27 +327,6 @@
     <ClCompile Include="..\..\src\libjin\Net\Net.cpp">
       <Filter>src\libjin\Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Canvas.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Drawable.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Font.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Graphics.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\JSL.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Texture.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libjin\Render\Window.cpp">
-      <Filter>src\libjin\Render</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\Thread\Thread.cpp">
       <Filter>src\libjin\Thread</Filter>
     </ClCompile>
@@ -384,6 +363,27 @@
     <ClCompile Include="..\..\src\libjin\3rdparty\smount\smount.c">
       <Filter>src\libjin\3rdparty\smount</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Canvas.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Drawable.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Font.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Geometry.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\JSL.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Texture.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\Graphics\Window.cpp">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h">
@@ -584,33 +584,6 @@
     <ClInclude Include="..\..\src\libjin\Physics\Rigid.h">
       <Filter>src\libjin\Physics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Canvas.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Color.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Drawable.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Font.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Graphics.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\JSL.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Render.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Texture.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libjin\Render\Window.h">
-      <Filter>src\libjin\Render</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\Thread\Thread.h">
       <Filter>src\libjin\Thread</Filter>
     </ClInclude>
@@ -668,6 +641,33 @@
     <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h">
       <Filter>src\libjin\3rdparty\smount</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Canvas.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Color.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Drawable.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Font.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Geometry.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Graphics.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\JSL.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Texture.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\Graphics\Window.h">
+      <Filter>src\libjin\Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">