diff options
Diffstat (limited to 'Source/Asura.Framework/scripts')
8 files changed, 42 insertions, 22 deletions
diff --git a/Source/Asura.Framework/scripts/ai/state_graph.lua b/Source/Asura.Framework/scripts/ai/state_graph.lua new file mode 100644 index 0000000..a699e76 --- /dev/null +++ b/Source/Asura.Framework/scripts/ai/state_graph.lua @@ -0,0 +1,11 @@ +local StateGraph = AsuraEngine.Asset.Sub("StateGraph") + +AsuraEngine.StateGraph = StateGraph + +function StateGraph.Ctor(self) + +end + +function StateGraph.ToAsset() + +end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/ai/state_machine.lua b/Source/Asura.Framework/scripts/ai/state_machine.lua index b1ff849..66276a0 100644 --- a/Source/Asura.Framework/scripts/ai/state_machine.lua +++ b/Source/Asura.Framework/scripts/ai/state_machine.lua @@ -1,6 +1,6 @@ local StateMachine = Class() AsuraEngine.StateMachine = StateMachine -function StateMachine.Ctor(self, statemap) - self.statemap = statemap +function StateMachine.Ctor(self, stategraph) + self.stategraph = stategraph end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/ai/state_map.lua b/Source/Asura.Framework/scripts/ai/state_map.lua deleted file mode 100644 index 7e986de..0000000 --- a/Source/Asura.Framework/scripts/ai/state_map.lua +++ /dev/null @@ -1,12 +0,0 @@ -local StateMap = AsuraEngine.Asset.Sub("StateMap") - -AsuraEngine.StateMap = StateMap - -function StateMap.Ctor(self) - -end - -function StateMap.ToAsset() - -end - diff --git a/Source/Asura.Framework/scripts/framework.lua b/Source/Asura.Framework/scripts/framework.lua index 14e7b24..5da0020 100644 --- a/Source/Asura.Framework/scripts/framework.lua +++ b/Source/Asura.Framework/scripts/framework.lua @@ -1,2 +1,21 @@ ---框架入口文件 +package.path = "scripts\\?.lua" + +--loader +local loadfn = function(modulename) + local errmsg = "" + local modulepath = string.gsub(modulename, "%.", "/") + for path in string.gmatch(package.path, "([^;]+)") do + local filename = string.gsub(path, "%?", modulepath) + filename = string.gsub(filename, "\\", "/") + local result = kleiloadlua(filename) + if result then + return result + end + errmsg = errmsg.."\n\tno file '"..filename.."' (checked with custom loader)" + end + return errmsg +end + +table.insert(package.loaders, 1, loadfn) + require "" diff --git a/Source/Asura.Framework/scripts/graphics/image.lua b/Source/Asura.Framework/scripts/graphics/image.lua index ae91466..c96906b 100644 --- a/Source/Asura.Framework/scripts/graphics/image.lua +++ b/Source/Asura.Framework/scripts/graphics/image.lua @@ -35,4 +35,6 @@ end --image不可再编辑器编辑，所以没有ToAsset方法 --function Image.ToAsset() ---end
\ No newline at end of file +--end + +return Image
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/renderer.lua b/Source/Asura.Framework/scripts/graphics/renderer.lua index 46fd548..a7091b0 100644 --- a/Source/Asura.Framework/scripts/graphics/renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/renderer.lua @@ -2,9 +2,9 @@ local Renderer = AsuraEngine.Component.Sub("Renderer") AsuraEngine.Renderer = Renderer function Renderer.Ctor(self) - self.mMaterials = {} - self.mMaterial = nil - self.mIsMultiMaterials = false + self.materials = {} + self.material = nil + self.isMultiMaterials = false end --取材质，如果是shared，那么从此材质clone一个 @@ -13,7 +13,7 @@ function Renderer.GetMaterial(self) end function Renderer.IsMultiMaterials(self) - return self.mIsMultiMaterials + return self.isMultiMaterials end return Renderer
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua index 2d1fae5..93937d7 100644 --- a/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua +++ b/Source/Asura.Framework/scripts/graphics/sprite_renderer.lua @@ -4,7 +4,7 @@ local SpriteRenderer = AsuraEngine.Renderer.Sub("Spriterenderer") AsuraEngine.SpriteRenderer = SpriteRenderer function SpriteRenderer.Ctor(self) - self.mMaterials = {} + self.materials = {} end function SpriteRenderer:OnRender() diff --git a/Source/Asura.Framework/scripts/managers/scene_manager.lua b/Source/Asura.Framework/scripts/managers/scene_manager.lua index fc5a6ba..8c4e24f 100644 --- a/Source/Asura.Framework/scripts/managers/scene_manager.lua +++ b/Source/Asura.Framework/scripts/managers/scene_manager.lua @@ -13,4 +13,4 @@ function SceneManager.GetSceneByGUID() end -return SceneManager
\ No newline at end of file +return SceneManager
\ No newline at end of file |