From 0c65330f29d214cdfd810e83096669c5f2c20bee Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 20 Jan 2019 19:42:03 +0800
Subject: *misc

---
 Build/Asura.Editor/Asura.Editor.vcxproj.filters    |  8 ++-
 Build/Asura.Engine/Asura.Engine.vcxproj            | 10 ++-
 Build/Asura.Engine/Asura.Engine.vcxproj.filters    | 36 ++++-------
 Build/Asura.Framework/Asura.Framework.vcxproj      | 22 ++++++-
 .../Asura.Framework.vcxproj.filters                | 71 +++++++++++++++++++++-
 5 files changed, 114 insertions(+), 33 deletions(-)

(limited to 'Build')

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index 9cd8510..289ae9c 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Plugins">
+      <UniqueIdentifier>{99018b81-eb4c-423f-87ac-fe6ef75debb3}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index ec7d561..8941533 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -123,13 +123,13 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Containers\Vector.hpp" />
     <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Animation.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Loader.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Image.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Manager.hpp" />
@@ -153,7 +153,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Asset.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Material.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Sprite.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Input\Keyboard.h" />
@@ -173,13 +172,13 @@
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Image.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Sprite.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.StateMap.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Animation.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Loader.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Image.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.cpp" />
+    <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\Math\Curve.cpp" />
@@ -199,7 +198,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Exceptions\Exception.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Asset.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Material.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Sprite.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Input\Keyboard.cpp" />
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index d86417b..75b031c 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -34,18 +34,12 @@
     <Filter Include="Time">
       <UniqueIdentifier>{aa1d8502-8fee-4b39-bbc9-be198224bb73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Graphics\Effects">
-      <UniqueIdentifier>{79d850d4-08da-483f-8771-fa4f7663d261}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Scripting">
       <UniqueIdentifier>{9dcab30a-6b0b-4f4c-9fc1-330f333da238}</UniqueIdentifier>
     </Filter>
     <Filter Include="Physics">
       <UniqueIdentifier>{f94a816c-f744-4d8b-aa3b-0d1c32e388ba}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Graphics\Animation">
-      <UniqueIdentifier>{e62bd4f3-5f4b-43fc-9d1e-bb3913e33e40}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Engine\AI\BehaviorTree.h">
@@ -78,9 +72,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Material.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -138,12 +129,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Luax.hpp">
       <Filter>Scripting</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Animation.h">
-      <Filter>Graphics\Animation</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.h">
-      <Filter>Graphics\Effects</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -173,6 +158,12 @@
     <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Loader.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\AI\BehaviorTree.cpp">
@@ -208,9 +199,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Material.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -254,12 +242,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Animation.cpp">
-      <Filter>Graphics\Animation</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.cpp">
-      <Filter>Graphics\Effects</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -299,5 +281,11 @@
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.StateMap.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Loader.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </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 8672930..9b187d7 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj
@@ -118,15 +118,35 @@
     <None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua" />
     <None Include="..\..\Source\Asura.Framework\Class.lua" />
     <None Include="..\..\Source\Asura.Framework\Component.lua" />
-    <None Include="..\..\Source\Asura.Framework\Filesystem\Impoter.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\AnimationLoader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\GameObjectLoader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\Loader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\MaterialLoader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\PathLoader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\PrefabLoader.lua" />
+    <None Include="..\..\Source\Asura.Framework\Filesystem\SceneLoader.lua" />
     <None Include="..\..\Source\Asura.Framework\GameObject.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\Animation.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\Animator.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\Camera.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\CanvasRenderer.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\DefaultShaders.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\Material.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\MaterialManager.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\Mesh2DRenderer.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystem.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystemManager.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\ShapeRenderer.lua" />
+    <None Include="..\..\Source\Asura.Framework\Graphics\SpriteBatchRenderer.lua" />
     <None Include="..\..\Source\Asura.Framework\Graphics\SpriteRenderer.lua" />
+    <None Include="..\..\Source\Asura.Framework\GUI\Button.lua" />
+    <None Include="..\..\Source\Asura.Framework\GUI\Text.lua" />
+    <None Include="..\..\Source\Asura.Framework\Math\Curve.lua" />
     <None Include="..\..\Source\Asura.Framework\Object.lua" />
+    <None Include="..\..\Source\Asura.Framework\Path\Path.lua" />
+    <None Include="..\..\Source\Asura.Framework\Path\PathCalculator.lua" />
+    <None Include="..\..\Source\Asura.Framework\Path\PathManager.lua" />
     <None Include="..\..\Source\Asura.Framework\Prefab.lua" />
     <None Include="..\..\Source\Asura.Framework\Scene.lua" />
     <None Include="..\..\Source\Asura.Framework\Transform.lua" />
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
index 8284576..4d7ac53 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters
@@ -13,6 +13,15 @@
     <Filter Include="Filesystem">
       <UniqueIdentifier>{19d37542-9fd8-4574-9a0b-4138478cc324}</UniqueIdentifier>
     </Filter>
+    <Filter Include="GUI">
+      <UniqueIdentifier>{ed48783f-af1d-408b-9c4c-27370a7afc69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Path">
+      <UniqueIdentifier>{24457f19-3650-4efc-8a02-aae600f9a463}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Math">
+      <UniqueIdentifier>{4ffc0215-40d8-49a9-ac4a-4ab4a920cf4b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua">
@@ -43,8 +52,68 @@
     <None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua">
       <Filter>AI</Filter>
     </None>
-    <None Include="..\..\Source\Asura.Framework\Filesystem\Impoter.lua">
+    <None Include="..\..\Source\Asura.Framework\GUI\Button.lua">
+      <Filter>GUI</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\Loader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\Material.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\MaterialLoader.lua">
       <Filter>Filesystem</Filter>
     </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\MaterialManager.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\Animation.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\Camera.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\ShapeRenderer.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\SpriteBatchRenderer.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\AnimationLoader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Path\Path.lua">
+      <Filter>Path</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\PathLoader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Path\PathCalculator.lua">
+      <Filter>Path</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Path\PathManager.lua">
+      <Filter>Path</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\GameObjectLoader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\PrefabLoader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Filesystem\SceneLoader.lua">
+      <Filter>Filesystem</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystemManager.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\GUI\Text.lua">
+      <Filter>GUI</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Graphics\DefaultShaders.lua">
+      <Filter>Graphics</Filter>
+    </None>
+    <None Include="..\..\Source\Asura.Framework\Math\Curve.lua">
+      <Filter>Math</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0