summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Asura.Framework/Class.lua19
-rw-r--r--Source/Asura.Framework/Component.lua29
-rw-r--r--Source/Asura.Framework/Filesystem/Loader.lua12
-rw-r--r--Source/Asura.Framework/Framework.lua2
-rw-r--r--Source/Asura.Framework/GUI/Button.lua21
-rw-r--r--Source/Asura.Framework/Graphics/Animation.lua15
-rw-r--r--Source/Asura.Framework/Graphics/Animator.lua31
-rw-r--r--Source/Asura.Framework/Graphics/Camera.lua21
-rw-r--r--Source/Asura.Framework/Graphics/Material.lua47
-rw-r--r--Source/Asura.Framework/Graphics/Renderer.lua19
-rw-r--r--Source/Asura.Framework/Math/Curve.lua0
-rw-r--r--Source/Asura.Framework/Path/Path.lua13
-rw-r--r--Source/Asura.Framework/Scene.lua21
-rw-r--r--Source/Asura.Framework/Transform.lua9
-rw-r--r--Source/Asura.Framework/filesystem/animation_loader.lua10
-rw-r--r--Source/Asura.Framework/filesystem/material_loader.lua7
-rw-r--r--Source/Asura.Framework/filesystem/path_loader.lua9
-rw-r--r--Source/Asura.Framework/filesystem/scene_loader.lua7
-rw-r--r--Source/Asura.Framework/graphics/default_shaders.lua5
-rw-r--r--Source/Asura.Framework/graphics/material_manager.lua3
-rw-r--r--Source/Asura.Framework/graphics/mesh2d_renderer.lua13
-rw-r--r--Source/Asura.Framework/graphics/particle_system.lua20
-rw-r--r--Source/Asura.Framework/graphics/shape_renderer.lua13
-rw-r--r--Source/Asura.Framework/graphics/sprite_batch_renderer.lua9
-rw-r--r--Source/Asura.Framework/graphics/sprite_renderer.lua14
-rw-r--r--Source/Asura.Framework/main.cpp (renamed from Source/Asura.Framework/GUI/Text.lua)0
-rw-r--r--Source/Asura.Framework/path/path_calculator.lua12
-rw-r--r--Source/Asura.Framework/path/path_manager.lua0
-rw-r--r--Source/Asura.Framework/scripts/ai/behavior_tree.lua (renamed from Source/Asura.Framework/ai/behavior_tree.lua)0
-rw-r--r--Source/Asura.Framework/scripts/ai/state_machine.lua (renamed from Source/Asura.Framework/ai/state_machine.lua)0
-rw-r--r--Source/Asura.Framework/scripts/ai/state_map.lua (renamed from Source/Asura.Framework/ai/state_map.lua)0
-rw-r--r--Source/Asura.Framework/scripts/audio/sound.lua (renamed from Source/Asura.Framework/audio/sound.lua)0
-rw-r--r--Source/Asura.Framework/scripts/audio/source.lua (renamed from Source/Asura.Framework/audio/source.lua)0
-rw-r--r--Source/Asura.Framework/scripts/class.lua (renamed from Source/Asura.Framework/class.lua)2
-rw-r--r--Source/Asura.Framework/scripts/component.lua (renamed from Source/Asura.Framework/component.lua)1
-rw-r--r--Source/Asura.Framework/scripts/filesystem/animation_loader.lua (renamed from Source/Asura.Framework/Filesystem/animation_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/asset.lua (renamed from Source/Asura.Framework/filesystem/asset.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/entity_loader.lua (renamed from Source/Asura.Framework/filesystem/entity_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/image_loader.lua (renamed from Source/Asura.Framework/filesystem/image_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/loader.lua (renamed from Source/Asura.Framework/filesystem/loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/material_loader.lua (renamed from Source/Asura.Framework/Filesystem/material_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/path_loader.lua (renamed from Source/Asura.Framework/Filesystem/path_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/scene_loader.lua (renamed from Source/Asura.Framework/Filesystem/scene_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/script_loader.lua (renamed from Source/Asura.Framework/filesystem/script_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/shader_loader.lua (renamed from Source/Asura.Framework/filesystem/shader_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/filesystem/statemap_loader.lua (renamed from Source/Asura.Framework/filesystem/statemap_loader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/framework.lua (renamed from Source/Asura.Framework/framework.lua)0
-rw-r--r--Source/Asura.Framework/scripts/gameobject.lua (renamed from Source/Asura.Framework/gameobject.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/animation.lua (renamed from Source/Asura.Framework/graphics/animation.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/animator.lua (renamed from Source/Asura.Framework/graphics/animator.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/camera.lua (renamed from Source/Asura.Framework/graphics/camera.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/canvas.lua (renamed from Source/Asura.Framework/graphics/canvas.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/default_shaders.lua (renamed from Source/Asura.Framework/Graphics/default_shaders.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/image.lua (renamed from Source/Asura.Framework/graphics/image.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/material.lua (renamed from Source/Asura.Framework/graphics/material.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/material_manager.lua (renamed from Source/Asura.Framework/Graphics/material_manager.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/mesh2d.lua (renamed from Source/Asura.Framework/graphics/mesh2d.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua (renamed from Source/Asura.Framework/Graphics/mesh2d_renderer.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/particle_system.lua (renamed from Source/Asura.Framework/Graphics/particle_system.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/renderer.lua (renamed from Source/Asura.Framework/graphics/renderer.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/shader.lua (renamed from Source/Asura.Framework/graphics/shader.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/shape.lua (renamed from Source/Asura.Framework/graphics/shape.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/shape_renderer.lua (renamed from Source/Asura.Framework/Graphics/shape_renderer.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/sprite.lua (renamed from Source/Asura.Framework/graphics/sprite.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua (renamed from Source/Asura.Framework/Graphics/sprite_batch_renderer.lua)0
-rw-r--r--Source/Asura.Framework/scripts/graphics/sprite_renderer.lua (renamed from Source/Asura.Framework/Graphics/sprite_renderer.lua)0
-rw-r--r--Source/Asura.Framework/scripts/gui/button.lua (renamed from Source/Asura.Framework/gui/button.lua)0
-rw-r--r--Source/Asura.Framework/scripts/gui/text.lua (renamed from Source/Asura.Framework/gui/text.lua)0
-rw-r--r--Source/Asura.Framework/scripts/managers/scene_manager.lua (renamed from Source/Asura.Framework/managers/scene_manager.lua)0
-rw-r--r--Source/Asura.Framework/scripts/managers/sprite_manager.lua (renamed from Source/Asura.Framework/managers/sprite_manager.lua)0
-rw-r--r--Source/Asura.Framework/scripts/math/curve.lua (renamed from Source/Asura.Framework/math/curve.lua)0
-rw-r--r--Source/Asura.Framework/scripts/path/path.lua (renamed from Source/Asura.Framework/path/path.lua)0
-rw-r--r--Source/Asura.Framework/scripts/path/path_calculator.lua (renamed from Source/Asura.Framework/Path/path_calculator.lua)0
-rw-r--r--Source/Asura.Framework/scripts/path/path_manager.lua (renamed from Source/Asura.Framework/Path/path_manager.lua)0
-rw-r--r--Source/Asura.Framework/scripts/scene.lua (renamed from Source/Asura.Framework/scene.lua)0
-rw-r--r--Source/Asura.Framework/scripts/transform.lua (renamed from Source/Asura.Framework/transform.lua)0
76 files changed, 2 insertions, 382 deletions
diff --git a/Source/Asura.Framework/Class.lua b/Source/Asura.Framework/Class.lua
deleted file mode 100644
index 94dc491..0000000
--- a/Source/Asura.Framework/Class.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-AsuraEngine.Class = {}
-
-local Class = AsuraEngine.Class
-Class.__index = Class
-
-function Class.Sub(base, classname)
- local subclass = {}
- base.__index = base
- setmetatable(subclass, base)
- return c
-end
-
---实例化
-function Class.New(cls)
- local obj = {}
- setmetatable(obj, cls)
- cls.__index = cls
-end
-
diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua
deleted file mode 100644
index 289dc8e..0000000
--- a/Source/Asura.Framework/Component.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-AsuraEngine.Component = AsuraEngine.Class("Component")
-
-local Component = AsuraEngine.Component
-
--- Component要显示在inspector的变量
-Component.gameobject = AsuraEngine.Type.GameObject
-
-function Component.Sub(cname)
- assert(Component.components[cname] == nil)
-
-end
-
-function Component:Ctor(gameobject)
- self.gameobject = gameobject
-end
-
-function Component:OnEvent(e)
-
-end
-
-function Component:OnUpdate(ms)
-
-end
-
-function Component:OnDraw()
-
-end
-
-return Component \ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/Loader.lua b/Source/Asura.Framework/Filesystem/Loader.lua
deleted file mode 100644
index c7b8b8a..0000000
--- a/Source/Asura.Framework/Filesystem/Loader.lua
+++ /dev/null
@@ -1,12 +0,0 @@
--- Assets loaders
-AsuraEngine.Loader = {}
-local Loader = AsuraEngine.Loader
-Loader.Loaders = {}
-
-function Loader.New(type)
- assert(Loader.Loaders[type] == nil)
- local loader = {}
- Loader[type] = loader
- return loader
-end
-
diff --git a/Source/Asura.Framework/Framework.lua b/Source/Asura.Framework/Framework.lua
deleted file mode 100644
index 14e7b24..0000000
--- a/Source/Asura.Framework/Framework.lua
+++ /dev/null
@@ -1,2 +0,0 @@
---框架入口文件
-require ""
diff --git a/Source/Asura.Framework/GUI/Button.lua b/Source/Asura.Framework/GUI/Button.lua
deleted file mode 100644
index 67d0943..0000000
--- a/Source/Asura.Framework/GUI/Button.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index b6673c6..0000000
--- a/Source/Asura.Framework/Graphics/Animation.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 02f67ff..0000000
--- a/Source/Asura.Framework/Graphics/Animator.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-AsuraEngine.Animator = AsuraEngine.Component.Sub("Animator")
-
-local Animator = AsuraEngine.Animator
-
--- Animator inspector variables.
-Animator.spriteRenderer = AsuraEngine.Type.SpriteRenderer
-Animator.animation = AsuraEngine.Type.Animation
-
-function Animator:Ctor(gameobject, animation)
- self.base(gameobject)
- self.spriteRenderer = gameobject:GetSpriteRenderer()
- self.animation = animation
-end
-
-function Animator:SetAnimation(animation)
- self.animation = animation
-end
-
-function Animator:GetAnimation()
- return self.animation
-end
-
-function Animator:OnUpdate(dt)
-
-end
-
-function Animator:OnRender()
-
-end
-
-return Animator \ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Camera.lua b/Source/Asura.Framework/Graphics/Camera.lua
deleted file mode 100644
index c8176f8..0000000
--- a/Source/Asura.Framework/Graphics/Camera.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-AsuraEngine.Camera = AsuraEngine.Component.Sub("Camera")
-
-local Camera = AsuraEngine.Camera
-
-Camera.isCulling = AsuraEngine.Type.Bool
-Camera.isOnScreen = AsuraEngine.Type.Bool
-
-function Camera.Ctor(self)
- self.isCulling = false
- self.isOnScreen = 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
deleted file mode 100644
index 7028f98..0000000
--- a/Source/Asura.Framework/Graphics/Material.lua
+++ /dev/null
@@ -1,47 +0,0 @@
---material是shader的代理
-AsuraEngine.Material = AsuraEngine.Asset.Sub("Material")
-
-local Material = AsuraEngine.Material
-
-function Material.Ctor(self)
- self.mUniforms = {} --uniform变量和值
- self.mIsShared = false
-end
-
-function Material.Clone(self)
-
-end
-
-function Material:ToAsset()
-
-end
-
-function Material:GetUniform(name)
-
-end
-
-function Material:SetFloat(uniform, value)
-
-end
-
-function Material:SetTexture(uniform, tex)
-
-end
-
-function Material:SetInteger(unifrom, value)
-
-end
-
-function Material:SetVec2(uniform, value)
-
-end
-
-function Material:SetMat44(uniform, value)
-
-end
-
-function Material:GetUniformID()
-
-end
-
-return Material \ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Renderer.lua b/Source/Asura.Framework/Graphics/Renderer.lua
deleted file mode 100644
index 46fd548..0000000
--- a/Source/Asura.Framework/Graphics/Renderer.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local Renderer = AsuraEngine.Component.Sub("Renderer")
-AsuraEngine.Renderer = Renderer
-
-function Renderer.Ctor(self)
- self.mMaterials = {}
- self.mMaterial = nil
- self.mIsMultiMaterials = false
-end
-
---取材质,如果是shared,那么从此材质clone一个
-function Renderer.GetMaterial(self)
-
-end
-
-function Renderer.IsMultiMaterials(self)
- return self.mIsMultiMaterials
-end
-
-return Renderer \ No newline at end of file
diff --git a/Source/Asura.Framework/Math/Curve.lua b/Source/Asura.Framework/Math/Curve.lua
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Framework/Math/Curve.lua
+++ /dev/null
diff --git a/Source/Asura.Framework/Path/Path.lua b/Source/Asura.Framework/Path/Path.lua
deleted file mode 100644
index 3b6079d..0000000
--- a/Source/Asura.Framework/Path/Path.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local Path = AsuraEngine.Asset.New("path")
-
-function Path:Ctor()
-
-end
-
--- ToAssetѶpathתΪ.assetļʽ
-function Path.ToAsset(path)
- local builder = AsuraEngine.AssetBuilder.Get()
-
-end
-
-return Path \ No newline at end of file
diff --git a/Source/Asura.Framework/Scene.lua b/Source/Asura.Framework/Scene.lua
deleted file mode 100644
index c0eaaa8..0000000
--- a/Source/Asura.Framework/Scene.lua
+++ /dev/null
@@ -1,21 +0,0 @@
---
--- Scene是一系列gameobject的集合。
---
-AsuraEngine.Scene = AsuraEngine.Asset.Sub("Scene")
-
-local Scene = AsuraEngine.Scene
-
-function Scene.Ctor(self)
- self.rootGameObjects = {} --当前场景的所有root gameobject
-end
-
---获取当前的场景
-function Scene.GetCurrent()
-
-end
-
-function Scene.ToAsset()
-
-end
-
-return Scene \ No newline at end of file
diff --git a/Source/Asura.Framework/Transform.lua b/Source/Asura.Framework/Transform.lua
deleted file mode 100644
index a415921..0000000
--- a/Source/Asura.Framework/Transform.lua
+++ /dev/null
@@ -1,9 +0,0 @@
--- transform的起点在左下角,逆时针为正向
-AsuraEngine.Transform = AsuraEngine.Class("Transform")
-local Transform = AsuraEngine.Transform
-
-function Transform.Ctor(self)
- self.position = {x=0, y=0}
- self.rotation = 0
- self.size = {w=0, h=0}
-end
diff --git a/Source/Asura.Framework/filesystem/animation_loader.lua b/Source/Asura.Framework/filesystem/animation_loader.lua
deleted file mode 100644
index c6808c0..0000000
--- a/Source/Asura.Framework/filesystem/animation_loader.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-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 \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/material_loader.lua b/Source/Asura.Framework/filesystem/material_loader.lua
deleted file mode 100644
index 2c2058e..0000000
--- a/Source/Asura.Framework/filesystem/material_loader.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require "MaterialManager"
-
-local loader = AsuraEngine.Loader.New("material")
-
-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
deleted file mode 100644
index 8618c03..0000000
--- a/Source/Asura.Framework/filesystem/path_loader.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-require "Path/PathManager"
-
-local loader = AsuraEngine.Loader.New("path")
-
-function loader.Load(asset)
- if asset.type ~= "path" then
- return nil
- end
-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
deleted file mode 100644
index c0a951f..0000000
--- a/Source/Asura.Framework/filesystem/scene_loader.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local Scene = require "scene"
-
-local loader = AsuraEngine.Loader.New("scene")
-
-function loader.Load(asset)
-
-end \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/default_shaders.lua b/Source/Asura.Framework/graphics/default_shaders.lua
deleted file mode 100644
index bd54cb9..0000000
--- a/Source/Asura.Framework/graphics/default_shaders.lua
+++ /dev/null
@@ -1,5 +0,0 @@
---[[
-õshaders.
-]]
-
-
diff --git a/Source/Asura.Framework/graphics/material_manager.lua b/Source/Asura.Framework/graphics/material_manager.lua
deleted file mode 100644
index 086a5db..0000000
--- a/Source/Asura.Framework/graphics/material_manager.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-local MaterialManager = AsuraEngine.Manager.New()
-
-return MaterialManager \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/mesh2d_renderer.lua b/Source/Asura.Framework/graphics/mesh2d_renderer.lua
deleted file mode 100644
index 67577bc..0000000
--- a/Source/Asura.Framework/graphics/mesh2d_renderer.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-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/particle_system.lua b/Source/Asura.Framework/graphics/particle_system.lua
deleted file mode 100644
index 055d1b2..0000000
--- a/Source/Asura.Framework/graphics/particle_system.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-require "graphics.sprite_renderer"
-
-AsuraEngine.ParticleSystem = AsuraEngine.Component.Sub("ParticleSystem")
-
-local ParticleSystem = AsuraEngine.ParticleSystem
-
-function ParticleSystem.Ctor(self, gameobject, def)
- self.base(gameobject)
- self.spriteRenderer = AsuraEngine.SpriteRenderer.New()
-end
-
-function ParticleSystem.OnRenderer()
-
-end
-
-function ParticleSystem.OnUpdate(dt)
-
-end
-
-return ParticleSystem \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/shape_renderer.lua b/Source/Asura.Framework/graphics/shape_renderer.lua
deleted file mode 100644
index 8c002a2..0000000
--- a/Source/Asura.Framework/graphics/shape_renderer.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-AsuraEngine.ShapeRenderer = AsuraEngine.Component.Sub("ShapeRenderer")
-
-local ShapeRenderer = AsuraEngine.ShapeRenderer
-
-function ShapeRenderer.OnRenderer()
-
-end
-
-function ShapeRenderer.OnUpdate(dt)
-
-end
-
-return ShapeRenderer \ 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
deleted file mode 100644
index 9621bce..0000000
--- a/Source/Asura.Framework/graphics/sprite_batch_renderer.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 2d1fae5..0000000
--- a/Source/Asura.Framework/graphics/sprite_renderer.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-require "graphics.renderer"
-
-local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer")
-AsuraEngine.SpriteRenderer = SpriteRenderer
-
-function SpriteRenderer.Ctor(self)
- self.mMaterials = {}
-end
-
-function SpriteRenderer:OnRender()
-
-end
-
-return SpriteRenderer \ No newline at end of file
diff --git a/Source/Asura.Framework/GUI/Text.lua b/Source/Asura.Framework/main.cpp
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/GUI/Text.lua
+++ b/Source/Asura.Framework/main.cpp
diff --git a/Source/Asura.Framework/path/path_calculator.lua b/Source/Asura.Framework/path/path_calculator.lua
deleted file mode 100644
index 1a564b8..0000000
--- a/Source/Asura.Framework/path/path_calculator.lua
+++ /dev/null
@@ -1,12 +0,0 @@
---[[
-ڱ༭componentsб
-]]
-local PathCalculator = AsuraEngine.Component.New("PathCalculator")
-
-PathCalculator.path = AsuraEngine.Asset.Type("path", "·")
-
-function PathCalculator:ctor(path)
- self.path = path
-end
-
-return PathCalculator \ No newline at end of file
diff --git a/Source/Asura.Framework/path/path_manager.lua b/Source/Asura.Framework/path/path_manager.lua
deleted file mode 100644
index e69de29..0000000
--- a/Source/Asura.Framework/path/path_manager.lua
+++ /dev/null
diff --git a/Source/Asura.Framework/ai/behavior_tree.lua b/Source/Asura.Framework/scripts/ai/behavior_tree.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/ai/behavior_tree.lua
+++ b/Source/Asura.Framework/scripts/ai/behavior_tree.lua
diff --git a/Source/Asura.Framework/ai/state_machine.lua b/Source/Asura.Framework/scripts/ai/state_machine.lua
index b1ff849..b1ff849 100644
--- a/Source/Asura.Framework/ai/state_machine.lua
+++ b/Source/Asura.Framework/scripts/ai/state_machine.lua
diff --git a/Source/Asura.Framework/ai/state_map.lua b/Source/Asura.Framework/scripts/ai/state_map.lua
index 7e986de..7e986de 100644
--- a/Source/Asura.Framework/ai/state_map.lua
+++ b/Source/Asura.Framework/scripts/ai/state_map.lua
diff --git a/Source/Asura.Framework/audio/sound.lua b/Source/Asura.Framework/scripts/audio/sound.lua
index 71def66..71def66 100644
--- a/Source/Asura.Framework/audio/sound.lua
+++ b/Source/Asura.Framework/scripts/audio/sound.lua
diff --git a/Source/Asura.Framework/audio/source.lua b/Source/Asura.Framework/scripts/audio/source.lua
index ccbc946..ccbc946 100644
--- a/Source/Asura.Framework/audio/source.lua
+++ b/Source/Asura.Framework/scripts/audio/source.lua
diff --git a/Source/Asura.Framework/class.lua b/Source/Asura.Framework/scripts/class.lua
index 94dc491..1d60d3c 100644
--- a/Source/Asura.Framework/class.lua
+++ b/Source/Asura.Framework/scripts/class.lua
@@ -10,10 +10,10 @@ function Class.Sub(base, classname)
return c
end
---实例化
function Class.New(cls)
local obj = {}
setmetatable(obj, cls)
cls.__index = cls
end
+
diff --git a/Source/Asura.Framework/component.lua b/Source/Asura.Framework/scripts/component.lua
index 289dc8e..ad29efa 100644
--- a/Source/Asura.Framework/component.lua
+++ b/Source/Asura.Framework/scripts/component.lua
@@ -6,6 +6,7 @@ local Component = AsuraEngine.Component
Component.gameobject = AsuraEngine.Type.GameObject
function Component.Sub(cname)
+ self.base(cname)
assert(Component.components[cname] == nil)
end
diff --git a/Source/Asura.Framework/Filesystem/animation_loader.lua b/Source/Asura.Framework/scripts/filesystem/animation_loader.lua
index c6808c0..c6808c0 100644
--- a/Source/Asura.Framework/Filesystem/animation_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/animation_loader.lua
diff --git a/Source/Asura.Framework/filesystem/asset.lua b/Source/Asura.Framework/scripts/filesystem/asset.lua
index afe4ea6..afe4ea6 100644
--- a/Source/Asura.Framework/filesystem/asset.lua
+++ b/Source/Asura.Framework/scripts/filesystem/asset.lua
diff --git a/Source/Asura.Framework/filesystem/entity_loader.lua b/Source/Asura.Framework/scripts/filesystem/entity_loader.lua
index 771f86a..771f86a 100644
--- a/Source/Asura.Framework/filesystem/entity_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/entity_loader.lua
diff --git a/Source/Asura.Framework/filesystem/image_loader.lua b/Source/Asura.Framework/scripts/filesystem/image_loader.lua
index 174d837..174d837 100644
--- a/Source/Asura.Framework/filesystem/image_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/image_loader.lua
diff --git a/Source/Asura.Framework/filesystem/loader.lua b/Source/Asura.Framework/scripts/filesystem/loader.lua
index c7b8b8a..c7b8b8a 100644
--- a/Source/Asura.Framework/filesystem/loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/loader.lua
diff --git a/Source/Asura.Framework/Filesystem/material_loader.lua b/Source/Asura.Framework/scripts/filesystem/material_loader.lua
index 2c2058e..2c2058e 100644
--- a/Source/Asura.Framework/Filesystem/material_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/material_loader.lua
diff --git a/Source/Asura.Framework/Filesystem/path_loader.lua b/Source/Asura.Framework/scripts/filesystem/path_loader.lua
index 8618c03..8618c03 100644
--- a/Source/Asura.Framework/Filesystem/path_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/path_loader.lua
diff --git a/Source/Asura.Framework/Filesystem/scene_loader.lua b/Source/Asura.Framework/scripts/filesystem/scene_loader.lua
index c0a951f..c0a951f 100644
--- a/Source/Asura.Framework/Filesystem/scene_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/scene_loader.lua
diff --git a/Source/Asura.Framework/filesystem/script_loader.lua b/Source/Asura.Framework/scripts/filesystem/script_loader.lua
index a85dea6..a85dea6 100644
--- a/Source/Asura.Framework/filesystem/script_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/script_loader.lua
diff --git a/Source/Asura.Framework/filesystem/shader_loader.lua b/Source/Asura.Framework/scripts/filesystem/shader_loader.lua
index d488eb9..d488eb9 100644
--- a/Source/Asura.Framework/filesystem/shader_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/shader_loader.lua
diff --git a/Source/Asura.Framework/filesystem/statemap_loader.lua b/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua
index ededcfc..ededcfc 100644
--- a/Source/Asura.Framework/filesystem/statemap_loader.lua
+++ b/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua
diff --git a/Source/Asura.Framework/framework.lua b/Source/Asura.Framework/scripts/framework.lua
index 14e7b24..14e7b24 100644
--- a/Source/Asura.Framework/framework.lua
+++ b/Source/Asura.Framework/scripts/framework.lua
diff --git a/Source/Asura.Framework/gameobject.lua b/Source/Asura.Framework/scripts/gameobject.lua
index cd984ee..cd984ee 100644
--- a/Source/Asura.Framework/gameobject.lua
+++ b/Source/Asura.Framework/scripts/gameobject.lua
diff --git a/Source/Asura.Framework/graphics/animation.lua b/Source/Asura.Framework/scripts/graphics/animation.lua
index b6673c6..b6673c6 100644
--- a/Source/Asura.Framework/graphics/animation.lua
+++ b/Source/Asura.Framework/scripts/graphics/animation.lua
diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/scripts/graphics/animator.lua
index 02f67ff..02f67ff 100644
--- a/Source/Asura.Framework/graphics/animator.lua
+++ b/Source/Asura.Framework/scripts/graphics/animator.lua
diff --git a/Source/Asura.Framework/graphics/camera.lua b/Source/Asura.Framework/scripts/graphics/camera.lua
index c8176f8..c8176f8 100644
--- a/Source/Asura.Framework/graphics/camera.lua
+++ b/Source/Asura.Framework/scripts/graphics/camera.lua
diff --git a/Source/Asura.Framework/graphics/canvas.lua b/Source/Asura.Framework/scripts/graphics/canvas.lua
index 248c3ab..248c3ab 100644
--- a/Source/Asura.Framework/graphics/canvas.lua
+++ b/Source/Asura.Framework/scripts/graphics/canvas.lua
diff --git a/Source/Asura.Framework/Graphics/default_shaders.lua b/Source/Asura.Framework/scripts/graphics/default_shaders.lua
index bd54cb9..bd54cb9 100644
--- a/Source/Asura.Framework/Graphics/default_shaders.lua
+++ b/Source/Asura.Framework/scripts/graphics/default_shaders.lua
diff --git a/Source/Asura.Framework/graphics/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua
index ae91466..ae91466 100644
--- a/Source/Asura.Framework/graphics/image.lua
+++ b/Source/Asura.Framework/scripts/graphics/image.lua
diff --git a/Source/Asura.Framework/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua
index 7028f98..7028f98 100644
--- a/Source/Asura.Framework/graphics/material.lua
+++ b/Source/Asura.Framework/scripts/graphics/material.lua
diff --git a/Source/Asura.Framework/Graphics/material_manager.lua b/Source/Asura.Framework/scripts/graphics/material_manager.lua
index 086a5db..086a5db 100644
--- a/Source/Asura.Framework/Graphics/material_manager.lua
+++ b/Source/Asura.Framework/scripts/graphics/material_manager.lua
diff --git a/Source/Asura.Framework/graphics/mesh2d.lua b/Source/Asura.Framework/scripts/graphics/mesh2d.lua
index 13b270a..13b270a 100644
--- a/Source/Asura.Framework/graphics/mesh2d.lua
+++ b/Source/Asura.Framework/scripts/graphics/mesh2d.lua
diff --git a/Source/Asura.Framework/Graphics/mesh2d_renderer.lua b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua
index 67577bc..67577bc 100644
--- a/Source/Asura.Framework/Graphics/mesh2d_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua
diff --git a/Source/Asura.Framework/Graphics/particle_system.lua b/Source/Asura.Framework/scripts/graphics/particle_system.lua
index 055d1b2..055d1b2 100644
--- a/Source/Asura.Framework/Graphics/particle_system.lua
+++ b/Source/Asura.Framework/scripts/graphics/particle_system.lua
diff --git a/Source/Asura.Framework/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua
index 46fd548..46fd548 100644
--- a/Source/Asura.Framework/graphics/renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/renderer.lua
diff --git a/Source/Asura.Framework/graphics/shader.lua b/Source/Asura.Framework/scripts/graphics/shader.lua
index e427b1b..e427b1b 100644
--- a/Source/Asura.Framework/graphics/shader.lua
+++ b/Source/Asura.Framework/scripts/graphics/shader.lua
diff --git a/Source/Asura.Framework/graphics/shape.lua b/Source/Asura.Framework/scripts/graphics/shape.lua
index 6d737f0..6d737f0 100644
--- a/Source/Asura.Framework/graphics/shape.lua
+++ b/Source/Asura.Framework/scripts/graphics/shape.lua
diff --git a/Source/Asura.Framework/Graphics/shape_renderer.lua b/Source/Asura.Framework/scripts/graphics/shape_renderer.lua
index 8c002a2..8c002a2 100644
--- a/Source/Asura.Framework/Graphics/shape_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/shape_renderer.lua
diff --git a/Source/Asura.Framework/graphics/sprite.lua b/Source/Asura.Framework/scripts/graphics/sprite.lua
index 745138e..745138e 100644
--- a/Source/Asura.Framework/graphics/sprite.lua
+++ b/Source/Asura.Framework/scripts/graphics/sprite.lua
diff --git a/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua
index 9621bce..9621bce 100644
--- a/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua
diff --git a/Source/Asura.Framework/Graphics/sprite_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua
index 2d1fae5..2d1fae5 100644
--- a/Source/Asura.Framework/Graphics/sprite_renderer.lua
+++ b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua
diff --git a/Source/Asura.Framework/gui/button.lua b/Source/Asura.Framework/scripts/gui/button.lua
index 67d0943..67d0943 100644
--- a/Source/Asura.Framework/gui/button.lua
+++ b/Source/Asura.Framework/scripts/gui/button.lua
diff --git a/Source/Asura.Framework/gui/text.lua b/Source/Asura.Framework/scripts/gui/text.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/gui/text.lua
+++ b/Source/Asura.Framework/scripts/gui/text.lua
diff --git a/Source/Asura.Framework/managers/scene_manager.lua b/Source/Asura.Framework/scripts/managers/scene_manager.lua
index fc5a6ba..fc5a6ba 100644
--- a/Source/Asura.Framework/managers/scene_manager.lua
+++ b/Source/Asura.Framework/scripts/managers/scene_manager.lua
diff --git a/Source/Asura.Framework/managers/sprite_manager.lua b/Source/Asura.Framework/scripts/managers/sprite_manager.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/managers/sprite_manager.lua
+++ b/Source/Asura.Framework/scripts/managers/sprite_manager.lua
diff --git a/Source/Asura.Framework/math/curve.lua b/Source/Asura.Framework/scripts/math/curve.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/math/curve.lua
+++ b/Source/Asura.Framework/scripts/math/curve.lua
diff --git a/Source/Asura.Framework/path/path.lua b/Source/Asura.Framework/scripts/path/path.lua
index 3b6079d..3b6079d 100644
--- a/Source/Asura.Framework/path/path.lua
+++ b/Source/Asura.Framework/scripts/path/path.lua
diff --git a/Source/Asura.Framework/Path/path_calculator.lua b/Source/Asura.Framework/scripts/path/path_calculator.lua
index 1a564b8..1a564b8 100644
--- a/Source/Asura.Framework/Path/path_calculator.lua
+++ b/Source/Asura.Framework/scripts/path/path_calculator.lua
diff --git a/Source/Asura.Framework/Path/path_manager.lua b/Source/Asura.Framework/scripts/path/path_manager.lua
index e69de29..e69de29 100644
--- a/Source/Asura.Framework/Path/path_manager.lua
+++ b/Source/Asura.Framework/scripts/path/path_manager.lua
diff --git a/Source/Asura.Framework/scene.lua b/Source/Asura.Framework/scripts/scene.lua
index c0eaaa8..c0eaaa8 100644
--- a/Source/Asura.Framework/scene.lua
+++ b/Source/Asura.Framework/scripts/scene.lua
diff --git a/Source/Asura.Framework/transform.lua b/Source/Asura.Framework/scripts/transform.lua
index a415921..a415921 100644
--- a/Source/Asura.Framework/transform.lua
+++ b/Source/Asura.Framework/scripts/transform.lua