*misc

28 files changed, 149 insertions, 11 deletions

diff --git a/Source/Asura.Engine/GUI/Button.cpp b/Source/Asura.Engine/FileSystem/Loader.cpp
index e69de29..e69de29 100644
--- a/Source/Asura.Engine/GUI/Button.cpp
+++ b/Source/Asura.Engine/FileSystem/Loader.cpp
diff --git a/Source/Asura.Engine/FileSystem/Loader.h b/Source/Asura.Engine/FileSystem/Loader.h
new file mode 100644
index 0000000..2846c69
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Loader.h
@@ -0,0 +1,20 @@
+#ifndef __AE_LOADER_H__
+#define __AE_LOADER_H__
+
+namespace AsuraEngine
+{
+    namespace Filesystem
+    {
+
+        ///
+        /// ��Դloader
+        ///
+        class Loader
+        {
+
+        };
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/GUI/README.md b/Source/Asura.Engine/GUI/README.md
deleted file mode 100644
index 3e367c7..0000000
--- a/Source/Asura.Engine/GUI/README.md
+++ /dev/null
@@ -1 +0,0 @@
-immediate mode game gui
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h
index cd78194..7f70e7c 100644
--- a/Source/Asura.Engine/Graphics/Canvas.h
+++ b/Source/Asura.Engine/Graphics/Canvas.h
@@ -11,6 +11,13 @@ namespace AsuraEngine
 		
 		class Canvas : public Texture, public Component
 		{
+        public:
+
+
+
+        private:
+
+
 			
         };
 		
diff --git a/Source/Asura.Engine/Graphics/Material.h b/Source/Asura.Engine/Graphics/Material.h
index 1cb3c88..68dfa1e 100644
--- a/Source/Asura.Engine/Graphics/Material.h
+++ b/Source/Asura.Engine/Graphics/Material.h
@@ -160,13 +160,13 @@ namespace AsuraEngine
             ///
             /// ���е�image
             ///
-            Containers::Map<uint, Image*> mImages;
+            Containers::Map<uint, Material*> mMaterials;
 
             ///
             /// image��·����ID��ӳ�䡣��Դ�.asr�����image��ͨ��·�������õ�image�����Բ��������е�image���ڴ�map�С�
             /// �ɳ��򴴽���imageֻ��ͨ��ID����ȡ�����Գ�������Ҫ����ID��
             ///
-            Containers::StringMap<uint> mImageIDs;
+            Containers::StringMap<uint> mMaterialIDs;
 
         };
 
diff --git a/Source/Asura.Engine/Graphics/Shape.cpp b/Source/Asura.Engine/Graphics/Shape.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/Graphics/Shape.cpp
diff --git a/Source/Asura.Engine/Graphics/Shape.h b/Source/Asura.Engine/Graphics/Shape.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/Graphics/Shape.h
diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua
index 54bd3c7..027c066 100644
--- a/Source/Asura.Framework/Component.lua
+++ b/Source/Asura.Framework/Component.lua
@@ -1,9 +1,21 @@
+local Component = Class()
 
-local Component = Class(function()
-    self.gameobject = nil
+Component.gameobject = AsuraEngine.Type.GameObject
 
-end)
+function Component:Ctor(go)
+    self.gameobject = go
+end
 
-Component.gameobject = AsuraEngine.Type.GameObject
+function Component:OnEvent(e)
+
+end
+
+function Component:OnUpdate(ms)
+
+end
+
+function Component:OnDraw() 
+
+end
 
-return Component
+return Component
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/AnimationLoader.lua b/Source/Asura.Framework/Filesystem/AnimationLoader.lua
new file mode 100644
index 0000000..5d19758
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/AnimationLoader.lua
@@ -0,0 +1,10 @@
+local AnimationLoader = AsuraEngine.Loader.New("animation")
+local AnimationManager = require "AnimationManager"
+
+function AnimationLoader.Load(mat)
+    
+    local animation = AsuraEngine.Class()
+
+end
+
+return AnimationLoader
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/GameObjectLoader.lua b/Source/Asura.Framework/Filesystem/GameObjectLoader.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/GameObjectLoader.lua
diff --git a/Source/Asura.Framework/Filesystem/Impoter.lua b/Source/Asura.Framework/Filesystem/Loader.lua
index fbbd68a..fbbd68a 100644
--- a/Source/Asura.Framework/Filesystem/Impoter.lua
+++ b/Source/Asura.Framework/Filesystem/Loader.lua
diff --git a/Source/Asura.Framework/Filesystem/MaterialLoader.lua b/Source/Asura.Framework/Filesystem/MaterialLoader.lua
new file mode 100644
index 0000000..8ecfa51
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/MaterialLoader.lua
@@ -0,0 +1,10 @@
+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/PathLoader.lua b/Source/Asura.Framework/Filesystem/PathLoader.lua
new file mode 100644
index 0000000..b9112df
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/PathLoader.lua
@@ -0,0 +1,11 @@
+local PathLoader = AsuraEngine.Loader.New("path")
+local PathManager = require "Path/PathManager"
+
+function PathLoader.Load(asset)
+    if asset.type ~= "path" then 
+        return nil    
+    end 
+    
+end
+
+return Path
\ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/PrefabLoader.lua b/Source/Asura.Framework/Filesystem/PrefabLoader.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/PrefabLoader.lua
diff --git a/Source/Asura.Framework/Filesystem/SceneLoader.lua b/Source/Asura.Framework/Filesystem/SceneLoader.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Filesystem/SceneLoader.lua
diff --git a/Source/Asura.Framework/GUI/Button.lua b/Source/Asura.Framework/GUI/Button.lua
new file mode 100644
index 0000000..a63cc01
--- /dev/null
+++ b/Source/Asura.Framework/GUI/Button.lua
@@ -0,0 +1,7 @@
+-- ��Ϸ���imgui
+
+local Button = AsuraEngine.Component.Extend("Button")
+
+
+
+return Button
\ No newline at end of file
diff --git a/Source/Asura.Framework/GUI/Text.lua b/Source/Asura.Framework/GUI/Text.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/GUI/Text.lua
diff --git a/Source/Asura.Framework/GameObject.lua b/Source/Asura.Framework/GameObject.lua
index 358ba14..1b328ca 100644
--- a/Source/Asura.Framework/GameObject.lua
+++ b/Source/Asura.Framework/GameObject.lua
@@ -1,4 +1,4 @@
-local GameObject = Class()
+local GameObject = AsuraEngine.Asset.SubClass("GameObject")
 
 function GameObject:OnEnable()
 
@@ -8,7 +8,7 @@ function GameObject:OnEvent(e)
 
 end
 
-function GameObject:OnUpdate()
+function GameObject:OnUpdate(dt)
 
 end
 
@@ -52,4 +52,8 @@ function GameObject:SetRotation()
 
 end
 
+function GameObject:ToAsset()
+
+end
+
 return GameObject
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Animation.lua b/Source/Asura.Framework/Graphics/Animation.lua
new file mode 100644
index 0000000..b73cdd8
--- /dev/null
+++ b/Source/Asura.Framework/Graphics/Animation.lua
@@ -0,0 +1,5 @@
+local Animation = AsuraEngine.Asset.New("animation")
+
+
+
+return Animation
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/DefaultShaders.lua b/Source/Asura.Framework/Graphics/DefaultShaders.lua
new file mode 100644
index 0000000..bd54cb9
--- /dev/null
+++ b/Source/Asura.Framework/Graphics/DefaultShaders.lua
@@ -0,0 +1,5 @@
+--[[
+���õ�shaders.
+]]
+
+
diff --git a/Source/Asura.Framework/Graphics/Material.lua b/Source/Asura.Framework/Graphics/Material.lua
new file mode 100644
index 0000000..5875efc
--- /dev/null
+++ b/Source/Asura.Framework/Graphics/Material.lua
@@ -0,0 +1,18 @@
+--[[
+���ʣ��Ƕ�shader�Ĵ���
+]]
+local Material = AsuraEngine.Class()
+
+function Material:Ctor() 
+
+end
+
+function Material:ToAsset()
+
+end
+
+function Material:GetUniform()
+
+end
+
+return Material
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/MaterialManager.lua b/Source/Asura.Framework/Graphics/MaterialManager.lua
new file mode 100644
index 0000000..46cc13d
--- /dev/null
+++ b/Source/Asura.Framework/Graphics/MaterialManager.lua
@@ -0,0 +1,5 @@
+local MaterialManager = AsuraEngine.Manager.New()
+
+
+
+return MaterialManager 
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/ParticleSystemManager.lua b/Source/Asura.Framework/Graphics/ParticleSystemManager.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Graphics/ParticleSystemManager.lua
diff --git a/Source/Asura.Framework/Math/Curve.lua b/Source/Asura.Framework/Math/Curve.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Math/Curve.lua
diff --git a/Source/Asura.Framework/Path/Path.lua b/Source/Asura.Framework/Path/Path.lua
new file mode 100644
index 0000000..3b6079d
--- /dev/null
+++ b/Source/Asura.Framework/Path/Path.lua
@@ -0,0 +1,13 @@
+local Path = AsuraEngine.Asset.New("path")
+
+function Path:Ctor() 
+
+end
+
+-- ToAsset�����Ѷ���pathת��Ϊ.asset�ļ���ʽ
+function Path.ToAsset(path)
+    local builder = AsuraEngine.AssetBuilder.Get()
+    
+end
+
+return Path
\ No newline at end of file
diff --git a/Source/Asura.Framework/Path/PathCalculator.lua b/Source/Asura.Framework/Path/PathCalculator.lua
new file mode 100644
index 0000000..1a564b8
--- /dev/null
+++ b/Source/Asura.Framework/Path/PathCalculator.lua
@@ -0,0 +1,12 @@
+--[[
+��������������ڱ༭����components�б���
+]]
+local PathCalculator = AsuraEngine.Component.New("PathCalculator")
+
+PathCalculator.path = AsuraEngine.Asset.Type("path", "·��")
+
+function PathCalculator:ctor(path) 
+    self.path = path
+end
+
+return PathCalculator
\ No newline at end of file
diff --git a/Source/Asura.Framework/Path/PathManager.lua b/Source/Asura.Framework/Path/PathManager.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/Path/PathManager.lua
diff --git a/Source/Asura.Framework/README.md b/Source/Asura.Framework/README.md
index 10a5290..c803f1f 100644
--- a/Source/Asura.Framework/README.md
+++ b/Source/Asura.Framework/README.md
@@ -1,3 +1,3 @@
 
-AsuraFramework�ǿ�ܣ�ʹ��ECSģʽ��
+AsuraFramework�ǿ�ܣ�ʹ��ECSģʽ��������չ��asset�������