*misc

11 files changed, 97 insertions, 19 deletions

diff --git a/Source/Asura.Engine/Graphics/Mesh2D.h b/Source/Asura.Engine/Graphics/Mesh2D.h
index 632b04a..cff66c4 100644
--- a/Source/Asura.Engine/Graphics/Mesh2D.h
+++ b/Source/Asura.Engine/Graphics/Mesh2D.h
@@ -7,7 +7,7 @@ namespace AsuraEngine
     {
 
         ///
-        /// 2D mesh��������һЩUV����
+        /// 2D mesh��������һЩ���㶯����
         ///
         class Mesh2D
         {
diff --git a/Source/Asura.Engine/Scripting/Luax.hpp b/Source/Asura.Engine/Scripting/Luax.hpp
index 461d5bc..5d01997 100644
--- a/Source/Asura.Engine/Scripting/Luax.hpp
+++ b/Source/Asura.Engine/Scripting/Luax.hpp
@@ -1,6 +1,10 @@
 #ifndef __ASURA_ENGINE_LUAX_H__
 #define __ASURA_ENGINE_LUAX_H__
 
+///
+/// Scripting with Lua.
+///
+
 #include "Lua51/lua.h"
 #include "Lua51/lauxlib.h"
 #include "Luax/luax.h"
diff --git a/Source/Asura.Framework/Class.lua b/Source/Asura.Framework/Class.lua
index 164cb4a..ee30c8d 100644
--- a/Source/Asura.Framework/Class.lua
+++ b/Source/Asura.Framework/Class.lua
@@ -1,4 +1,16 @@
-local Class = {}
-AsuraEngine.Class = Class
+AsuraEngine.Class = {}
+local Class = AsuraEngine.Class
+Class.__index = Class
 
+function AsuraEngine.Class.Sub(cname)
+  local c = {} 
+  c.class = cname
+  setmetatable(c, Class)
+  return c
+end
 
+function AsuraEngine.Class.New(self)
+  local obj = {} 
+  setmetatable(obj, self)
+  self.__index = self
+end
diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua
index 2e52104..8c8a185 100644
--- a/Source/Asura.Framework/Graphics/Animator.lua
+++ b/Source/Asura.Framework/Graphics/Animator.lua
@@ -1,11 +1,20 @@
-local Animator = Class(function(go)
-  self.gameobject = go
+AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator")
+
+local Animator = AsuraEngine.Animator
+
+function Animator:Ctor(go, animation)
+  self.base(go)
   self.spriteRenderer = go:GetSpriteRenderer()
-end)
+  self.animation = animation
+end
 
-Animator.animation = AsuraEngine.Animation.None
+function Animator:SetAnimation(animation)
+  self.animation = animation
+end
 
-local animation = AsuraEngine.Animation.New()
+function Animator:GetAnimation()
+  return self.animation
+end
 
 function Animator:OnUpdate(dt)
 
@@ -14,5 +23,3 @@ end
 function Animator:OnRender()
   
 end
-
-return Animator
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Renderer.lua b/Source/Asura.Framework/Graphics/Renderer.lua
index 9e75026..82a8e99 100644
--- a/Source/Asura.Framework/Graphics/Renderer.lua
+++ b/Source/Asura.Framework/Graphics/Renderer.lua
@@ -1,9 +1,19 @@
 local Renderer = AsuraEngine.Component.Sub("Renderer")
 AsuraEngine.Renderer = Renderer
 
+function Renderer.Ctor(self)
+  self.materials = {} 
+  self.material = nil 
+  self.isMultiMaterials = false
+end
+
 --取材质，如果是shared，那么从此材质clone一个
 function Renderer.GetMaterial(self)
   
 end 
 
+function Renderer.isMultiMaterials(self) 
+  return self.isMultiMaterials
+end
+
 return Renderer
\ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/sprite_renderer.lua b/Source/Asura.Framework/Graphics/sprite_renderer.lua
index 1cbebd7..925e8b1 100644
--- a/Source/Asura.Framework/Graphics/sprite_renderer.lua
+++ b/Source/Asura.Framework/Graphics/sprite_renderer.lua
@@ -3,6 +3,10 @@ require "graphics.renderer"
 local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer")
 AsuraEngine.SpriteRenderer = SpriteRenderer
 
+function SpriteRenderer.Ctor(self)
+  self.materials = {}
+end
+
 function SpriteRenderer:OnRender()
   
 end
diff --git a/Source/Asura.Framework/class.lua b/Source/Asura.Framework/class.lua
index 164cb4a..ee30c8d 100644
--- a/Source/Asura.Framework/class.lua
+++ b/Source/Asura.Framework/class.lua
@@ -1,4 +1,16 @@
-local Class = {}
-AsuraEngine.Class = Class
+AsuraEngine.Class = {}
+local Class = AsuraEngine.Class
+Class.__index = Class
 
+function AsuraEngine.Class.Sub(cname)
+  local c = {} 
+  c.class = cname
+  setmetatable(c, Class)
+  return c
+end
 
+function AsuraEngine.Class.New(self)
+  local obj = {} 
+  setmetatable(obj, self)
+  self.__index = self
+end
diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua
index 2e52104..8c8a185 100644
--- a/Source/Asura.Framework/graphics/animator.lua
+++ b/Source/Asura.Framework/graphics/animator.lua
@@ -1,11 +1,20 @@
-local Animator = Class(function(go)
-  self.gameobject = go
+AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator")
+
+local Animator = AsuraEngine.Animator
+
+function Animator:Ctor(go, animation)
+  self.base(go)
   self.spriteRenderer = go:GetSpriteRenderer()
-end)
+  self.animation = animation
+end
 
-Animator.animation = AsuraEngine.Animation.None
+function Animator:SetAnimation(animation)
+  self.animation = animation
+end
 
-local animation = AsuraEngine.Animation.New()
+function Animator:GetAnimation()
+  return self.animation
+end
 
 function Animator:OnUpdate(dt)
 
@@ -14,5 +23,3 @@ end
 function Animator:OnRender()
   
 end
-
-return Animator
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/renderer.lua b/Source/Asura.Framework/graphics/renderer.lua
index 9e75026..82a8e99 100644
--- a/Source/Asura.Framework/graphics/renderer.lua
+++ b/Source/Asura.Framework/graphics/renderer.lua
@@ -1,9 +1,19 @@
 local Renderer = AsuraEngine.Component.Sub("Renderer")
 AsuraEngine.Renderer = Renderer
 
+function Renderer.Ctor(self)
+  self.materials = {} 
+  self.material = nil 
+  self.isMultiMaterials = false
+end
+
 --取材质，如果是shared，那么从此材质clone一个
 function Renderer.GetMaterial(self)
   
 end 
 
+function Renderer.isMultiMaterials(self) 
+  return self.isMultiMaterials
+end
+
 return Renderer
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/sprite_renderer.lua b/Source/Asura.Framework/graphics/sprite_renderer.lua
index 1cbebd7..925e8b1 100644
--- a/Source/Asura.Framework/graphics/sprite_renderer.lua
+++ b/Source/Asura.Framework/graphics/sprite_renderer.lua
@@ -3,6 +3,10 @@ require "graphics.renderer"
 local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer")
 AsuraEngine.SpriteRenderer = SpriteRenderer
 
+function SpriteRenderer.Ctor(self)
+  self.materials = {}
+end
+
 function SpriteRenderer:OnRender()
   
 end
diff --git a/Source/Samples/CursorTest/main.cpp b/Source/Samples/CursorTest/main.cpp
new file mode 100644
index 0000000..d9798ec
--- /dev/null
+++ b/Source/Samples/CursorTest/main.cpp
@@ -0,0 +1,8 @@
+///
+/// �޸������ʽ
+///
+
+int main()
+{
+
+}
\ No newline at end of file