*misc

7 files changed, 45 insertions, 26 deletions

diff --git a/Source/Asura.Framework/filesystem/animation_loader.lua b/Source/Asura.Framework/filesystem/animation_loader.lua
index f1dee29..4f989bd 100644
--- a/Source/Asura.Framework/filesystem/animation_loader.lua
+++ b/Source/Asura.Framework/filesystem/animation_loader.lua
@@ -1,11 +1,12 @@
-local AnimationLoader = AsuraEngine.Loader.New("animation")
-local AnimationManager = require "AnimationManager"
-local Animation = require "Animation"
+require "AnimationManager"
+require "Animation"
+
+local loader = AsuraEngine.Loader.New("animation")
+local manager = AsuraEngine.AnimationManager
+local Animation = AsuraEngine.Animation
 
 function AnimationLoader.Load(asset)
     
     local animation = AsuraEngine.Class()
 
-end
-
-return AnimationLoader
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/entity_loader.lua b/Source/Asura.Framework/filesystem/entity_loader.lua
index ad2351c..67a849d 100644
--- a/Source/Asura.Framework/filesystem/entity_loader.lua
+++ b/Source/Asura.Framework/filesystem/entity_loader.lua
@@ -1,2 +1,5 @@
-local EntityLoader = AsuraEngine.Loader.New("entity")
+local loader = AsuraEngine.Loader.New("entity")
 
+function loader.Load(asset)
+
+end
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/loader.lua b/Source/Asura.Framework/filesystem/loader.lua
index 9ac058b..2d1e8cf 100644
--- a/Source/Asura.Framework/filesystem/loader.lua
+++ b/Source/Asura.Framework/filesystem/loader.lua
@@ -1,9 +1,14 @@
-local Loader = Class() 
-
-function Loader:InnerResource( data ) 
-
-	
-
+-- Assets loaders
+AsuraEngine.Loader = {}
+local Loader = AsuraEngine.Loader
+Loader.Loaders = {}
+
+function Loader.New(type)
+  if Loader.Loaders[type] ~= nil then 
+    return Loader.Loaders[type]
+  end
+  local loader = {} 
+  Loader[type] = loader
+  return loader
 end
 
-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 2ea47f4..2c2058e 100644
--- a/Source/Asura.Framework/filesystem/material_loader.lua
+++ b/Source/Asura.Framework/filesystem/material_loader.lua
@@ -1,8 +1,7 @@
-local MaterialLoader = AsuraEngine.Loader.New("material")
-local MaterialManager = require "MaterialManager"
+require "MaterialManager"
 
-function MaterialLoader.Load(mat)
-  
-end
+local loader = AsuraEngine.Loader.New("material")
 
-return MaterialLoader
\ No newline at end of file
+function loader.Load(asset)
+  
+end
\ 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 c62be96..8618c03 100644
--- a/Source/Asura.Framework/filesystem/path_loader.lua
+++ b/Source/Asura.Framework/filesystem/path_loader.lua
@@ -1,10 +1,9 @@
-local PathLoader = AsuraEngine.Loader.New("path")
-local PathManager = require "Path/PathManager"
+require "Path/PathManager"
 
-function PathLoader.Load(asset)
+local loader = AsuraEngine.Loader.New("path")
+
+function loader.Load(asset)
   if asset.type ~= "path" then 
     return nil    
   end 
-end
-
-return Path
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/scene_loader.lua b/Source/Asura.Framework/filesystem/scene_loader.lua
index e69de29..3284c57 100644
--- a/Source/Asura.Framework/filesystem/scene_loader.lua
+++ b/Source/Asura.Framework/filesystem/scene_loader.lua
@@ -0,0 +1,5 @@
+local loader = AsuraEngine.Loader.New("scene")
+
+function loader.Load(asset) 
+
+end
\ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/statemap_loader.lua b/Source/Asura.Framework/filesystem/statemap_loader.lua
new file mode 100644
index 0000000..ededcfc
--- /dev/null
+++ b/Source/Asura.Framework/filesystem/statemap_loader.lua
@@ -0,0 +1,7 @@
+require "ai/statemap_manager"
+local loader = AsuraEngine.Loader.New("statemap")
+
+--载入statemap
+function loader.Load(asset)
+
+end
\ No newline at end of file