summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-29 21:07:22 +0800
committerchai <chaifix@163.com>2019-01-29 21:07:22 +0800
commit8d6eb73fcd8d42ced53fc4178d4f4fc35c63abf3 (patch)
treedc4b7503629699b984ee22988e6e163e9c6a1063 /Source
parent6756fad2ec987b48f9e2afb967d9ba65f117f9b9 (diff)
*misc
Diffstat (limited to 'Source')
-rw-r--r--Source/3rdParty/OpenAL11CoreSDK/OpenAL11CoreSDK.exebin0 -> 12518133 bytes
-rw-r--r--Source/Asura.Editor/Scripts/compile.bat0
-rw-r--r--Source/Asura.Editor/Scripts/compile.sh0
-rw-r--r--Source/Asura.Framework/Audio/SoundPlayer.lua5
-rw-r--r--Source/Asura.Framework/Component.lua8
-rw-r--r--Source/Asura.Framework/GUI/Button.lua19
-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
-rw-r--r--Source/Asura.Framework/Scene.lua8
-rw-r--r--Source/Asura.Framework/audio/sound.lua9
-rw-r--r--Source/Asura.Framework/audio/soundplayer.lua5
-rw-r--r--Source/Asura.Framework/audio/source.lua22
-rw-r--r--Source/Asura.Framework/component.lua8
-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/canvas.lua30
-rw-r--r--Source/Asura.Framework/graphics/image.lua5
-rw-r--r--Source/Asura.Framework/graphics/material.lua10
-rw-r--r--Source/Asura.Framework/graphics/mesh2d.lua9
-rw-r--r--Source/Asura.Framework/graphics/mesh2d_renderer.lua12
-rw-r--r--Source/Asura.Framework/graphics/renderer.lua10
-rw-r--r--Source/Asura.Framework/graphics/shader.lua2
-rw-r--r--Source/Asura.Framework/graphics/sprite_batch_renderer.lua9
-rw-r--r--Source/Asura.Framework/graphics/sprite_renderer.lua2
-rw-r--r--Source/Asura.Framework/gui/button.lua19
-rw-r--r--Source/Asura.Framework/main.cpp0
-rw-r--r--Source/Asura.Framework/scene.lua8
34 files changed, 262 insertions, 77 deletions
diff --git a/Source/3rdParty/OpenAL11CoreSDK/OpenAL11CoreSDK.exe b/Source/3rdParty/OpenAL11CoreSDK/OpenAL11CoreSDK.exe
new file mode 100644
index 0000000..01b7fa8
--- /dev/null
+++ b/Source/3rdParty/OpenAL11CoreSDK/OpenAL11CoreSDK.exe
Binary files differ
diff --git a/Source/Asura.Editor/Scripts/compile.bat b/Source/Asura.Editor/Scripts/compile.bat
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Editor/Scripts/compile.bat
diff --git a/Source/Asura.Editor/Scripts/compile.sh b/Source/Asura.Editor/Scripts/compile.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Editor/Scripts/compile.sh
diff --git a/Source/Asura.Framework/Audio/SoundPlayer.lua b/Source/Asura.Framework/Audio/SoundPlayer.lua
deleted file mode 100644
index c3921af..0000000
--- a/Source/Asura.Framework/Audio/SoundPlayer.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local SoundPlayer = AsuraEngine.Component.Sub("SoundPlayer")
-
-
-
-return SoundPlayer \ No newline at end of file
diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua
index 2954743..a31b31c 100644
--- a/Source/Asura.Framework/Component.lua
+++ b/Source/Asura.Framework/Component.lua
@@ -2,16 +2,16 @@ AsuraEngine.Component = AsuraEngine.Class("Component")
local Component = AsuraEngine.Component
---Component.entity = AsuraEngine.Type.GameObject
+-- Component要显示在inspector的变量
+Component.mEntity = AsuraEngine.Type.GameObject
---派生新的组件
function Component.Sub(cname)
assert(Component.components[cname] == nil)
end
function Component:Ctor(go)
- self.entity = go
+ self.mEntity = go
end
function Component:OnEvent(e)
@@ -25,3 +25,5 @@ end
function Component:OnDraw()
end
+
+return Component \ No newline at end of file
diff --git a/Source/Asura.Framework/GUI/Button.lua b/Source/Asura.Framework/GUI/Button.lua
index 260759b..67d0943 100644
--- a/Source/Asura.Framework/GUI/Button.lua
+++ b/Source/Asura.Framework/GUI/Button.lua
@@ -1,6 +1,21 @@
---
-local Button = AsuraEngine.Component.Sub("Button")
+AsuraEngine.Button = AsuraEngine.Component.Sub("Button")
+local Button = AsuraEngine.Button
+function Button.Ctor(self)
+
+end
+
+function Button.OnEvent(e)
+
+end
+
+function Button.OnRender()
+
+end
+
+function Button.OnUpdate(dt)
+
+end
return Button \ No newline at end of file
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()
diff --git a/Source/Asura.Framework/Scene.lua b/Source/Asura.Framework/Scene.lua
index 0ef41c7..48a766c 100644
--- a/Source/Asura.Framework/Scene.lua
+++ b/Source/Asura.Framework/Scene.lua
@@ -1,5 +1,9 @@
-local Scene = Class()
-AsuraEngine.Scene = Scene
+--
+-- 原点在左下角
+--
+AsuraEngine.Scene = AsuraEngine.Asset.Sub("Scene")
+
+local Scene = AsuraEngine.Scene
function Scene.Ctor(self)
self.entities = {} --当前场景的所有entity
diff --git a/Source/Asura.Framework/audio/sound.lua b/Source/Asura.Framework/audio/sound.lua
new file mode 100644
index 0000000..71def66
--- /dev/null
+++ b/Source/Asura.Framework/audio/sound.lua
@@ -0,0 +1,9 @@
+AsuraEngine.Sound = AsuraEngine.Asset.Sub("Sound")
+
+local Sound = AsuraEngine.Sound
+
+function Sound.Ctor(self)
+
+end
+
+return Sound \ No newline at end of file
diff --git a/Source/Asura.Framework/audio/soundplayer.lua b/Source/Asura.Framework/audio/soundplayer.lua
deleted file mode 100644
index c3921af..0000000
--- a/Source/Asura.Framework/audio/soundplayer.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local SoundPlayer = AsuraEngine.Component.Sub("SoundPlayer")
-
-
-
-return SoundPlayer \ No newline at end of file
diff --git a/Source/Asura.Framework/audio/source.lua b/Source/Asura.Framework/audio/source.lua
new file mode 100644
index 0000000..ccbc946
--- /dev/null
+++ b/Source/Asura.Framework/audio/source.lua
@@ -0,0 +1,22 @@
+-- Audio Source
+AsuraEngine.Source = AsuraEngine.Component.Sub("SoundPlayer")
+
+local Source = AsuraEngine.Source
+
+function Source.Ctor(self)
+ self.mSound = nil
+end
+
+function Source.SetSound(sound)
+ self.mSound = sound
+end
+
+function Source.GetSource()
+ return self.mSound
+end
+
+function Source.OnUpdate(dt)
+
+end
+
+return Source \ No newline at end of file
diff --git a/Source/Asura.Framework/component.lua b/Source/Asura.Framework/component.lua
index 2954743..a31b31c 100644
--- a/Source/Asura.Framework/component.lua
+++ b/Source/Asura.Framework/component.lua
@@ -2,16 +2,16 @@ AsuraEngine.Component = AsuraEngine.Class("Component")
local Component = AsuraEngine.Component
---Component.entity = AsuraEngine.Type.GameObject
+-- Component要显示在inspector的变量
+Component.mEntity = AsuraEngine.Type.GameObject
---派生新的组件
function Component.Sub(cname)
assert(Component.components[cname] == nil)
end
function Component:Ctor(go)
- self.entity = go
+ self.mEntity = go
end
function Component:OnEvent(e)
@@ -25,3 +25,5 @@ end
function Component:OnDraw()
end
+
+return Component \ No newline at end of file
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()
diff --git a/Source/Asura.Framework/gui/button.lua b/Source/Asura.Framework/gui/button.lua
index 260759b..67d0943 100644
--- a/Source/Asura.Framework/gui/button.lua
+++ b/Source/Asura.Framework/gui/button.lua
@@ -1,6 +1,21 @@
---
-local Button = AsuraEngine.Component.Sub("Button")
+AsuraEngine.Button = AsuraEngine.Component.Sub("Button")
+local Button = AsuraEngine.Button
+function Button.Ctor(self)
+
+end
+
+function Button.OnEvent(e)
+
+end
+
+function Button.OnRender()
+
+end
+
+function Button.OnUpdate(dt)
+
+end
return Button \ No newline at end of file
diff --git a/Source/Asura.Framework/main.cpp b/Source/Asura.Framework/main.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Framework/main.cpp
diff --git a/Source/Asura.Framework/scene.lua b/Source/Asura.Framework/scene.lua
index 0ef41c7..48a766c 100644
--- a/Source/Asura.Framework/scene.lua
+++ b/Source/Asura.Framework/scene.lua
@@ -1,5 +1,9 @@
-local Scene = Class()
-AsuraEngine.Scene = Scene
+--
+-- 原点在左下角
+--
+AsuraEngine.Scene = AsuraEngine.Asset.Sub("Scene")
+
+local Scene = AsuraEngine.Scene
function Scene.Ctor(self)
self.entities = {} --当前场景的所有entity