*misc

5 files changed, 20 insertions, 16 deletions

diff --git a/Build/Asura/Asura.vcxproj b/Build/Asura/Asura.vcxproj
index bd1c093..5ce0fd1 100644
--- a/Build/Asura/Asura.vcxproj
+++ b/Build/Asura/Asura.vcxproj
@@ -168,7 +168,6 @@
     <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\Graphic.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Material.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Shader.h" />
     <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h" />
@@ -220,7 +219,6 @@
     <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\Graphic.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp" />
diff --git a/Build/Asura/Asura.vcxproj.filters b/Build/Asura/Asura.vcxproj.filters
index bcf2735..ea8e91e 100644
--- a/Build/Asura/Asura.vcxproj.filters
+++ b/Build/Asura/Asura.vcxproj.filters
@@ -78,9 +78,6 @@
     <ClInclude Include="..\..\Source\Asura\Font\TrueTypeFont.h">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Graphic.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura\Graphics\Material.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -248,9 +245,6 @@
     <ClCompile Include="..\..\Source\Asura\Font\TrueTypeFont.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Graphic.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
diff --git a/Source/Asura/Graphics/Animator.h b/Source/Asura/Graphics/Animator.h
index e8101cc..4d3d269 100644
--- a/Source/Asura/Graphics/Animator.h
+++ b/Source/Asura/Graphics/Animator.h
@@ -59,6 +59,11 @@ namespace AsuraEngine
             ///
             void SetToEnd();
 
+            ///
+            /// ��ͣ
+            ///
+            void Pause();
+
         private:
 
             ///
diff --git a/Source/Asura/Graphics/Color.h b/Source/Asura/Graphics/Color.h
index 1e3b131..f172156 100644
--- a/Source/Asura/Graphics/Color.h
+++ b/Source/Asura/Graphics/Color.h
@@ -1,24 +1,26 @@
 #ifndef __AE_COLOR_H__
 #define __AE_COLOR_H__
 
+#include "Type.h"
+
 namespace AsuraEngine
 {
     namespace Graphics
     {
 
         ///
-        /// 
+        /// 32bits��ɫ
         ///
         class Color
         {
+        public:
 
-        };
+            Color(byte r, byte g, byte b, byte a);
+            ~Color();
 
-        ///
-        /// 
-        ///
-        class Color32
-        {
+        private:
+
+            byte mR, mG, mB, mA;
 
         };
 
diff --git a/Source/Asura/Graphics/Image.h b/Source/Asura/Graphics/Image.h
index 96fa63c..5b27079 100644
--- a/Source/Asura/Graphics/Image.h
+++ b/Source/Asura/Graphics/Image.h
@@ -22,7 +22,6 @@ namespace AsuraEngine
         {
         public:
 
-            Math::Vector2 GetSize();
             uint GetWidth();
             uint GetHeight();
 
@@ -51,6 +50,9 @@ namespace AsuraEngine
 
         };
 
+        ///
+        ///
+        ///
         class ImageManager : public Manager
         {
         public:
@@ -92,6 +94,9 @@ namespace AsuraEngine
                    
         };
 
+        ///
+        ///
+        ///
         class ImageFactory : public Factory
         {
         public: