*thread

14 files changed, 221 insertions, 40 deletions

diff --git a/build/3rd-party/Luax/Luax.vcxproj b/build/3rd-party/Luax/Luax.vcxproj
index a24c972..b5730c6 100644
--- a/build/3rd-party/Luax/Luax.vcxproj
+++ b/build/3rd-party/Luax/Luax.vcxproj
@@ -126,7 +126,7 @@
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_cfunctions.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_class.hpp" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_config.h" />
-    <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_context.h" />
+    <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_vm.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_enum.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_memberref.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_ref.h" />
@@ -137,7 +137,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_cfunctions.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_class.cpp" />
-    <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_context.cpp" />
+    <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_vm.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_enum.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_memberref.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_ref.cpp" />
diff --git a/build/3rd-party/Luax/Luax.vcxproj.filters b/build/3rd-party/Luax/Luax.vcxproj.filters
index 705dcd9..7f385fc 100644
--- a/build/3rd-party/Luax/Luax.vcxproj.filters
+++ b/build/3rd-party/Luax/Luax.vcxproj.filters
@@ -9,9 +9,9 @@
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_runtime.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_class.hpp" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_enum.h" />
-    <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_context.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_cfunctions.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_memberref.h" />
+    <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_vm.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_ref.cpp" />
@@ -19,10 +19,10 @@
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_reftable.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_runtime.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_enum.cpp" />
-    <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_context.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_cfunctions.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_memberref.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_class.cpp" />
+    <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_vm.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\3rd-party\Luax\luax_state.inl" />
diff --git a/build/3rd-party/uuid4/uuid4.vcxproj b/build/3rd-party/uuid4/uuid4.vcxproj
new file mode 100644
index 0000000..e552199
--- /dev/null
+++ b/build/3rd-party/uuid4/uuid4.vcxproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{49F7847E-219E-4A7B-8484-2A33DAC29DD0}</ProjectGuid>
+    <RootNamespace>uuid4</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\3rd-party\uuid4\uuid4.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\3rd-party\uuid4\uuid4.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/3rd-party/uuid4/uuid4.vcxproj.filters b/build/3rd-party/uuid4/uuid4.vcxproj.filters
new file mode 100644
index 0000000..6f984b1
--- /dev/null
+++ b/build/3rd-party/uuid4/uuid4.vcxproj.filters
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\3rd-party\uuid4\uuid4.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\3rd-party\uuid4\uuid4.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/3rd-party/uuid4/uuid4.vcxproj.user b/build/3rd-party/uuid4/uuid4.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/build/3rd-party/uuid4/uuid4.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/build/Asura.sln b/build/Asura.sln
index 9c0e875..66cb6d4 100644
--- a/build/Asura.sln
+++ b/build/Asura.sln
@@ -99,6 +99,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaS
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -551,6 +553,16 @@ Global
 		{2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x64.Build.0 = Release|x64
 		{2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.ActiveCfg = Release|Win32
 		{2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.Build.0 = Release|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x64.ActiveCfg = Debug|x64
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x64.Build.0 = Debug|x64
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x86.ActiveCfg = Debug|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x86.Build.0 = Debug|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|Any CPU.ActiveCfg = Release|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x64.ActiveCfg = Release|x64
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x64.Build.0 = Release|x64
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.ActiveCfg = Release|Win32
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -594,6 +606,7 @@ Global
 		{6361701E-BD43-4AE9-8AE2-5C8F87D436BA} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
 		{E15D111A-9E02-4E0D-86FE-62BFCD3C211E} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 		{2822F737-EEFA-4C74-872C-1EE0793E2221} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+		{49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}
diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj b/build/libs/asura-lib-core/asura-lib-core.vcxproj
index 5530000..cebc42a 100644
--- a/build/libs/asura-lib-core/asura-lib-core.vcxproj
+++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj
@@ -150,10 +150,6 @@
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\texture.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glew.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glut.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\clipboard.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp" />
@@ -161,6 +157,10 @@
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\mouse.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\profiler\stats.cpp" />
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\time\timer.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\application.h" />
@@ -193,10 +193,6 @@
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\texture.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glew.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glut.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\clipboard.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h" />
@@ -208,6 +204,10 @@
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\profiler\stats.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\time\timer.h" />
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\type.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\libs\asura-lib-core\font\string.inl" />
diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters
index a118d6a..8ef99f7 100644
--- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters
+++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters
@@ -19,6 +19,9 @@
     <Filter Include="graphics\binding">
       <UniqueIdentifier>{4f6b2c19-1a06-48c9-b89d-52fa27bec5c1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="window">
+      <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\application.cpp" />
@@ -70,9 +73,6 @@
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\texture.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\clipboard.cpp">
       <Filter>input</Filter>
     </ClCompile>
@@ -104,21 +104,12 @@
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color32.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp">
       <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glew.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glut.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_canvas.cpp">
       <Filter>graphics\binding</Filter>
     </ClCompile>
@@ -149,6 +140,18 @@
     <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_window.cpp">
       <Filter>graphics\binding</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\application.h" />
@@ -215,9 +218,6 @@
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\texture.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\clipboard.h">
       <Filter>input</Filter>
     </ClInclude>
@@ -263,20 +263,23 @@
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color32.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h">
       <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glew.h">
-      <Filter>graphics</Filter>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.h">
+      <Filter>window</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_glut.h">
-      <Filter>graphics</Filter>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.h">
+      <Filter>window</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj
index dd05ef3..6ea6e0e 100644
--- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj
+++ b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj
@@ -76,6 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -108,6 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -115,6 +117,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters
index 9cd8510..19278c7 100644
--- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters
+++ b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters
@@ -1,2 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.cpp" />
+    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/tests/05-physfs/05-physfs.vcxproj.user b/build/tests/05-physfs/05-physfs.vcxproj.user
index be25078..0858e0c 100644
--- a/build/tests/05-physfs/05-physfs.vcxproj.user
+++ b/build/tests/05-physfs/05-physfs.vcxproj.user
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\win64</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\Bin\win64</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build/tools/bindingGen/main.cs b/build/tools/bindingGen/main.cs
index c9290b8..7f99da4 100644
--- a/build/tools/bindingGen/main.cs
+++ b/build/tools/bindingGen/main.cs
@@ -130,8 +130,8 @@ namespace {1}
 			if (mc.Count == 0)
 				return "";
 
-			string reg_enum_l = @"(?<=enum\s";
-			string reg_enum_r = @"[\s\n]*\{((?!\{)[\s\S])*)[A-Z_]+(?=\s*)";
+			string reg_enum_l = @"(?<=enum\s*";
+			string reg_enum_r = @"[\s\n]*\{((?!\})[\s\S])*)[A-Z_]+(?=\s*)";
 			string enums = "";
 
 			foreach(var m in mc)
diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt
index 442f839..3656c65 100644
--- a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt
+++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt
@@ -8,5 +8,3 @@ D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.pdb
 D:\Asura\bin\win64\bindingGen.exe.config
 D:\Asura\bin\win64\bindingGen.exe
 D:\Asura\bin\win64\bindingGen.pdb
-D:\Asura\bin\win64\bindingGen.exe.CodeAnalysisLog.xml
-D:\Asura\bin\win64\bindingGen.exe.lastcodeanalysissucceeded
diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.exe b/build/tools/bindingGen/obj/Debug/bindingGen.exe
index 19029df..b196836 100644
--- a/build/tools/bindingGen/obj/Debug/bindingGen.exe
+++ b/build/tools/bindingGen/obj/Debug/bindingGen.exe