summaryrefslogtreecommitdiff
path: root/Source/Asura.Framework/Graphics
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Asura.Framework/Graphics')
-rw-r--r--Source/Asura.Framework/Graphics/Animation.lua16
-rw-r--r--Source/Asura.Framework/Graphics/Animator.lua12
-rw-r--r--Source/Asura.Framework/Graphics/Camera.lua20
-rw-r--r--Source/Asura.Framework/Graphics/Material.lua10
-rw-r--r--Source/Asura.Framework/Graphics/Renderer.lua10
-rw-r--r--Source/Asura.Framework/Graphics/mesh2d_renderer.lua12
-rw-r--r--Source/Asura.Framework/Graphics/sprite_batch_renderer.lua9
-rw-r--r--Source/Asura.Framework/Graphics/sprite_renderer.lua2
8 files changed, 70 insertions, 21 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/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/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/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/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()