diff options
Diffstat (limited to 'Source/Asura.Framework/scripts')
24 files changed, 26 insertions, 25 deletions
diff --git a/Source/Asura.Framework/scripts/ai/state_graph.lua b/Source/Asura.Framework/scripts/ai/state_graph.lua index a699e76..4f563dc 100644 --- a/Source/Asura.Framework/scripts/ai/state_graph.lua +++ b/Source/Asura.Framework/scripts/ai/state_graph.lua @@ -1,4 +1,4 @@ -local StateGraph = AsuraEngine.Asset.Sub("StateGraph") +local StateGraph = AsuraEngine.Asset.Extend("StateGraph") AsuraEngine.StateGraph = StateGraph diff --git a/Source/Asura.Framework/scripts/audio/sound.lua b/Source/Asura.Framework/scripts/audio/sound.lua index 71def66..d7dea4f 100644 --- a/Source/Asura.Framework/scripts/audio/sound.lua +++ b/Source/Asura.Framework/scripts/audio/sound.lua @@ -1,4 +1,4 @@ -AsuraEngine.Sound = AsuraEngine.Asset.Sub("Sound") +AsuraEngine.Sound = AsuraEngine.Asset.Extend("Sound") local Sound = AsuraEngine.Sound diff --git a/Source/Asura.Framework/scripts/audio/source.lua b/Source/Asura.Framework/scripts/audio/source.lua index 8269842..7dec511 100644 --- a/Source/Asura.Framework/scripts/audio/source.lua +++ b/Source/Asura.Framework/scripts/audio/source.lua @@ -1,5 +1,5 @@ -- Audio Source -AsuraEngine.Source = AsuraEngine.Component.Sub("SoundPlayer") +AsuraEngine.Source = AsuraEngine.Component.Extend("SoundPlayer") local Source = AsuraEngine.Source diff --git a/Source/Asura.Framework/scripts/class.lua b/Source/Asura.Framework/scripts/class.lua index d5ed5cd..6392483 100644 --- a/Source/Asura.Framework/scripts/class.lua +++ b/Source/Asura.Framework/scripts/class.lua @@ -3,7 +3,7 @@ AsuraEngine.Class = {} local Class = AsuraEngine.Class Class.__index = Class -function Class.Sub(base, classname) +function Class.Extend(base, classname) local subclass = {} base.__index = base setmetatable(subclass, base) diff --git a/Source/Asura.Framework/scripts/component.lua b/Source/Asura.Framework/scripts/component.lua index 0eb7fc1..9306f3b 100644 --- a/Source/Asura.Framework/scripts/component.lua +++ b/Source/Asura.Framework/scripts/component.lua @@ -5,7 +5,7 @@ local Component = AsuraEngine.Component -- Component要显示在inspector的变量 Component.gameobject = AsuraEngine.Type.GameObject -function Component.Sub(cname) +function Component.Extend(cname) self.base(cname) assert(Component.components[cname] == nil) diff --git a/Source/Asura.Framework/scripts/gameobject.lua b/Source/Asura.Framework/scripts/gameobject.lua index fb287fb..a2d20ef 100644 --- a/Source/Asura.Framework/scripts/gameobject.lua +++ b/Source/Asura.Framework/scripts/gameobject.lua @@ -3,13 +3,13 @@ -- require "transform" -AsuraEngine.GameObject = AsuraEngine.Asset.Sub("GameObject") +AsuraEngine.GameObject = AsuraEngine.Asset.Extend("GameObject") local GameObject = AsuraEngine.GameObject function GameObject:Ctor() self.transform = AsuraEngine.Transform.New() - self.subentities = {} -- Sub node entities + self.subentities = {} -- Extend node entities end function GameObject:AddChild(gameobject) diff --git a/Source/Asura.Framework/scripts/graphics/animation.lua b/Source/Asura.Framework/scripts/graphics/animation.lua index b6673c6..285adaa 100644 --- a/Source/Asura.Framework/scripts/graphics/animation.lua +++ b/Source/Asura.Framework/scripts/graphics/animation.lua @@ -1,4 +1,4 @@ -AsuraEngine.Animation = AsuraEngine.Asset.Sub("Animation") +AsuraEngine.Animation = AsuraEngine.Asset.Extend("Animation") local Animation = AsuraEngine.Animation diff --git a/Source/Asura.Framework/scripts/graphics/animator.lua b/Source/Asura.Framework/scripts/graphics/animator.lua index 5c77adc..c019dfa 100644 --- a/Source/Asura.Framework/scripts/graphics/animator.lua +++ b/Source/Asura.Framework/scripts/graphics/animator.lua @@ -1,6 +1,6 @@ local Component = AsuraEngine.Framework.Require("component") -AsuraEngine.Animator = Component.Sub("Animator") +AsuraEngine.Animator = Component.Extend("Animator") local Animator = AsuraEngine.Animator diff --git a/Source/Asura.Framework/scripts/graphics/camera.lua b/Source/Asura.Framework/scripts/graphics/camera.lua index 383c328..a989de6 100644 --- a/Source/Asura.Framework/scripts/graphics/camera.lua +++ b/Source/Asura.Framework/scripts/graphics/camera.lua @@ -1,4 +1,4 @@ -AsuraEngine.Camera = AsuraEngine.Component.Sub("Camera") +AsuraEngine.Camera = AsuraEngine.Component.Extend("Camera") local Camera = AsuraEngine.Camera diff --git a/Source/Asura.Framework/scripts/graphics/canvas.lua b/Source/Asura.Framework/scripts/graphics/canvas.lua index 11e71f3..ce2ca20 100644 --- a/Source/Asura.Framework/scripts/graphics/canvas.lua +++ b/Source/Asura.Framework/scripts/graphics/canvas.lua @@ -1,4 +1,4 @@ -AsuraEngine.Canvas = AsuraEngine.Component.Sub("Canvas") +AsuraEngine.Canvas = AsuraEngine.Component.Extend("Canvas") local Canvas = AsuraEngine.Canvas diff --git a/Source/Asura.Framework/scripts/graphics/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua index dcdb4c3..f5ebaa2 100644 --- a/Source/Asura.Framework/scripts/graphics/image.lua +++ b/Source/Asura.Framework/scripts/graphics/image.lua @@ -1,5 +1,5 @@ -- 图片资源 -AsuraEngine.Image = AsuraEngine.Asset.Sub("Image") +AsuraEngine.Image = AsuraEngine.Asset.Extend("Image") local Image = AsuraEngine.Image diff --git a/Source/Asura.Framework/scripts/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua index 64d70f7..5a6e5bd 100644 --- a/Source/Asura.Framework/scripts/graphics/material.lua +++ b/Source/Asura.Framework/scripts/graphics/material.lua @@ -1,5 +1,5 @@ --material是shader的代理 -AsuraEngine.Material = AsuraEngine.Asset.Sub("Material") +AsuraEngine.Material = AsuraEngine.Asset.Extend("Material") local Material = AsuraEngine.Material diff --git a/Source/Asura.Framework/scripts/graphics/mesh2d.lua b/Source/Asura.Framework/scripts/graphics/mesh2d.lua index 13b270a..05b2e2e 100644 --- a/Source/Asura.Framework/scripts/graphics/mesh2d.lua +++ b/Source/Asura.Framework/scripts/graphics/mesh2d.lua @@ -1,4 +1,4 @@ -AsuraEngine.Mesh2D = AsuraEngine.Asset.Sub("Mesh2D") +AsuraEngine.Mesh2D = AsuraEngine.Asset.Extend("Mesh2D") local Mesh2D = AsuraEngine.Mesh2D diff --git a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua index ca97283..09c8c98 100644 --- a/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/mesh2d_renderer.lua @@ -1,4 +1,4 @@ -AsuraEngine.Mesh2DRenderer = AsuraEngine.Renderer.Sub("Mesh2DRenderer") +AsuraEngine.Mesh2DRenderer = AsuraEngine.Renderer.Extend("Mesh2DRenderer") local Mesh2DRenderer = AsuraEngine.Mesh2DRenderer diff --git a/Source/Asura.Framework/scripts/graphics/particle_system.lua b/Source/Asura.Framework/scripts/graphics/particle_system.lua index a2e3c26..8de3258 100644 --- a/Source/Asura.Framework/scripts/graphics/particle_system.lua +++ b/Source/Asura.Framework/scripts/graphics/particle_system.lua @@ -1,6 +1,6 @@ require "graphics.sprite_renderer" -AsuraEngine.ParticleSystem = AsuraEngine.Component.Sub("ParticleSystem") +AsuraEngine.ParticleSystem = AsuraEngine.Component.Extend("ParticleSystem") local ParticleSystem = AsuraEngine.ParticleSystem diff --git a/Source/Asura.Framework/scripts/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua index 189c9d1..92a6409 100644 --- a/Source/Asura.Framework/scripts/graphics/renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/renderer.lua @@ -1,4 +1,4 @@ -local Renderer = AsuraEngine.Component.Sub("Renderer") +local Renderer = AsuraEngine.Component.Extend("Renderer") AsuraEngine.Renderer = Renderer function Renderer.Ctor(self) diff --git a/Source/Asura.Framework/scripts/graphics/shader.lua b/Source/Asura.Framework/scripts/graphics/shader.lua index 1bbf1fa..c411619 100644 --- a/Source/Asura.Framework/scripts/graphics/shader.lua +++ b/Source/Asura.Framework/scripts/graphics/shader.lua @@ -1,4 +1,4 @@ -AsuraEngine.Shader = AsuraEngine.Asset.Sub("Shader") +AsuraEngine.Shader = AsuraEngine.Asset.Extend("Shader") local helper = AsuraEngine.Framework.Require("graphics/shaderHelper") diff --git a/Source/Asura.Framework/scripts/graphics/shape.lua b/Source/Asura.Framework/scripts/graphics/shape.lua index 6d737f0..51ea8c3 100644 --- a/Source/Asura.Framework/scripts/graphics/shape.lua +++ b/Source/Asura.Framework/scripts/graphics/shape.lua @@ -1,7 +1,7 @@ -- -- 2D图形 -- -AsuraEngine.Shape = AsuraEngine.Asset.Sub("Shape") +AsuraEngine.Shape = AsuraEngine.Asset.Extend("Shape") local Shape = AsuraEngine.Shape diff --git a/Source/Asura.Framework/scripts/graphics/shape_renderer.lua b/Source/Asura.Framework/scripts/graphics/shape_renderer.lua index 8c002a2..80b48b8 100644 --- a/Source/Asura.Framework/scripts/graphics/shape_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/shape_renderer.lua @@ -1,4 +1,4 @@ -AsuraEngine.ShapeRenderer = AsuraEngine.Component.Sub("ShapeRenderer") +AsuraEngine.ShapeRenderer = AsuraEngine.Component.Extend("ShapeRenderer") local ShapeRenderer = AsuraEngine.ShapeRenderer diff --git a/Source/Asura.Framework/scripts/graphics/sprite.lua b/Source/Asura.Framework/scripts/graphics/sprite.lua index da116fc..9bf05f4 100644 --- a/Source/Asura.Framework/scripts/graphics/sprite.lua +++ b/Source/Asura.Framework/scripts/graphics/sprite.lua @@ -1,4 +1,4 @@ -local Sprite = AsuraEngine.Asset.Sub("Sprite") +local Sprite = AsuraEngine.Asset.Extend("Sprite") AsuraEngine.Sprite = Sprite function Sprite.Ctor(self, image) diff --git a/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua index 9621bce..9ec73d2 100644 --- a/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/sprite_batch_renderer.lua @@ -1,4 +1,4 @@ -AsuraEngine.SpriteBatchRenderer = AsuraEngine.Component.Sub("SpriteBatchRenderer") +AsuraEngine.SpriteBatchRenderer = AsuraEngine.Component.Extend("SpriteBatchRenderer") local SpriteBatchRenderer = AsuraEngine.SpriteBatchRenderer diff --git a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua index 5ceafd2..0a41e08 100644 --- a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua @@ -1,6 +1,6 @@ require "graphics.renderer" -local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer") +local SpriteRenderer = AsuraEngine.Renderer.Extend("Spriterenderer") AsuraEngine.SpriteRenderer = SpriteRenderer function SpriteRenderer.Ctor(self) diff --git a/Source/Asura.Framework/scripts/gui/button.lua b/Source/Asura.Framework/scripts/gui/button.lua index 67d0943..b122931 100644 --- a/Source/Asura.Framework/scripts/gui/button.lua +++ b/Source/Asura.Framework/scripts/gui/button.lua @@ -1,4 +1,4 @@ -AsuraEngine.Button = AsuraEngine.Component.Sub("Button") +AsuraEngine.Button = AsuraEngine.Component.Extend("Button") local Button = AsuraEngine.Button diff --git a/Source/Asura.Framework/scripts/scene.lua b/Source/Asura.Framework/scripts/scene.lua index 2adbf53..3036ce1 100644 --- a/Source/Asura.Framework/scripts/scene.lua +++ b/Source/Asura.Framework/scripts/scene.lua @@ -1,12 +1,13 @@ -- -- Scene是一系列gameobject的集合。 -- -AsuraEngine.Scene = AsuraEngine.Asset.Sub("Scene") +AsuraEngine.Scene = AsuraEngine.Asset.Extend("Scene") local Scene = AsuraEngine.Scene function Scene.Ctor(self) self.rootGameObjects = {} --当前场景的所有root gameobject + self.super.Ctor(self) end --获取当前的场景 |