*图片

2 files changed, 79 insertions, 31 deletions

diff --git a/Build/Asura/Asura.vcxproj b/Build/Asura/Asura.vcxproj
index 794950a..12968cb 100644
--- a/Build/Asura/Asura.vcxproj
+++ b/Build/Asura/Asura.vcxproj
@@ -123,15 +123,25 @@
     <ClInclude Include="..\..\Source\Asura\Containers\Vector.hpp" />
     <ClInclude Include="..\..\Source\Asura\GameObject.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Animation.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Camera.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Color.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Mesh2D.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Mesh2DRenderer.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\OpenGL.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\ParticleSystem.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Renderer.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\RenderTarget.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\ShapeRenderer.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\SpriteBatch.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\SpriteRenderer.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Texture.h" />
     <ClInclude Include="..\..\Source\Asura\Layer.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Curve.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\RangedValue.h" />
     <ClInclude Include="..\..\Source\Asura\Object.h" />
     <ClInclude Include="..\..\Source\Asura\ObjectPool.h" />
+    <ClInclude Include="..\..\Source\Asura\Physics\World.h" />
     <ClInclude Include="..\..\Source\Asura\Prefab.h" />
     <ClInclude Include="..\..\Source\Asura\Scene.h" />
     <ClInclude Include="..\..\Source\Asura\Scripting\Luax.hpp" />
@@ -148,9 +158,7 @@
     <ClInclude Include="..\..\Source\Asura\Exceptions\Exception.h" />
     <ClInclude Include="..\..\Source\Asura\FileSystem\Asset.h" />
     <ClInclude Include="..\..\Source\Asura\Font\TrueTypeFont.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Canvas.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Graphic.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Material.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Shader.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h" />
@@ -167,13 +175,22 @@
     <ClCompile Include="..\..\Source\Asura\Component.cpp" />
     <ClCompile Include="..\..\Source\Asura\GameObject.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Animation.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Camera.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Color.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Mesh2D.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Mesh2DRenderer.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\OpenGL.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\ParticleSystem.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Renderer.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\RenderTarget.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\ShapeRenderer.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\SpriteBatch.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\SpriteRenderer.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Texture.cpp" />
     <ClCompile Include="..\..\Source\Asura\Layer.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Curve.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\RangedValue.cpp" />
     <ClCompile Include="..\..\Source\Asura\Object.cpp" />
     <ClCompile Include="..\..\Source\Asura\ObjectPool.cpp" />
     <ClCompile Include="..\..\Source\Asura\Prefab.cpp" />
@@ -190,13 +207,10 @@
     <ClCompile Include="..\..\Source\Asura\Exceptions\Exception.cpp" />
     <ClCompile Include="..\..\Source\Asura\FileSystem\Asset.cpp" />
     <ClCompile Include="..\..\Source\Asura\Font\TrueTypeFont.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Graphic.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp" />
-    <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp" />
     <ClCompile Include="..\..\Source\Asura\Input\Keyboard.cpp" />
     <ClCompile Include="..\..\Source\Asura\Math\Functions.cpp" />
     <ClCompile Include="..\..\Source\Asura\Math\Matrix44.cpp" />
@@ -206,9 +220,6 @@
     <ClCompile Include="..\..\Source\Asura\Profiler\Stats.cpp" />
     <ClCompile Include="..\..\Source\Asura\Time\Timer.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\Source\Asura\GUI\README.md" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Build/Asura/Asura.vcxproj.filters b/Build/Asura/Asura.vcxproj.filters
index e12cf66..153a4cc 100644
--- a/Build/Asura/Asura.vcxproj.filters
+++ b/Build/Asura/Asura.vcxproj.filters
@@ -22,9 +22,6 @@
     <Filter Include="Font">
       <UniqueIdentifier>{16e89584-708f-4a2f-9dc4-8e01ba938e88}</UniqueIdentifier>
     </Filter>
-    <Filter Include="GUI">
-      <UniqueIdentifier>{7bd07713-8cd4-4bfd-9170-ee9fccc67fe3}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Input">
       <UniqueIdentifier>{426b5d06-f2e9-4879-b0a0-0cde9130d0bc}</UniqueIdentifier>
     </Filter>
@@ -46,6 +43,9 @@
     <Filter Include="Scripting">
       <UniqueIdentifier>{9dcab30a-6b0b-4f4c-9fc1-330f333da238}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Physics">
+      <UniqueIdentifier>{f94a816c-f744-4d8b-aa3b-0d1c32e388ba}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura\AI\BehaviorTree.h">
@@ -78,15 +78,9 @@
     <ClInclude Include="..\..\Source\Asura\Font\TrueTypeFont.h">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Canvas.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura\Graphics\Graphic.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura\Graphics\Material.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -163,6 +157,36 @@
     <ClInclude Include="..\..\Source\Asura\Graphics\SpriteBatch.h">
       <Filter>Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\ShapeRenderer.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\SpriteRenderer.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Camera.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Physics\World.h">
+      <Filter>Physics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Math\RangedValue.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Math\Curve.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Mesh2D.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\RenderTarget.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Mesh2DRenderer.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura\AI\BehaviorTree.cpp">
@@ -198,15 +222,9 @@
     <ClCompile Include="..\..\Source\Asura\Font\TrueTypeFont.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Canvas.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura\Graphics\Graphic.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -216,9 +234,6 @@
     <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura\Input\Keyboard.cpp">
       <Filter>Input</Filter>
     </ClCompile>
@@ -272,10 +287,32 @@
     <ClCompile Include="..\..\Source\Asura\Graphics\SpriteBatch.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\Source\Asura\GUI\README.md">
-      <Filter>GUI</Filter>
-    </None>
+    <ClCompile Include="..\..\Source\Asura\Graphics\ShapeRenderer.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\SpriteRenderer.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Camera.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Math\RangedValue.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Math\Curve.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Mesh2D.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\RenderTarget.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Mesh2DRenderer.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file