2 files changed, 8 insertions, 71 deletions

diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index 503baab..e84dd6c 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_IMAGE_H__
 #define __ASURA_ENGINE_IMAGE_H__
 
-#include "Containers/StringMap.hpp"
-#include "Containers/String.h"
-#include "Containers/Map.h"
+#include "StringMap.hpp"
+#include "String.h"
+#include "Map.h"
 #include "Math/Vector2.h"
 #include "Manager.hpp"
 #include "Texture.h"
@@ -57,69 +57,6 @@ namespace AsuraEngine
 
         };
 
-        ///
-        ///
-        ///
-        class ImageManager : public Manager
-        {
-        public:
-
-            ///
-            /// ͨ��ID��ȡ·��������dz��򴴽���ͼƬ������String::Null
-            ///
-            Containers::String GetImagePath(uint ID);
-
-            ///
-            /// ͨ��ID·����ȡID�����û�ҵ�������0
-            ///
-            uint GetImageID(const Containers::String& path);
-
-            Image* GetImage(const Containers::String& path);
-
-            Image* GetImage(const Containers::String& ID);
-
-            uint AddImage(const Containers::String& path, Image* image);
-
-			uint AddImage(Image* image);
-			
-			bool RemoveImage(uint ID);
-			
-			bool RemoveImage(Image* image);
-			
-        private:
-
-            ///
-            /// ���е�image
-            ///
-            Containers::Map<uint, Image*> mImages;
-
-            ///
-            /// image��·����ID��ӳ�䡣��Դ�.asr�����image��ͨ��·�������õ�image�����Բ��������е�image���ڴ�map�С���
-            /// ���򴴽���imageֻ��ͨ��ID����ȡ�����Գ�������Ҫ����ID��
-            ///
-            Containers::StringMap<uint> mImageIDs;
-                   
-        };
-
-        ///
-        ///
-        ///
-        class ImageFactory : public Factory
-        {
-        public:
-
-            ///
-            /// ��image pixel�������image
-            ///
-            Image* ReadBuffer(Color* pixels, int width, int height);
-
-            ///
-            /// ��image extern���ݲ�����
-            ///
-            Image* Decode();
-
-        };
-
     }
 }
 
diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index aa5bd53..e15c6e0 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -3,8 +3,8 @@
 
 #include "luax/luax.h"
 
-#include "Containers/Map.h"
-#include "Containers/StringMap.hpp"
+#include "Map.h"
+#include "StringMap.hpp"
 #include "Object.h"
 #include "Color.h"
 #include "Manager.hpp"
@@ -33,12 +33,12 @@ namespace AsuraEngine
             ///
             /// ����������shader��uniforms������IDӳ�䡣
             ///
-            static Containers::StringMap<int> sUniformsID;
+            static StringMap<int> sUniformsID;
 
             ///
             /// ���uniform������ID��
             ///
-            static int GetUniformID(const Containers::String& name);
+            static int GetUniformID(const String& name);
 
             ///
             /// ����������
@@ -51,7 +51,7 @@ namespace AsuraEngine
             ///
             /// ӳ��uniforms ID��location��
             ///
-            Containers::Map<int, int> mLocations;
+            Map<int, int> mLocations;
 
         };