*misc

12 files changed, 329 insertions, 61 deletions

diff --git a/Build/3rdParty/Luax/Luax.vcxproj b/Build/3rdParty/Luax/Luax.vcxproj
index 9a875b2..92e4686 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj
+++ b/Build/3rdParty/Luax/Luax.vcxproj
@@ -39,13 +39,13 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,7 +69,12 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -84,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -108,6 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -118,6 +125,7 @@
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\lua.hpp" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_class.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_config.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_function.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_module.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_ref.h" />
@@ -135,6 +143,15 @@
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_state.cpp" />
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_variable.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lua51\lua51.vcxproj">
+      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_class.inl" />
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_state.inl" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Build/3rdParty/Luax/Luax.vcxproj.filters b/Build/3rdParty/Luax/Luax.vcxproj.filters
index 13acadc..54bfbc2 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj.filters
+++ b/Build/3rdParty/Luax/Luax.vcxproj.filters
@@ -10,6 +10,7 @@
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_runtime.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_state.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_variable.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_config.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax.cpp" />
@@ -21,4 +22,8 @@
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_state.cpp" />
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_variable.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_state.inl" />
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_class.inl" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/3rdParty/Luax/Luax.vcxproj.user b/Build/3rdParty/Luax/Luax.vcxproj.user
index be25078..0b0f24d 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj.user
+++ b/Build/3rdParty/Luax/Luax.vcxproj.user
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/3rdParty/lua51/lua51.vcxproj b/Build/3rdParty/lua51/lua51.vcxproj
index 460b971..db1825c 100644
--- a/Build/3rdParty/lua51/lua51.vcxproj
+++ b/Build/3rdParty/lua51/lua51.vcxproj
@@ -39,13 +39,13 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,7 +69,12 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -84,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -108,6 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index 49f20fd..bb736dc 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -135,12 +135,10 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Application.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Asura.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\SoundDecoder.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\DataBuffer.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\DecodedData.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Reloadable.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\ResourceManager.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Font\Glyph.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\BlendMode.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" />
@@ -151,26 +149,36 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\GL.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\PixelFormat.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\PNGDecoder.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Quad.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\RenderState.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\RenderTarget.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\STBDecoder.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Config.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Clipboard.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Cursor.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\InputDevice.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Mouse.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Manager.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Curve.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\RangedValue.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Rect.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Transform.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Object.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Physics\World.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Luax.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Portable.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Type.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Singleton.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Type.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\Glyph.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\String.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\TrueTypeFont.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\Utf.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Input\Keyboard.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Functions.h" />
@@ -180,14 +188,12 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Vector4.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Profiler\Stats.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Time\Timer.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Window\Window.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\Application.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\DataBuffer.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\DecodedData.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\ResourceManager.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Font\Glyph.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Application.Graphics.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp" />
@@ -204,19 +210,23 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Mesh2DData.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Shader.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\SpriteBatch.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Window.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Quad.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\RenderTarget.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\STBDecoder.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Clipboard.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Cursor.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Mouse.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Curve.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\RangedValue.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Rect.inl" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Transform.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Object.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Exceptions\Exception.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Input\Keyboard.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Functions.cpp" />
@@ -225,9 +235,12 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Vector3.inl" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Vector4.inl" />
     <ClCompile Include="..\..\Source\Asura.Engine\Profiler\Stats.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Scripting\Portable.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\Glyph.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\String.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\TrueTypeFont.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Time\Timer.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Window\Window.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\3rdParty\SDL2main\SDL2main.vcxproj">
@@ -237,6 +250,12 @@
       <Project>{208b9cb8-2101-42a9-9502-0cf54912bc57}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Source\Asura.Engine\Input\Cursor.defs" />
