14 files changed, 35 insertions, 83 deletions

diff --git a/Source/Asura.Engine/FileSystem/AnimationImpoter.h b/Source/Asura.Engine/FileSystem/AnimationImpoter.h
deleted file mode 100644
index 57fdfdb..0000000
--- a/Source/Asura.Engine/FileSystem/AnimationImpoter.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __AE_IMAGE_IMPORTER_H__
-#define __AE_IMAGE_IMPORTER_H___
-
-namespace AsuraEngine
-{
-    namespace Filesystem
-    {
-
-        ///
-        /// ��.asr����animation
-        ///
-        class AnimationImporter
-        {
-
-        };
-
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/FileSystem/Asset.h b/Source/Asura.Engine/FileSystem/Asset.h
index 9fc6607..e96d36b 100644
--- a/Source/Asura.Engine/FileSystem/Asset.h
+++ b/Source/Asura.Engine/FileSystem/Asset.h
@@ -9,7 +9,7 @@ namespace AsuraEngine
     {
 
         ///
-        /// Asset�����������
+        /// Asset������Ϊ�����һ��asset���ļ��ж�ȡ��
         ///
         class Asset : public Object
         {
diff --git a/Source/Asura.Engine/FileSystem/ImageImpoter.h b/Source/Asura.Engine/FileSystem/ImageImpoter.h
deleted file mode 100644
index ca7cb9a..0000000
--- a/Source/Asura.Engine/FileSystem/ImageImpoter.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __AE_IMAGE_IMPORTER_H__
-#define __AE_IMAGE_IMPORTER_H___
-
-namespace AsuraEngine
-{
-    namespace Filesystem
-    {
-
-        ///
-        /// ��.asr����image
-        ///
-        class ImageImporter
-        {
-
-        };
-
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/FileSystem/Importer.Animation.cpp b/Source/Asura.Engine/FileSystem/Importer.Animation.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.Animation.cpp
diff --git a/Source/Asura.Engine/FileSystem/Importer.Asset.cpp b/Source/Asura.Engine/FileSystem/Importer.Asset.cpp
new file mode 100644
index 0000000..0af7436
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.Asset.cpp
@@ -0,0 +1,3 @@
+#include "Importer.h"
+
+// �����Զ�����Դ
diff --git a/Source/Asura.Engine/FileSystem/Importer.Image.cpp b/Source/Asura.Engine/FileSystem/Importer.Image.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.Image.cpp
diff --git a/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp b/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp
diff --git a/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp b/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp
diff --git a/Source/Asura.Engine/FileSystem/Importer.cpp b/Source/Asura.Engine/FileSystem/Importer.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Importer.cpp
diff --git a/Source/Asura.Engine/FileSystem/Importer.h b/Source/Asura.Engine/FileSystem/Importer.h
index b343a92..16689e9 100644
--- a/Source/Asura.Engine/FileSystem/Importer.h
+++ b/Source/Asura.Engine/FileSystem/Importer.h
@@ -6,6 +6,10 @@ namespace AsuraEngine
     namespace Filesystem
     {
 
+        ///
+        /// ���ⲿ��Դ����ΪAsset������ڸ�����Դ��manager�����ͬ��importer�������Ǹ���.asr�ļ��ĸ�tag�������image
+        /// ����importImage���룬�����asset����importAsset���롣�����Զ�����Դ�����û��ָ��importer������asset���롣
+        ///
         class Importer
         {
 
diff --git a/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h b/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h
deleted file mode 100644
index 92796f3..0000000
--- a/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __AE_IMAGE_IMPORTER_H__
-#define __AE_IMAGE_IMPORTER_H___
-
-namespace AsuraEngine
-{
-    namespace Filesystem
-    {
-
-        ///
-        /// ��.asr����particle system
-        ///
-        class ParticleSystemImporter
-        {
-
-        };
-
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/FileSystem/SpriteImpoter.h b/Source/Asura.Engine/FileSystem/SpriteImpoter.h
deleted file mode 100644
index 0e157c1..0000000
--- a/Source/Asura.Engine/FileSystem/SpriteImpoter.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __AE_IMAGE_IMPORTER_H__
-#define __AE_IMAGE_IMPORTER_H___
-
-namespace AsuraEngine
-{
-    namespace Filesystem
-    {
-
-        ///
-        /// ��.asr����sprite
-        ///
-        class SpriteImporter
-        {
-
-        };
-
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/Impoter.lua b/Source/Asura.Framework/Filesystem/Impoter.lua
new file mode 100644
index 0000000..fbbd68a
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/Impoter.lua
@@ -0,0 +1,22 @@
+--[[ 
+���࣬�Զ������Դ����ͨ���̳д��ർ�롣�Զ������Դ�ı�Ƿ�����
+<asset>
+    <extern>./resource.maptile</extern>
+</asset>
+��ָ���˵���impoter֮���Զ������Դ����ͨ�����з������:
+<maptile>
+    <extern>./resource.maptile</extern>
+</maptile>
+�����ʹ�ö�Ӧ�ڲ���Դ���͵�importer������Դ
+
+]]
+
+local importer = Class() 
+
+function importer:InnerResource( data ) 
+
+	
+
+end
+
+return importer 
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua
index eb33e49..1dca9f4 100644
--- a/Source/Asura.Framework/Graphics/Animator.lua
+++ b/Source/Asura.Framework/Graphics/Animator.lua
@@ -1,11 +1,14 @@
-local Animator = Class()
+local Animator = Class(function(go)
+    self.gameobject = go
+    self.spriteRenderer = go:GetSpriteRenderer()
+end)
 
 Animator.animation = AsuraEngine.Animation.None
 
 local animation = AsuraEngine.Animation.New()
 
 function Animator:OnUpdate(dt)
-
+    
 end
 
 function Animator:OnRender()