*材质和shader

2 files changed, 24 insertions, 16 deletions

diff --git a/Build/Asura/Asura.vcxproj b/Build/Asura/Asura.vcxproj
index 6709692..794950a 100644
--- a/Build/Asura/Asura.vcxproj
+++ b/Build/Asura/Asura.vcxproj
@@ -122,9 +122,12 @@
     <ClInclude Include="..\..\Source\Asura\Containers\UnorderedMap.hpp" />
     <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\Color.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\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Texture.h" />
     <ClInclude Include="..\..\Source\Asura\Layer.h" />
     <ClInclude Include="..\..\Source\Asura\Object.h" />
@@ -151,8 +154,6 @@
     <ClInclude Include="..\..\Source\Asura\Graphics\Material.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Shader.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\Animation.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.h" />
     <ClInclude Include="..\..\Source\Asura\Input\Keyboard.h" />
     <ClInclude Include="..\..\Source\Asura\Math\Functions.h" />
     <ClInclude Include="..\..\Source\Asura\Math\Matrix44.h" />
@@ -165,9 +166,12 @@
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura\Component.cpp" />
     <ClCompile Include="..\..\Source\Asura\GameObject.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Animation.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Color.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\SpriteBatch.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Texture.cpp" />
     <ClCompile Include="..\..\Source\Asura\Layer.cpp" />
     <ClCompile Include="..\..\Source\Asura\Object.cpp" />
@@ -192,8 +196,6 @@
     <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\Graphics\Animations\Animation.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.cpp" />
     <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp" />
     <ClCompile Include="..\..\Source\Asura\Input\Keyboard.cpp" />
     <ClCompile Include="..\..\Source\Asura\Math\Functions.cpp" />
diff --git a/Build/Asura/Asura.vcxproj.filters b/Build/Asura/Asura.vcxproj.filters
index 707d4fb..e12cf66 100644
--- a/Build/Asura/Asura.vcxproj.filters
+++ b/Build/Asura/Asura.vcxproj.filters
@@ -96,12 +96,6 @@
     <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.h">
-      <Filter>Graphics\Effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\Animation.h">
-      <Filter>Graphics\Animations</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura\Input\Keyboard.h">
       <Filter>Input</Filter>
     </ClInclude>
@@ -160,6 +154,15 @@
     <ClInclude Include="..\..\Source\Asura\Graphics\Renderer.h">
       <Filter>Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Animation.h">
+      <Filter>Graphics\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\ParticleSystem.h">
+      <Filter>Graphics\Effects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\SpriteBatch.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura\AI\BehaviorTree.cpp">
@@ -213,12 +216,6 @@
     <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.cpp">
-      <Filter>Graphics\Effects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Animations\Animation.cpp">
-      <Filter>Graphics\Animations</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
@@ -266,6 +263,15 @@
     <ClCompile Include="..\..\Source\Asura\Graphics\Renderer.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Animation.cpp">
+      <Filter>Graphics\Animations</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\ParticleSystem.cpp">
+      <Filter>Graphics\Effects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\SpriteBatch.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\Asura\GUI\README.md">