+    <None Include="..\..\Source\Asura.Engine\Input\Keyboard.defs" />
+    <None Include="..\..\Source\Asura.Engine\Text\String.inl" />
+    <None Include="..\..\Source\Asura.Engine\Text\Utf.inl" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 79bf9a3..f1c72a7 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -13,12 +13,6 @@
     <Filter Include="FileSystem">
       <UniqueIdentifier>{75252759-f76f-44dc-85d4-28028a7d60eb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Font">
-      <UniqueIdentifier>{16e89584-708f-4a2f-9dc4-8e01ba938e88}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Input">
-      <UniqueIdentifier>{426b5d06-f2e9-4879-b0a0-0cde9130d0bc}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Math">
       <UniqueIdentifier>{d65172dc-f855-4dd0-9d70-f90034a01144}</UniqueIdentifier>
     </Filter>
@@ -34,12 +28,15 @@
     <Filter Include="Physics">
       <UniqueIdentifier>{f94a816c-f744-4d8b-aa3b-0d1c32e388ba}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Window">
-      <UniqueIdentifier>{e1003406-ebaa-4987-9a0f-18f9e14a96b3}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Graphics\Port">
       <UniqueIdentifier>{2054bf79-a609-44fc-aa13-cef6e16a117f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Input">
+      <UniqueIdentifier>{426b5d06-f2e9-4879-b0a0-0cde9130d0bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Text">
+      <UniqueIdentifier>{16e89584-708f-4a2f-9dc4-8e01ba938e88}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h">
@@ -48,9 +45,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h">
       <Filter>Exceptions</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -73,8 +67,6 @@
       <Filter>Time</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Asura.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Object.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Type.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -106,17 +98,10 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Window\Window.h">
-      <Filter>Window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Font\Glyph.h">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\GL.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -175,6 +160,41 @@
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Reloadable.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Config.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Clipboard.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Cursor.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\Mouse.h">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Singleton.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Input\InputDevice.hpp">
+      <Filter>Input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\Glyph.h">
+      <Filter>Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\String.hpp">
+      <Filter>Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\TrueTypeFont.h">
+      <Filter>Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Text\Utf.hpp">
+      <Filter>Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Quad.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Type.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp">
@@ -183,9 +203,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Exceptions\Exception.cpp">
       <Filter>Exceptions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp">
-      <Filter>Font</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -204,7 +221,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Time\Timer.cpp">
       <Filter>Time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Object.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -233,24 +249,9 @@
       <Filter>Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Window\Window.cpp">
-      <Filter>Window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Font\Glyph.cpp">
-      <Filter>Font</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\GL.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Canvas.cpp">
-      <Filter>Graphics\Port</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Color.cpp">
-      <Filter>Graphics\Port</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Image.cpp">
-      <Filter>Graphics\Port</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Mesh2D.cpp">
       <Filter>Graphics\Port</Filter>
     </ClCompile>
@@ -306,5 +307,58 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Application.Graphics.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Scripting\Portable.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Canvas.cpp">
+      <Filter>Graphics\Port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Color.cpp">
+      <Filter>Graphics\Port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Image.cpp">
+      <Filter>Graphics\Port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Port\Window.cpp">
+      <Filter>Graphics\Port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Clipboard.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Cursor.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Input\Mouse.cpp">
+      <Filter>Input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\Glyph.cpp">
+      <Filter>Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\String.cpp">
+      <Filter>Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Text\TrueTypeFont.cpp">
+      <Filter>Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Quad.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Source\Asura.Engine\Input\Keyboard.defs">
+      <Filter>Input</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Engine\Input\Cursor.defs">
+      <Filter>Input</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Engine\Text\String.inl">
+      <Filter>Text</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Engine\Text\Utf.inl">
+      <Filter>Text</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj b/Build/Asura.Runner/Asura.Runner.vcxproj
index e58ca6b..9dadfe8 100644
--- a/Build/Asura.Runner/Asura.Runner.vcxproj
+++ b/Build/Asura.Runner/Asura.Runner.vcxproj
@@ -86,7 +86,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -109,7 +109,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -117,7 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Runner\main.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Runner\Runner.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Runner\Runner.h" />
diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj.filters b/Build/Asura.Runner/Asura.Runner.vcxproj.filters
index e9b240a..7bd5566 100644
--- a/Build/Asura.Runner/Asura.Runner.vcxproj.filters
+++ b/Build/Asura.Runner/Asura.Runner.vcxproj.filters
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Runner\main.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Runner\Runner.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Runner\Runner.h" />
diff --git a/Build/Asura.sln b/Build/Asura.sln
index 7b3830e..0b0c07e 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -59,6 +59,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "3rdParty\Wuff\Wuff.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "3rdParty\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaxTest", "Samples\LuaxTest\LuaxTest.vcxproj", "{87A4F855-66F2-4DBF-B86C-416E88DAC88A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -275,6 +277,14 @@ Global
 		{AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.Build.0 = Release|x64
 		{AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.ActiveCfg = Release|Win32
 		{AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.Build.0 = Release|Win32
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x64.ActiveCfg = Debug|x64
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x64.Build.0 = Debug|x64
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x86.ActiveCfg = Debug|Win32
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x86.Build.0 = Debug|Win32
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x64.ActiveCfg = Release|x64
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x64.Build.0 = Release|x64
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x86.ActiveCfg = Release|Win32
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -298,6 +308,7 @@ Global
 		{6BA52BBB-8DA5-4F51-BE3F-1E49F5089498} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 		{294889EA-93DE-4580-BF9D-87F605B229AA} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 		{AEE37589-DE0D-4139-8BDB-8179FDEFB835} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
+		{87A4F855-66F2-4DBF-B86C-416E88DAC88A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}
diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj b/Build/Samples/LuaxTest/LuaxTest.vcxproj
new file mode 100644
index 0000000..0ab395d
--- /dev/null
+++ b/Build/Samples/LuaxTest/LuaxTest.vcxproj
@@ -0,0 +1,140 @@
+<?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>{87A4F855-66F2-4DBF-B86C-416E88DAC88A}</ProjectGuid>
+    <RootNamespace>LuaxTest</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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\3rdParty\Luax\Luax.vcxproj">
+      <Project>{1350cee9-b2c2-426a-af4e-f651d51dd592}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Source\Samples\LuaxTest\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\Samples\LuaxTest\header.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj.filters b/Build/Samples/LuaxTest/LuaxTest.vcxproj.filters
new file mode 100644
index 0000000..0dc8d61
--- /dev/null
+++ b/Build/Samples/LuaxTest/LuaxTest.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\Samples\LuaxTest\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\Samples\LuaxTest\header.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj.user b/Build/Samples/LuaxTest/LuaxTest.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/Build/Samples/LuaxTest/LuaxTest.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