修改audio模块

2 files changed, 170 insertions, 123 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 8f64c09..1b1f649 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -84,6 +84,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
+      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -110,6 +111,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
+      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -136,8 +138,12 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\libjin\audio\audio.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\sdl\audio.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\sdl\source.cpp" />
     <ClCompile Include="..\..\src\libjin\audio\source.cpp" />
     <ClCompile Include="..\..\src\libjin\core\game.cpp" />
+    <ClCompile Include="..\..\src\libjin\core\thread.cpp" />
+    <ClCompile Include="..\..\src\libjin\core\timer.cpp" />
     <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp" />
     <ClCompile Include="..\..\src\libjin\input\event.cpp" />
     <ClCompile Include="..\..\src\libjin\input\joypad.cpp" />
@@ -181,24 +187,24 @@
     <ClCompile Include="..\..\src\libjin\math\matrix.cpp" />
     <ClCompile Include="..\..\src\libjin\math\vector.cpp" />
     <ClCompile Include="..\..\src\libjin\utils\unittest.cpp" />
-    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp" />
-    <ClCompile Include="..\..\src\script\audio\luaopen_Source.cpp" />
-    <ClCompile Include="..\..\src\script\core\luaopen_core.cpp" />
-    <ClCompile Include="..\..\src\script\debug\luaopen_debug.cpp" />
-    <ClCompile Include="..\..\src\script\event\luaopen_event.cpp" />
-    <ClCompile Include="..\..\src\script\filesystem\luaopen_filesystem.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Canvas.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Font.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_graphics.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Image.cpp" />
-    <ClCompile Include="..\..\src\script\graphics\luaopen_JSL.cpp" />
-    <ClCompile Include="..\..\src\script\joypad\luaopen_joypad.cpp" />
-    <ClCompile Include="..\..\src\script\keyboard\luaopen_keyboard.cpp" />
-    <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp" />
-    <ClCompile Include="..\..\src\script\luaopen_jin.cpp" />
-    <ClCompile Include="..\..\src\script\net\luaopen_net.cpp" />
-    <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp" />
-    <ClCompile Include="..\..\src\script\time\luaopen_time.cpp" />
+    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
+    <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp" />
+    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp" />
+    <ClCompile Include="..\..\src\lua\debug\luaopen_debug.cpp" />
+    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp" />
+    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp" />
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp" />
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp" />
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp" />
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp" />
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp" />
+    <ClCompile Include="..\..\src\lua\joypad\luaopen_joypad.cpp" />
+    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp" />
+    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp" />
+    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp" />
+    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp" />
+    <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp" />
+    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\libjin\render\canvas.cpp" />
     <ClCompile Include="..\..\src\libjin\render\drawable.cpp" />
@@ -212,10 +218,14 @@
     <ClInclude Include="..\..\src\data\font.ttf.h" />
     <ClInclude Include="..\..\src\data\icon.png.h" />
     <ClInclude Include="..\..\src\libjin\audio\audio.h" />
+    <ClInclude Include="..\..\src\libjin\audio\sdl\audio.h" />
+    <ClInclude Include="..\..\src\libjin\audio\sdl\source.h" />
     <ClInclude Include="..\..\src\libjin\audio\source.h" />
     <ClInclude Include="..\..\src\libjin\common\subsystem.h" />
     <ClInclude Include="..\..\src\libjin\core\core.h" />
     <ClInclude Include="..\..\src\libjin\core\game.h" />
+    <ClInclude Include="..\..\src\libjin\core\thread.h" />
+    <ClInclude Include="..\..\src\libjin\core\timer.h" />
     <ClInclude Include="..\..\src\libjin\debug\debug.h" />
     <ClInclude Include="..\..\src\libjin\debug\log.h" />
     <ClInclude Include="..\..\src\libjin\fs\buffer.h" />
