*misc

4 files changed, 21 insertions, 51 deletions

diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index 2cbffb6..fd62ab6 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -125,8 +125,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Engine\Asura.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\UnorderedMap.hpp" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Vector.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" />
@@ -138,17 +136,17 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Manager.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Map.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Curve.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Math\RangedValue.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\Stack.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\String.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Type.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Map.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Stack.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\String.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\StringMap.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h" />
@@ -160,6 +158,8 @@
     <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\UnorderedMap.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Vector.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\File.cpp" />
@@ -172,14 +172,11 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Map.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Curve.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\RangedValue.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Object.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\Map.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\Stack.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\String.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\StringMap.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" />
@@ -190,6 +187,9 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Vector3.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Math\Vector4.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Profiler\Stats.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Stack.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\String.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Time\Timer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 3cb7563..44e7c39 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -7,9 +7,6 @@
     <Filter Include="Audio">
       <UniqueIdentifier>{4040c770-8a92-4175-8c3d-269592ca2001}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Containers">
-      <UniqueIdentifier>{843d7fb4-300b-432c-b056-d436bdbc1580}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Exceptions">
       <UniqueIdentifier>{097be40c-71fb-4a4e-85a7-7a4939a42d78}</UniqueIdentifier>
     </Filter>
@@ -42,15 +39,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h">
       <Filter>Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Map.h">
-      <Filter>Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Stack.h">
-      <Filter>Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\String.h">
-      <Filter>Containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h">
       <Filter>Exceptions</Filter>
     </ClInclude>
@@ -90,21 +78,12 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\StringMap.hpp">
-      <Filter>Containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h">
       <Filter>Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\Vector.hpp">
-      <Filter>Containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Containers\UnorderedMap.hpp">
-      <Filter>Containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Luax.hpp">
       <Filter>Scripting</Filter>
     </ClInclude>
@@ -137,23 +116,17 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h">
       <Filter>Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Map.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Stack.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\String.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\UnorderedMap.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Vector.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\Map.cpp">
-      <Filter>Containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\Stack.cpp">
-      <Filter>Containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\String.cpp">
-      <Filter>Containers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Containers\StringMap.cpp">
-      <Filter>Containers</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Exceptions\Exception.cpp">
       <Filter>Exceptions</Filter>
     </ClCompile>
@@ -224,5 +197,9 @@
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\File.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Map.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Stack.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\String.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj
index 852910e..1995767 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj
@@ -18,9 +18,6 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Framework\main.cpp" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{A4A226CC-37DB-4EB7-BD6F-B344B7B6D53B}</ProjectGuid>
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
index 8a4baf1..9cd8510 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura.Framework\main.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file