From d74e03063095d43c654fa52c3868f7ef8fce69f1 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 23 Oct 2018 22:09:22 +0800
Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vc++/jin.vcxproj                   |  56 +++++++-------
 build/vc++/jin.vcxproj.filters           | 122 ++++++++++++++++---------------
 build/vc++/libjin/libjin.vcxproj         |   8 +-
 build/vc++/libjin/libjin.vcxproj.filters |  36 ++++-----
 4 files changed, 115 insertions(+), 107 deletions(-)

(limited to 'build/vc++')

diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index a12378b..01b3a9a 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -145,31 +145,33 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\lua\jin.cpp" />
     <ClCompile Include="..\..\src\lua\main.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\audio\audio.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\audio\source.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\bit\bit.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\core\core.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\event\event.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\filesystem\filesystem.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\bitmap.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\texture_font.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\ttf.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\ttfData.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\math\math.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\net\buffer.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\net\net.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\net\socket.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\thread\thread.cpp" />
-    <ClCompile Include="..\..\src\lua\modules\time\time.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\core\je_lua_core.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\event\je_lua_event.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_bitmap.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_canvas.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_particle_system.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_text.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture_font.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_graphics.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_page.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_shader.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\joypad\je_lua_joypad.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\math\je_lua_math.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\mouse\je_lua_mouse.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_buffer.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_net.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_socket.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\thread\je_lua_thread.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\lua\common\common.h" />
@@ -188,8 +190,8 @@
     <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" />
     <ClInclude Include="..\..\src\lua\luax.h" />
     <ClInclude Include="..\..\src\lua\modules\luax.h" />
-    <ClInclude Include="..\..\src\lua\modules\net\buffer.h" />
-    <ClInclude Include="..\..\src\lua\modules\thread\thread.h" />
+    <ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h" />
+    <ClInclude Include="..\..\src\lua\modules\thread\je_lua_thread.h" />
     <ClInclude Include="..\..\src\lua\modules\types.h" />
     <ClInclude Include="..\..\src\lua\resources\font.ttf.h" />
     <ClInclude Include="resource.h" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index 1a17f85..ba41a45 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -66,87 +66,93 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\lua\modules\audio\audio.cpp">
+    <ClCompile Include="..\..\src\lua\jin.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\main.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_graphics.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_page.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_shader.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_text.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture_font.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_canvas.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_bitmap.cpp">
+      <Filter>src\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp">
       <Filter>src\modules\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\audio\source.cpp">
+    <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp">
       <Filter>src\modules\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\bit\bit.cpp">
+    <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp">
       <Filter>src\modules\bit</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\core\core.cpp">
+    <ClCompile Include="..\..\src\lua\modules\core\je_lua_core.cpp">
       <Filter>src\modules\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\event\event.cpp">
+    <ClCompile Include="..\..\src\lua\modules\event\je_lua_event.cpp">
       <Filter>src\modules\event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\filesystem\filesystem.cpp">
+    <ClCompile Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp">
       <Filter>src\modules\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\canvas.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\graphics.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\joypad\joypad.cpp">
+    <ClCompile Include="..\..\src\lua\modules\joypad\je_lua_joypad.cpp">
       <Filter>src\modules\joypad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\keyboard\keyboard.cpp">
+    <ClCompile Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp">
       <Filter>src\modules\keyboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\math\math.cpp">
+    <ClCompile Include="..\..\src\lua\modules\math\je_lua_math.cpp">
       <Filter>src\modules\math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\mouse\mouse.cpp">
+    <ClCompile Include="..\..\src\lua\modules\mouse\je_lua_mouse.cpp">
       <Filter>src\modules\mouse</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\net\net.cpp">
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_buffer.cpp">
+      <Filter>src\modules\net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_net.cpp">
       <Filter>src\modules\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\net\socket.cpp">
+    <ClCompile Include="..\..\src\lua\modules\net\je_lua_socket.cpp">
       <Filter>src\modules\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\thread\thread.cpp">
+    <ClCompile Include="..\..\src\lua\modules\thread\je_lua_thread.cpp">
       <Filter>src\modules\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\time\time.cpp">
+    <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp">
       <Filter>src\modules\time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\texture.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\bitmap.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\shader.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\jin.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\main.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\page.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\ttfData.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\ttf.cpp">
+    <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_particle_system.cpp">
       <Filter>src\modules\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\text.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\graphics\texture_font.cpp">
-      <Filter>src\modules\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\modules\net\buffer.cpp">
-      <Filter>src\modules\net</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
@@ -170,12 +176,6 @@
     <ClInclude Include="..\..\src\lua\resources\font.ttf.h">
       <Filter>src\resources</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\modules\types.h">
-      <Filter>src\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\modules\thread\thread.h">
-      <Filter>src\modules\thread</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\lua\common\error.h">
       <Filter>src\common</Filter>
     </ClInclude>
@@ -209,9 +209,15 @@
     <ClInclude Include="..\..\src\lua\luax.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\modules\net\buffer.h">
+    <ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h">
       <Filter>src\modules\net</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\thread\je_lua_thread.h">
+      <Filter>src\modules\thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\types.h">
+      <Filter>src\modules</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="jin.rc">
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index 3a9deae..e7efdd7 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -182,8 +182,8 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_batch.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_emitter.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_system.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_base.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\je_default.shader.h" />
@@ -256,8 +256,8 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_batch.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_emitter.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_system.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\je_shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_shapes.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index bddf3cb..9c35e9d 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -306,18 +306,9 @@
     <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h">
       <Filter>source\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_emitter.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h">
       <Filter>source\graphics\particle</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_batch.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_system.h">
-      <Filter>source\graphics\particle</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\ai\je_behavior_tree.h">
       <Filter>source\ai</Filter>
     </ClInclude>
@@ -345,6 +336,15 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic.h">
       <Filter>source\graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle_system.h">
+      <Filter>source\graphics\particle</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h">
+      <Filter>source\graphics\particle</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h">
+      <Filter>source\graphics\particle</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -481,18 +481,9 @@
     <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp">
       <Filter>source\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_system.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_emitter.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp">
       <Filter>source\graphics\particle</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_batch.cpp">
-      <Filter>source\graphics\particle</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\ai\je_behavior_tree.cpp">
       <Filter>source\ai</Filter>
     </ClCompile>
@@ -514,5 +505,14 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic.cpp">
       <Filter>source\graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_system.cpp">
+      <Filter>source\graphics\particle</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp">
+      <Filter>source\graphics\particle</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp">
+      <Filter>source\graphics\particle</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0