@@ -261,20 +271,20 @@
     <ClInclude Include="..\..\src\libjin\math\math.h" />
     <ClInclude Include="..\..\src\libjin\math\matrix.h" />
     <ClInclude Include="..\..\src\libjin\math\quad.h" />
-    <ClInclude Include="..\..\src\libjin\math\rect.h" />
     <ClInclude Include="..\..\src\libjin\math\vector.h" />
+    <ClInclude Include="..\..\src\libjin\physics\physics.h" />
     <ClInclude Include="..\..\src\libjin\render\render.h" />
     <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h" />
-    <ClInclude Include="..\..\src\script\embed\debug.lua.h" />
-    <ClInclude Include="..\..\src\script\embed\embed.h" />
-    <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
-    <ClInclude Include="..\..\src\script\embed\boot.lua.h" />
-    <ClInclude Include="..\..\src\script\embed\keyboard.lua.h" />
-    <ClInclude Include="..\..\src\script\embed\mouse.lua.h" />
-    <ClInclude Include="..\..\src\script\embed\path.lua.h" />
-    <ClInclude Include="..\..\src\script\joypad\joypad.h" />
-    <ClInclude Include="..\..\src\script\luaopen_jin.h" />
-    <ClInclude Include="..\..\src\script\luaopen_types.h" />
+    <ClInclude Include="..\..\src\lua\embed\debug.lua.h" />
+    <ClInclude Include="..\..\src\lua\embed\embed.h" />
+    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" />
+    <ClInclude Include="..\..\src\lua\embed\boot.lua.h" />
+    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h" />
+    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h" />
+    <ClInclude Include="..\..\src\lua\embed\path.lua.h" />
+    <ClInclude Include="..\..\src\lua\joypad\joypad.h" />
+    <ClInclude Include="..\..\src\lua\luaopen_jin.h" />
+    <ClInclude Include="..\..\src\lua\luaopen_types.h" />
     <ClInclude Include="..\..\src\libjin\net\net.h" />
     <ClInclude Include="..\..\src\libjin\render\canvas.h" />
     <ClInclude Include="..\..\src\libjin\render\color.h" />
@@ -287,15 +297,16 @@
     <ClInclude Include="..\..\src\libjin\utils\endian.h" />
     <ClInclude Include="..\..\src\libjin\utils\macros.h" />
     <ClInclude Include="..\..\src\libjin\utils\utils.h" />
+    <ClInclude Include="..\..\src\lua\luax.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile" />
-    <None Include="..\..\src\script\embed\debug.lua" />
-    <None Include="..\..\src\script\embed\graphics.lua" />
-    <None Include="..\..\src\script\embed\boot.lua" />
-    <None Include="..\..\src\script\embed\keyboard.lua" />
-    <None Include="..\..\src\script\embed\mouse.lua" />
-    <None Include="..\..\src\script\embed\path.lua" />
+    <None Include="..\..\src\lua\embed\debug.lua" />
+    <None Include="..\..\src\lua\embed\graphics.lua" />
+    <None Include="..\..\src\lua\embed\boot.lua" />
+    <None Include="..\..\src\lua\embed\keyboard.lua" />
+    <None Include="..\..\src\lua\embed\mouse.lua" />
+    <None Include="..\..\src\lua\embed\path.lua" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 8094c37..d0e04de 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -43,52 +43,52 @@
     <Filter Include="src\3rdparty\luax">
       <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script">
+    <Filter Include="src\lua">
       <UniqueIdentifier>{e082b09b-1cdc-4c21-967b-eaf7130cf620}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\embed">
