*miscHEADmaster

17 files changed, 376 insertions, 220 deletions

diff --git a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm
index baa828a..4522c57 100644
--- a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm
+++ b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm
diff --git a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal
index a2c8fca..2561822 100644
--- a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal
+++ b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index d214c2e..542fcf2 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -129,7 +129,7 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIClip.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIContent.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUILabel.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIPanel.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Controls\GUIPanel.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUISlider.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIToggle.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\TextUtil.cpp" />
@@ -137,13 +137,14 @@
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\Brush.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\Drawer.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\DrawInfo.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Pen.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Style.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Layout\VerticalLayout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Main.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\ContainerWindow.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\FileWatcher.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\System\GUIWindow.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\Input.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\MenuController.cpp" />
   </ItemGroup>
@@ -153,7 +154,7 @@
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIClip.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIContent.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUILabel.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIPanel.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIPanel.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUISlider.h" />
     <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIState.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIToggle.h" />
@@ -162,15 +163,17 @@
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\Brush.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\Drawer.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\DrawInfo.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Pen.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\image.shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\polygon.shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Style.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIClip.shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIText.shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUITexture.shader.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Layout\VerticalLayout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\ContainerWindow.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\FileWatcher.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\System\GUIWindow.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\Input.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\MenuController.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Type.h" />
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index bc89328..27c5a7e 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -10,9 +10,6 @@
     <Filter Include="Graphics">
       <UniqueIdentifier>{4be8ce5c-0921-4341-a976-92d31aa84c8c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Graphics\shaders">
-      <UniqueIdentifier>{b4c26f9c-9f4e-4332-a6e2-33456b4abecb}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Layout">
       <UniqueIdentifier>{7654ef3d-54c4-490f-bb24-e6a67bd63e1e}</UniqueIdentifier>
     </Filter>
@@ -25,6 +22,9 @@
     <Filter Include="Configure">
       <UniqueIdentifier>{799e7ea2-8870-4d1e-b278-b3a0dd912632}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Graphics\Shaders">
+      <UniqueIdentifier>{b4c26f9c-9f4e-4332-a6e2-33456b4abecb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIButton.cpp">
@@ -36,9 +36,6 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUILabel.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIPanel.cpp">
-      <Filter>Controls</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIToggle.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
@@ -51,12 +48,6 @@
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\DrawInfo.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Pen.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Style.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.cpp">
       <Filter>Layout</Filter>
     </ClCompile>
@@ -86,14 +77,20 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIClip.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\System\GUIWindow.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Controls\GUIPanel.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\image.shader.h">
-      <Filter>Graphics\shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\polygon.shader.h">
-      <Filter>Graphics\shaders</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIButton.h">
       <Filter>Controls</Filter>
     </ClInclude>
@@ -103,9 +100,6 @@
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUILabel.h">
       <Filter>Controls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIPanel.h">
-      <Filter>Controls</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIToggle.h">
       <Filter>Controls</Filter>
     </ClInclude>
@@ -118,15 +112,6 @@
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\DrawInfo.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Pen.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Shader.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Style.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.h">
       <Filter>Layout</Filter>
     </ClInclude>
@@ -162,5 +147,29 @@
     <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIState.h">
       <Filter>Controls</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\System\GUIWindow.h">
+      <Filter>System</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIPanel.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIClip.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIText.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUITexture.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.sln b/Build/Asura.sln
index 5332a4a..938b621 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -119,6 +119,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RunnerConfigure", "configur
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-base", "modules\asura-base\asura-base.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Json", "external\Json\Json.vcxproj", "{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -651,6 +653,16 @@ Global
 		{7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.Build.0 = Release|x64
 		{7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.ActiveCfg = Release|Win32
 		{7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.Build.0 = Release|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x64.ActiveCfg = Debug|x64
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x64.Build.0 = Debug|x64
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x86.ActiveCfg = Debug|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x86.Build.0 = Debug|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x64.ActiveCfg = Release|x64
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x64.Build.0 = Release|x64
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x86.ActiveCfg = Release|Win32
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -703,6 +715,7 @@ Global
 		{93CFEFAB-3922-4D81-91FD-8A80E9785FC6} = {1C5D0C23-C0A9-4200-BD67-B5B8F6DDE41C}
 		{9DD2D23B-BE70-4453-88C7-D904E024CB68} = {1C5D0C23-C0A9-4200-BD67-B5B8F6DDE41C}
 		{7D41093F-E356-4C5B-A25F-41779BF86E54} = {CD115016-E377-4AC1-8595-DB2836CEFE7E}
+		{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C} = {64D4E4B2-4A60-46F4-A500-370EFED4524F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B}
diff --git a/Build/external/Json/Json.vcxproj b/Build/external/Json/Json.vcxproj
new file mode 100644
index 0000000..dcb86ec
--- /dev/null
+++ b/Build/external/Json/Json.vcxproj
@@ -0,0 +1,122 @@
+<?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>{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}</ProjectGuid>
+    <RootNamespace>Json</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>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Build/external/Json/Json.vcxproj.filters b/Build/external/Json/Json.vcxproj.filters
new file mode 100644
index 0000000..9cd8510
--- /dev/null
+++ b/Build/external/Json/Json.vcxproj.filters
@@ -0,0 +1,2 @@
+<?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
diff --git a/Build/external/Json/Json.vcxproj.user b/Build/external/Json/Json.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/Build/external/Json/Json.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/modules/asura-base/asura-base.vcxproj b/Build/modules/asura-base/asura-base.vcxproj
index 89ba183..e8ecc4a 100644
--- a/Build/modules/asura-base/asura-base.vcxproj
+++ b/Build/modules/asura-base/asura-base.vcxproj
@@ -142,6 +142,8 @@
     <ClCompile Include="..\..\..\source\modules\asura-base\Math\Quaternion.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Math\RangedValue.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Math\Transform.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Misc\GUID.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Misc\UTF8.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_coroutine.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_thread.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Conditional.cpp" />
@@ -155,7 +157,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\Hash128.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\StringMap.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-base\UtilsModule.cpp" />
   </ItemGroup>
@@ -185,6 +186,8 @@
     <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector2.hpp" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector3.hpp" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector4.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Misc\GUID.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Misc\UTF8.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Module.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Scripting\Scripting.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Singleton.hpp" />
@@ -200,6 +203,7 @@
     <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Type.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Utilities\dynamic_array.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\dynamic_bitset.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\Hash128.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.h" />
diff --git a/Build/modules/asura-base/asura-base.vcxproj.filters b/Build/modules/asura-base/asura-base.vcxproj.filters
index 5f639bc..2aa1840 100644
--- a/Build/modules/asura-base/asura-base.vcxproj.filters
+++ b/Build/modules/asura-base/asura-base.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="FileSystem\Binding">
       <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Misc">
+      <UniqueIdentifier>{9bfbea59-2b66-4aad-add2-ac9c737a1dc1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\modules\asura-base\Math\Curve.cpp">
@@ -82,9 +85,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\Hash128.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\StringMap.cpp">
       <Filter>Utilities</Filter>
     </ClCompile>
@@ -128,6 +128,12 @@
       <Filter>FileSystem\Binding</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Source\modules\asura-base\Exception.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Misc\UTF8.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Misc\GUID.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-base\Math\Curve.h">
@@ -249,6 +255,15 @@
     <ClInclude Include="..\..\..\Source\modules\asura-base\Math\Random.h">
       <Filter>Math</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Misc\UTF8.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Utilities\dynamic_array.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Misc\GUID.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-base\Math\Rect.inc">
diff --git a/Build/modules/asura-box2d/asura-box2d.vcxproj b/Build/modules/asura-box2d/asura-box2d.vcxproj
index b41df12..2a3c00b 100644
--- a/Build/modules/asura-box2d/asura-box2d.vcxproj
+++ b/Build/modules/asura-box2d/asura-box2d.vcxproj
@@ -118,33 +118,33 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-box2d\Box2DModule.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Body.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\ChainShape.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\CircleShape.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Contact.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\DebugDraw.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\DistanceJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\EdgeShape.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Fixture.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\FrictionJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\GearJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Joint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\MotorJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\MouseJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PolygonShape.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PrismaticJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PulleyJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\RevoluteJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\RopeJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Shape.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\WeldJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\WheelJoint.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\World.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Body.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\ChainShape.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\CircleShape.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Contact.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\DebugDraw.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\DistanceJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\EdgeShape.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Fixture.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\FrictionJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\GearJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Joint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\MotorJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\MouseJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PolygonShape.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PrismaticJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PulleyJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\RevoluteJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\RopeJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Shape.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\WeldJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\WheelJoint.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\World.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\modules\asura-box2d\Box2DModule.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_body.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_world.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-box2d\Physics2D\binding\_body.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-box2d\Physics2D\binding\_world.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/modules/asura-box2d/asura-box2d.vcxproj.filters b/Build/modules/asura-box2d/asura-box2d.vcxproj.filters
index 5415a04..b169c1a 100644
--- a/Build/modules/asura-box2d/asura-box2d.vcxproj.filters
+++ b/Build/modules/asura-box2d/asura-box2d.vcxproj.filters
@@ -2,88 +2,88 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-box2d\Box2DModule.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Body.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Body.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\ChainShape.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\ChainShape.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\CircleShape.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\CircleShape.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Contact.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Contact.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\DebugDraw.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\DebugDraw.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\DistanceJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\DistanceJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\EdgeShape.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\EdgeShape.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Fixture.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Fixture.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\FrictionJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\FrictionJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\GearJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\GearJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Joint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Joint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\MotorJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\MotorJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\MouseJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\MouseJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PolygonShape.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PolygonShape.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PrismaticJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PrismaticJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\PulleyJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\PulleyJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\RevoluteJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\RevoluteJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\RopeJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\RopeJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\Shape.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\Shape.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\WeldJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\WeldJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\WheelJoint.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\WheelJoint.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-box2d\Physics\World.h">
-      <Filter>Physics</Filter>
+    <ClInclude Include="..\..\..\Source\modules\asura-box2d\Physics2D\World.h">
+      <Filter>Physics2D</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="Physics">
+    <Filter Include="Physics2D">
       <UniqueIdentifier>{c01b5c57-f3a7-445f-aed3-e0a27dbe74c2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Physics\binding">
-      <UniqueIdentifier>{3fb6587c-0c9d-4f6e-9e72-653032d9b238}</UniqueIdentifier>
+    <Filter Include="Physics2D\Binding">
+      <UniqueIdentifier>{76f8cfef-3ffe-47a2-9e7c-b90f1d252bce}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_body.cpp">
-      <Filter>Physics\binding</Filter>
+    <ClCompile Include="..\..\..\source\modules\asura-box2d\Box2DModule.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-box2d\Physics2D\binding\_body.cpp">
+      <Filter>Physics2D\Binding</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_world.cpp">
-      <Filter>Physics\binding</Filter>
+    <ClCompile Include="..\..\..\Source\modules\asura-box2d\Physics2D\binding\_world.cpp">
+      <Filter>Physics2D\Binding</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-box2d\Box2DModule.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/modules/asura-core/asura-core.vcxproj b/Build/modules/asura-core/asura-core.vcxproj
index f548922..5b2dd32 100644
--- a/Build/modules/asura-core/asura-core.vcxproj
+++ b/Build/modules/asura-core/asura-core.vcxproj
@@ -128,19 +128,19 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\CoreModule.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\Glyph.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\String.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Font\TTF.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\binding\_canvas.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gfx_device.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gpu_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_index_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_vertex_buffer.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Canvas.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color32.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GfxDevice.binding.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GPUBuffer.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Image.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\IndexBuffer.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Mesh.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Shader.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\SpriteBatch.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Texture.binding.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\VertexBuffer.binding.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Color32.cpp" />
@@ -149,18 +149,17 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Image.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.cpp" />
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Quad.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Texture.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBOs.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp" />
@@ -194,8 +193,7 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\CoreModule.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\String.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\TTF.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\Utf.hpp" />
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\BlendMode.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Canvas.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Color.h" />
@@ -206,19 +204,18 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GfxDevice.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Image.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Polygon2D.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Quad.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderState.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shader.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shape.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Texture.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBOs.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VertexBuffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageData.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Image\ImageDecoder.h" />
@@ -264,7 +261,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\Font\String.inc" />
-    <None Include="..\..\..\source\modules\asura-core\Font\Utf.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/modules/asura-core/asura-core.vcxproj.filters b/Build/modules/asura-core/asura-core.vcxproj.filters
index cf39389..5ffc385 100644
--- a/Build/modules/asura-core/asura-core.vcxproj.filters
+++ b/Build/modules/asura-core/asura-core.vcxproj.filters
@@ -42,27 +42,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\window\binding\_window.cpp">
       <Filter>Window\binding</Filter>
     </ClCompile>
@@ -72,27 +51,12 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp">
       <Filter>Image\binding</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gpu_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_index_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_vertex_buffer.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gfx_device.cpp">
-      <Filter>Graphics\Binding</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\Glyph.cpp">
       <Filter>Font</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Font\String.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Font\TTF.cpp">
-      <Filter>Font</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Canvas.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -108,24 +72,15 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Image.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Quad.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\Shader.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -215,18 +170,60 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBO.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputEvent.cpp">
       <Filter>Input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputAxis.cpp">
       <Filter>Input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\binding\_canvas.cpp">
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.cpp">
+      <Filter>Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\VBOs.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Canvas.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\Color32.binding.cpp">
       <Filter>Graphics\Binding</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GfxDevice.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-core\Graphics\binding\GPUBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Image.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\IndexBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Mesh.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Shader.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\SpriteBatch.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\Texture.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\VertexBuffer.binding.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h">
@@ -235,9 +232,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\String.hpp">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\TTF.h">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\BlendMode.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -259,27 +253,18 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GPUBuffer.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Image.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\IndexBuffer.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\MatrixStack.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Mesh2D.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Quad.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderState.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTarget.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\Shader.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -373,9 +358,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Threads\ThreadEx.h">
       <Filter>Threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Font\Utf.hpp">
-      <Filter>Font</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\DrawInfo.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -388,22 +370,28 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\GraphicsHelper.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBO.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputEvent.h">
       <Filter>Input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\Input\InputAxis.h">
       <Filter>Input</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Graphics\Mesh.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-core\Font\TTFImporter.h">
+      <Filter>Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\VBOs.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\Graphics\RenderTexture.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\Font\String.inc">
       <Filter>Font</Filter>
     </None>
-    <None Include="..\..\..\source\modules\asura-core\Font\Utf.inc">
-      <Filter>Font</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/modules/asura-json/asura-json.vcxproj b/Build/modules/asura-json/asura-json.vcxproj
index 64af220..bde2695 100644
--- a/Build/modules/asura-json/asura-json.vcxproj
+++ b/Build/modules/asura-json/asura-json.vcxproj
@@ -20,11 +20,11 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\modules\asura-json\JsonModule.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-json\Json\Json.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-json\Json\JsonData.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-json\JsonModule.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-json\Json\Json.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-json\Json\JsonData.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
diff --git a/Build/modules/asura-json/asura-json.vcxproj.filters b/Build/modules/asura-json/asura-json.vcxproj.filters
index 7f255cb..86218ef 100644
--- a/Build/modules/asura-json/asura-json.vcxproj.filters
+++ b/Build/modules/asura-json/asura-json.vcxproj.filters
@@ -6,15 +6,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\modules\asura-json\Json\Json.cpp">
+    <ClCompile Include="..\..\..\source\modules\asura-json\JsonModule.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-json\Json\JsonData.cpp">
       <Filter>Json</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-json\JsonModule.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\modules\asura-json\Json\Json.h">
+    <ClInclude Include="..\..\..\source\modules\asura-json\JsonModule.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-json\Json\JsonData.h">
       <Filter>Json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-json\JsonModule.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache b/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache
index 93b7e43..c1e0407 100644
--- a/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache
+++ b/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-76869cb9eeaafde93fc35e764d87dc7f1f272b2f
+534362588ad2d4462c430a54eb5dee7ab94c0164