*misc

18 files changed, 70 insertions, 56 deletions

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index f94dc6d..7603ce6 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -135,6 +135,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index 06cdee9..bbc7d2a 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -25,5 +25,8 @@
     <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h">
       <Filter>Source</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Window.h">
+      <Filter>Source</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index d19cd79..73bc276 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -134,6 +134,7 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Image.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" />
@@ -182,6 +183,7 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Image.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp" />
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 179127c..eef9073 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -161,6 +161,9 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h">
       <Filter>Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\AI\BehaviorTree.cpp">
@@ -281,5 +284,8 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Asura.Editor/Source/Window.h b/Source/Asura.Editor/Source/Window.h
new file mode 100644
index 0000000..f9f8d43
--- /dev/null
+++ b/Source/Asura.Editor/Source/Window.h
@@ -0,0 +1,14 @@
+#ifndef __ASURA_EDITOR_WINDOW_H__
+#define __ASURA_EDITOR_WINDOW_H__
+
+namespace AsuraEditor
+{
+
+    class Window
+    {
+
+    };
+
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Window.cpp b/Source/Asura.Engine/Graphics/Window.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/Graphics/Window.cpp
diff --git a/Source/Asura.Engine/Graphics/Window.h b/Source/Asura.Engine/Graphics/Window.h
new file mode 100644
index 0000000..1707e3d
--- /dev/null
+++ b/Source/Asura.Engine/Graphics/Window.h
@@ -0,0 +1,20 @@
+#ifndef __AE_WINDOW_H__
+#define __AE_WINDOW_H__
+
+namespace AsuraEngine
+{
+    namespace Graphics
+    {
+
+        ///
+        /// ��Ϸ����
+        ///
+        class Window
+        {
+
+        };
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua
index 027c066..dd843eb 100644
--- a/Source/Asura.Framework/Component.lua
+++ b/Source/Asura.Framework/Component.lua
@@ -3,7 +3,7 @@ local Component = Class()
 Component.gameobject = AsuraEngine.Type.GameObject
 
 function Component:Ctor(go)
-    self.gameobject = go
+  self.gameobject = go
 end
 
 function Component:OnEvent(e)
diff --git a/Source/Asura.Framework/Filesystem/Loader.lua b/Source/Asura.Framework/Filesystem/Loader.lua
index fbbd68a..9ac058b 100644
--- a/Source/Asura.Framework/Filesystem/Loader.lua
+++ b/Source/Asura.Framework/Filesystem/Loader.lua
@@ -1,22 +1,9 @@
---[[ 
-���࣬�Զ������Դ����ͨ���̳д��ർ�롣�Զ������Դ�ı�Ƿ�����
-<asset>
-    <extern>./resource.maptile</extern>
-</asset>
-��ָ���˵���impoter֮���Զ������Դ����ͨ�����з������:
-<maptile>
-    <extern>./resource.maptile</extern>
-</maptile>
-�����ʹ�ö�Ӧ�ڲ���Դ���͵�importer������Դ
+local Loader = Class() 
 
-]]
-
-local importer = Class() 
-
-function importer:InnerResource( data ) 
+function Loader:InnerResource( data ) 
 
 	
 
 end
 
-return importer 
\ No newline at end of file
+return Loader 
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/material_loader.lua b/Source/Asura.Framework/Filesystem/material_loader.lua
index 8ecfa51..2ea47f4 100644
--- a/Source/Asura.Framework/Filesystem/material_loader.lua
+++ b/Source/Asura.Framework/Filesystem/material_loader.lua
@@ -2,9 +2,7 @@ local MaterialLoader = AsuraEngine.Loader.New("material")
 local MaterialManager = require "MaterialManager"
 
 function MaterialLoader.Load(mat)
-    
-
-
+  
 end
 
 return MaterialLoader
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/path_loader.lua b/Source/Asura.Framework/Filesystem/path_loader.lua
index b9112df..c62be96 100644
--- a/Source/Asura.Framework/Filesystem/path_loader.lua
+++ b/Source/Asura.Framework/Filesystem/path_loader.lua
@@ -2,10 +2,9 @@ local PathLoader = AsuraEngine.Loader.New("path")
 local PathManager = require "Path/PathManager"
 
 function PathLoader.Load(asset)
-    if asset.type ~= "path" then 
-        return nil    
-    end 
-    
+  if asset.type ~= "path" then 
+    return nil    
+  end 
 end
 
 return Path
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua
index 1dca9f4..2e52104 100644
--- a/Source/Asura.Framework/Graphics/Animator.lua
+++ b/Source/Asura.Framework/Graphics/Animator.lua
@@ -1,6 +1,6 @@
 local Animator = Class(function(go)
-    self.gameobject = go
-    self.spriteRenderer = go:GetSpriteRenderer()
+  self.gameobject = go
+  self.spriteRenderer = go:GetSpriteRenderer()
 end)
 
 Animator.animation = AsuraEngine.Animation.None
@@ -8,11 +8,11 @@ Animator.animation = AsuraEngine.Animation.None
 local animation = AsuraEngine.Animation.New()
 
 function Animator:OnUpdate(dt)
-    
+
 end
 
 function Animator:OnRender()
-
+  
 end
 
 return Animator
\ No newline at end of file
diff --git a/Source/Asura.Framework/compile.bat b/Source/Asura.Framework/compile.bat
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/compile.bat
diff --git a/Source/Asura.Framework/component.lua b/Source/Asura.Framework/component.lua
index 027c066..dd843eb 100644
--- a/Source/Asura.Framework/component.lua
+++ b/Source/Asura.Framework/component.lua
@@ -3,7 +3,7 @@ local Component = Class()
 Component.gameobject = AsuraEngine.Type.GameObject
 
 function Component:Ctor(go)
-    self.gameobject = go
+  self.gameobject = go
 end
 
 function Component:OnEvent(e)
diff --git a/Source/Asura.Framework/filesystem/loader.lua b/Source/Asura.Framework/filesystem/loader.lua
index fbbd68a..9ac058b 100644
--- a/Source/Asura.Framework/filesystem/loader.lua
+++ b/Source/Asura.Framework/filesystem/loader.lua
@@ -1,22 +1,9 @@
---[[ 
-���࣬�Զ������Դ����ͨ���̳д��ർ�롣�Զ������Դ�ı�Ƿ�����
-<asset>
-    <extern>./resource.maptile</extern>
-</asset>
-��ָ���˵���impoter֮���Զ������Դ����ͨ�����з������:
-<maptile>
-    <extern>./resource.maptile</extern>
-</maptile>
-�����ʹ�ö�Ӧ�ڲ���Դ���͵�importer������Դ
+local Loader = Class() 
 
-]]
-
-local importer = Class() 
-
-function importer:InnerResource( data ) 
+function Loader:InnerResource( data ) 
 
 	
 
 end
 
-return importer 
\ No newline at end of file
+return Loader 
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/material_loader.lua b/Source/Asura.Framework/filesystem/material_loader.lua
index 8ecfa51..2ea47f4 100644
--- a/Source/Asura.Framework/filesystem/material_loader.lua
+++ b/Source/Asura.Framework/filesystem/material_loader.lua
@@ -2,9 +2,7 @@ local MaterialLoader = AsuraEngine.Loader.New("material")
 local MaterialManager = require "MaterialManager"
 
 function MaterialLoader.Load(mat)
-    
-
-
+  
 end
 
 return MaterialLoader
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/path_loader.lua b/Source/Asura.Framework/filesystem/path_loader.lua
index b9112df..c62be96 100644
--- a/Source/Asura.Framework/filesystem/path_loader.lua
+++ b/Source/Asura.Framework/filesystem/path_loader.lua
@@ -2,10 +2,9 @@ local PathLoader = AsuraEngine.Loader.New("path")
 local PathManager = require "Path/PathManager"
 
 function PathLoader.Load(asset)
-    if asset.type ~= "path" then 
-        return nil    
-    end 
-    
+  if asset.type ~= "path" then 
+    return nil    
+  end 
 end
 
 return Path
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua
index 1dca9f4..2e52104 100644
--- a/Source/Asura.Framework/graphics/animator.lua
+++ b/Source/Asura.Framework/graphics/animator.lua
@@ -1,6 +1,6 @@
 local Animator = Class(function(go)
-    self.gameobject = go
-    self.spriteRenderer = go:GetSpriteRenderer()
+  self.gameobject = go
+  self.spriteRenderer = go:GetSpriteRenderer()
 end)
 
 Animator.animation = AsuraEngine.Animation.None
@@ -8,11 +8,11 @@ Animator.animation = AsuraEngine.Animation.None
 local animation = AsuraEngine.Animation.New()
 
 function Animator:OnUpdate(dt)
-    
+
 end
 
 function Animator:OnRender()
-
+  
 end
 
 return Animator
\ No newline at end of file