+    <Filter Include="src\lua\embed">
       <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\3rdparty\smount">
       <UniqueIdentifier>{dd79db1e-9bec-4f8e-8d37-0d82c74a534b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\core">
+    <Filter Include="src\lua\core">
       <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\graphics">
+    <Filter Include="src\lua\graphics">
       <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\audio">
+    <Filter Include="src\lua\audio">
       <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\event">
+    <Filter Include="src\lua\event">
       <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\keyboard">
+    <Filter Include="src\lua\keyboard">
       <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\mouse">
+    <Filter Include="src\lua\mouse">
       <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\debug">
+    <Filter Include="src\lua\debug">
       <UniqueIdentifier>{0280790b-7c7a-406d-8606-b39c944fefaa}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\filesystem">
+    <Filter Include="src\lua\filesystem">
       <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\net">
+    <Filter Include="src\lua\net">
       <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\time">
+    <Filter Include="src\lua\time">
       <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\3rdparty\tekcos">
       <UniqueIdentifier>{065bf16a-223d-4aae-ab0b-c7b5af5e3596}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\thread">
+    <Filter Include="src\lua\thread">
       <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\embed\script">
+    <Filter Include="src\lua\embed\script">
       <UniqueIdentifier>{1b7a28ed-7715-48bc-8793-6e575e887f77}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\data">
@@ -97,7 +97,7 @@
     <Filter Include="src\libjin\tilemap">
       <UniqueIdentifier>{be27da6f-98b1-4e99-ac75-c3116f1618de}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\script\joypad">
+    <Filter Include="src\lua\joypad">
       <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\libjin\common">
@@ -109,6 +109,15 @@
     <Filter Include="src\libjin\math">
       <UniqueIdentifier>{3c5d715c-d885-4af9-95db-3b1ca43cae58}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\libjin\audio\sdl">
+      <UniqueIdentifier>{14019a9d-eeaf-42be-b0ec-833217f3c131}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\audio\openal">
+      <UniqueIdentifier>{eb34937f-6278-4d8e-ad48-3c7a6dd6606c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\physics">
+      <UniqueIdentifier>{3eded42e-5a27-433d-9b0a-c25190008be7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -252,68 +261,65 @@
     <ClCompile Include="..\..\src\3rdparty\smount\smount.c">
       <Filter>src\3rdparty\smount</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libjin\audio\audio.cpp">
-      <Filter>src\libjin\audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c">
       <Filter>src\3rdparty\tekcos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp">
-      <Filter>src\script\audio</Filter>
+    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp">
+      <Filter>src\lua\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\core\luaopen_core.cpp">
-      <Filter>src\script\core</Filter>
+    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp">
+      <Filter>src\lua\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\debug\luaopen_debug.cpp">
-      <Filter>src\script\debug</Filter>
+    <ClCompile Include="..\..\src\lua\debug\luaopen_debug.cpp">
+      <Filter>src\lua\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\event\luaopen_event.cpp">
-      <Filter>src\script\event</Filter>
+    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp">
+      <Filter>src\lua\event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\filesystem\luaopen_filesystem.cpp">
-      <Filter>src\script\filesystem</Filter>
+    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp">
+      <Filter>src\lua\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Canvas.cpp">
-      <Filter>src\script\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp">
+      <Filter>src\lua\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Font.cpp">
-      <Filter>src\script\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp">
+      <Filter>src\lua\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_graphics.cpp">
-      <Filter>src\script\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp">
+      <Filter>src\lua\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_Image.cpp">
-      <Filter>src\script\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp">
+      <Filter>src\lua\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\graphics\luaopen_JSL.cpp">
-      <Filter>src\script\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp">
+      <Filter>src\lua\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\keyboard\luaopen_keyboard.cpp">
-      <Filter>src\script\keyboard</Filter>
+    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp">
+      <Filter>src\lua\keyboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp">
-      <Filter>src\script\mouse</Filter>
+    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp">
+      <Filter>src\lua\mouse</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\net\luaopen_net.cpp">
-      <Filter>src\script\net</Filter>
+    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp">
+      <Filter>src\lua\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\time\luaopen_time.cpp">
-      <Filter>src\script\time</Filter>
+    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp">
+      <Filter>src\lua\time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\luaopen_jin.cpp">
-      <Filter>src\script</Filter>
+    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp">
+      <Filter>src\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp">
-      <Filter>src\script\thread</Filter>
+    <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp">
+      <Filter>src\lua\thread</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libjin\audio\source.cpp">
       <Filter>src\libjin\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\joypad\luaopen_joypad.cpp">
-      <Filter>src\script\joypad</Filter>
+    <ClCompile Include="..\..\src\lua\joypad\luaopen_joypad.cpp">
+      <Filter>src\lua\joypad</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\script\audio\luaopen_Source.cpp">
-      <Filter>src\script\audio</Filter>
+    <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp">
+      <Filter>src\lua\audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libjin\input\joypad.cpp">
       <Filter>src\libjin\input</Filter>
@@ -327,6 +333,21 @@
     <ClCompile Include="..\..\src\libjin\math\vector.cpp">
       <Filter>src\libjin\math</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libjin\audio\sdl\audio.cpp">
+      <Filter>src\libjin\audio\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\audio\sdl\source.cpp">
+      <Filter>src\libjin\audio\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\audio\audio.cpp">
+      <Filter>src\libjin\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\core\timer.cpp">
+      <Filter>src\libjin\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libjin\core\thread.cpp">
+      <Filter>src\libjin\core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
@@ -455,26 +476,26 @@
     <ClInclude Include="..\..\src\libjin\utils\endian.h">
       <Filter>src\libjin\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\debug.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\debug.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\graphics.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\keyboard.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\embed.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\embed.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\boot.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\boot.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\mouse.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\embed\path.lua.h">
-      <Filter>src\script\embed</Filter>
+    <ClInclude Include="..\..\src\lua\embed\path.lua.h">
+      <Filter>src\lua\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libjin\fs\buffer.h">
       <Filter>src\libjin\fs</Filter>
@@ -497,11 +518,11 @@
     <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h">
       <Filter>src\3rdparty\tekcos</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\luaopen_jin.h">
-      <Filter>src\script</Filter>
+    <ClInclude Include="..\..\src\lua\luaopen_jin.h">
+      <Filter>src\lua</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\luaopen_types.h">
-      <Filter>src\script</Filter>
+    <ClInclude Include="..\..\src\lua\luaopen_types.h">
+      <Filter>src\lua</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libjin\utils\macros.h">
       <Filter>src\libjin\utils</Filter>
@@ -533,7 +554,7 @@
     <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h">
       <Filter>src\libjin\tilemap</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\script\joypad\joypad.h">
+    <ClInclude Include="..\..\src\lua\joypad\joypad.h">
       <Filter>src\libjin\input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libjin\common\subsystem.h">
@@ -554,37 +575,52 @@
     <ClInclude Include="..\..\src\libjin\math\quad.h">
       <Filter>src\libjin\math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libjin\math\rect.h">
-      <Filter>src\libjin\math</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\math\constant.h">
       <Filter>src\libjin\math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libjin\math\vector.h">
       <Filter>src\libjin\math</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\audio\sdl\audio.h">
+      <Filter>src\libjin\audio\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\audio\sdl\source.h">
+      <Filter>src\libjin\audio\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\physics\physics.h">
+      <Filter>src\libjin\physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\core\timer.h">
+      <Filter>src\libjin\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libjin\core\thread.h">
+      <Filter>src\libjin\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\luax.h">
+      <Filter>src\lua</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">
       <Filter>src\3rdparty\lua51</Filter>
     </None>
-    <None Include="..\..\src\script\embed\boot.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\boot.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
-    <None Include="..\..\src\script\embed\debug.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\debug.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
-    <None Include="..\..\src\script\embed\graphics.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\graphics.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
-    <None Include="..\..\src\script\embed\keyboard.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\keyboard.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
-    <None Include="..\..\src\script\embed\mouse.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\mouse.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
-    <None Include="..\..\src\script\embed\path.lua">
-      <Filter>src\script\embed\script</Filter>
+    <None Include="..\..\src\lua\embed\path.lua">
+      <Filter>src\lua\embed\script</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file