*misc

12 files changed, 105 insertions, 32 deletions

diff --git a/Source/Asura.Framework/graphics/animation.lua b/Source/Asura.Framework/graphics/animation.lua
index c4ff33b..b6673c6 100644
--- a/Source/Asura.Framework/graphics/animation.lua
+++ b/Source/Asura.Framework/graphics/animation.lua
@@ -1,3 +1,15 @@
-local Animation = AsuraEngine.Asset.Sub("Animation")
-AsuraEngine.Animation = Animation
+AsuraEngine.Animation = AsuraEngine.Asset.Sub("Animation")
 
+local Animation = AsuraEngine.Animation
+
+local Frame = AsuraEngine.Class("Frame")
+
+function Frame.Ctor(self)
+
+end
+
+function Animation.Ctor(self)
+
+end
+
+return Animation
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua
index 98baf0d..7cc18a1 100644
--- a/Source/Asura.Framework/graphics/animator.lua
+++ b/Source/Asura.Framework/graphics/animator.lua
@@ -2,18 +2,22 @@ AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator")
 
 local Animator = AsuraEngine.Animator
 
+-- Animator inspector variables.
+Animator.mSpriteRenderer = AsuraEngine.Type.SpriteRenderer
+Animator.mAnimation = AsuraEngine.Type.Animation
+
 function Animator:Ctor(entity, animation)
   self.base(entity)
-  self.spriteRenderer = entity:GetSpriteRenderer()
-  self.animation = animation
+  self.mSpriteRenderer = entity:GetSpriteRenderer()
+  self.mAnimation = animation
 end
 
 function Animator:SetAnimation(animation)
-  self.animation = animation
+  self.mAnimation = animation
 end
 
 function Animator:GetAnimation()
-  return self.animation
+  return self.mAnimation
 end
 
 function Animator:OnUpdate(dt)
diff --git a/Source/Asura.Framework/graphics/camera.lua b/Source/Asura.Framework/graphics/camera.lua
index 41d4394..039de1a 100644
--- a/Source/Asura.Framework/graphics/camera.lua
+++ b/Source/Asura.Framework/graphics/camera.lua
@@ -1,7 +1,21 @@
-local Camera = Class()
+AsuraEngine.Camera = AsuraEngine.Component.Sub("Camera")
 
-Camera.mIsOnScreen = false 
+local Camera = AsuraEngine.Camera
 
-Camera.mIsCulling = false
+Camera.mIsCulling = AsuraEngine.Type.Bool 
+Camera.mIsOnScreen = AsuraEngine.Type.Bool
+
+function Camera.Ctor(self)
+  self.mIsCulling = false 
+  self.mIsOnScreen = false
+end
+
+function Camera.OnUpdate(dt)
+
+end
+
+function Camera.OnRender()
+
+end
 
 return Camera
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/canvas.lua b/Source/Asura.Framework/graphics/canvas.lua
index 0b880c5..2ccb033 100644
--- a/Source/Asura.Framework/graphics/canvas.lua
+++ b/Source/Asura.Framework/graphics/canvas.lua
@@ -1,16 +1,34 @@
-local Canvas = AsuraEngine.Component.Sub("Canvas")
-AsuraEngine.Canvas = Canvas
+AsuraEngine.Canvas = AsuraEngine.Component.Sub("Canvas")
+
+local Canvas = AsuraEngine.Canvas
 
 function Canvas.Ctor(self, width, height)
-  self.simCanvas = AsuraEngine.SimCanvas.New(width, height)
-  self.width = width 
-  self.height = height
+  self.mSimCanvas = AsuraEngine.SimCanvas.New(width, height)
+  self.mWidth = width 
+  self.mHeight = height
 end
 
-function Canvas.OnEnable(self)
+function Canvas.GetWidth(self)
+  return self.mWidth 
+end
+
+function Canvas.GetHeight(self)
+  return self.mHeight
+end
 
+function Canvas.GetSize(self)
+  return self.mWidth, self.mHeight
+end
+
+function Canvas.OnEnable(self)
+  if self.mSimCanvas == nil then 
+    return 
+  end 
+  self.mSimCanvas:Begin() 
 end
 
 function Canvas.OnDisable(self)
 
 end
+
+return Canvas
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/image.lua b/Source/Asura.Framework/graphics/image.lua
index be55dbd..ae91466 100644
--- a/Source/Asura.Framework/graphics/image.lua
+++ b/Source/Asura.Framework/graphics/image.lua
@@ -1,6 +1,7 @@
 -- 图片资源
-local Image = AsuraEngine.Asset.Sub("Image")
-AsuraEngine.Image = Image
+AsuraEngine.Image = AsuraEngine.Asset.Sub("Image")
+
+local Image = AsuraEngine.Image
 
 function Image.Ctor(self, path)
   local simImage = AsuraEngine.SimImage.New(path) 
diff --git a/Source/Asura.Framework/graphics/material.lua b/Source/Asura.Framework/graphics/material.lua
index 01f8688..7028f98 100644
--- a/Source/Asura.Framework/graphics/material.lua
+++ b/Source/Asura.Framework/graphics/material.lua
@@ -1,9 +1,11 @@
 --material是shader的代理
-local Material = AsuraEngine.Asset.Sub("Material")
+AsuraEngine.Material = AsuraEngine.Asset.Sub("Material")
 
-function Material:Ctor()
-  self.uniforms = {} --uniform变量和值
-  self.isShared = false
+local Material = AsuraEngine.Material
+
+function Material.Ctor(self)
+  self.mUniforms = {} --uniform变量和值
+  self.mIsShared = false
 end
 
 function Material.Clone(self)
diff --git a/Source/Asura.Framework/graphics/mesh2d.lua b/Source/Asura.Framework/graphics/mesh2d.lua
index 1c53608..13b270a 100644
--- a/Source/Asura.Framework/graphics/mesh2d.lua
+++ b/Source/Asura.Framework/graphics/mesh2d.lua
@@ -1,6 +1,9 @@
-local Mesh2D = AsuraEngine.Asset.Sub("Mesh2D")
-AsuraEngine.Mesh2D = Mesh2D
+AsuraEngine.Mesh2D = AsuraEngine.Asset.Sub("Mesh2D")
+
+local Mesh2D = AsuraEngine.Mesh2D
 
 function Mesh2D.Ctor(self)
 
-end
\ No newline at end of file
+end
+
+return Mesh2D
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/mesh2d_renderer.lua b/Source/Asura.Framework/graphics/mesh2d_renderer.lua
index debfd37..67577bc 100644
--- a/Source/Asura.Framework/graphics/mesh2d_renderer.lua
+++ b/Source/Asura.Framework/graphics/mesh2d_renderer.lua
@@ -1,5 +1,13 @@
-local Mesh2DRenderer = AsuraEngine.Component.Sub("Mesh2DRenderer")
-AsuraEngine.Mesh2DRenderer = Mesh2DRenderer
+AsuraEngine.Mesh2DRenderer = AsuraEngine.Renderer.Sub("Mesh2DRenderer")
 
+local Mesh2DRenderer = AsuraEngine.Mesh2DRenderer
+
+function Mesh2DRenderer.Ctor(self, material)
+  self.base(material)
+end
+
+function Mesh2DRenderer.OnRender(self)
+
+end
 
 return Mesh2DRenderer
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/renderer.lua b/Source/Asura.Framework/graphics/renderer.lua
index 82a8e99..46fd548 100644
--- a/Source/Asura.Framework/graphics/renderer.lua
+++ b/Source/Asura.Framework/graphics/renderer.lua
@@ -2,9 +2,9 @@ local Renderer = AsuraEngine.Component.Sub("Renderer")
 AsuraEngine.Renderer = Renderer
 
 function Renderer.Ctor(self)
-  self.materials = {} 
-  self.material = nil 
-  self.isMultiMaterials = false
+  self.mMaterials = {} 
+  self.mMaterial = nil 
+  self.mIsMultiMaterials = false
 end
 
 --取材质，如果是shared，那么从此材质clone一个
@@ -12,8 +12,8 @@ function Renderer.GetMaterial(self)
   
 end 
 
-function Renderer.isMultiMaterials(self) 
-  return self.isMultiMaterials
+function Renderer.IsMultiMaterials(self)
+  return self.mIsMultiMaterials
 end
 
 return Renderer
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/shader.lua b/Source/Asura.Framework/graphics/shader.lua
index b719d2b..e427b1b 100644
--- a/Source/Asura.Framework/graphics/shader.lua
+++ b/Source/Asura.Framework/graphics/shader.lua
@@ -39,3 +39,5 @@ end
 function Shader.SendMat44(self, name, mat44)
 
 end
+
+return Shader
\ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/sprite_batch_renderer.lua b/Source/Asura.Framework/graphics/sprite_batch_renderer.lua
index e69de29..9621bce 100644
--- a/Source/Asura.Framework/graphics/sprite_batch_renderer.lua
+++ b/Source/Asura.Framework/graphics/sprite_batch_renderer.lua
@@ -0,0 +1,9 @@
+AsuraEngine.SpriteBatchRenderer = AsuraEngine.Component.Sub("SpriteBatchRenderer")
+
+local SpriteBatchRenderer = AsuraEngine.SpriteBatchRenderer
+
+function SpriteBatchRenderer.Ctor(self)
+
+end
+
+return SpriteBatchRenderer
\ 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 93937d7..2d1fae5 100644
--- a/Source/Asura.Framework/graphics/sprite_renderer.lua
+++ b/Source/Asura.Framework/graphics/sprite_renderer.lua
@@ -4,7 +4,7 @@ local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer")
 AsuraEngine.SpriteRenderer = SpriteRenderer
 
 function SpriteRenderer.Ctor(self)
-  self.materials = {}
+  self.mMaterials = {}
 end
 
 function SpriteRenderer:OnRender()