diff options
Diffstat (limited to 'Source/Asura.Framework/scripts')
12 files changed, 23 insertions, 14 deletions
diff --git a/Source/Asura.Framework/scripts/class.lua b/Source/Asura.Framework/scripts/class.lua index 1d60d3c..a280371 100644 --- a/Source/Asura.Framework/scripts/class.lua +++ b/Source/Asura.Framework/scripts/class.lua @@ -14,6 +14,4 @@ function Class.New(cls) local obj = {} setmetatable(obj, cls) cls.__index = cls -end - - +end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/animation_loader.lua b/Source/Asura.Framework/scripts/filesystem/animation_loader.lua index c6808c0..e9fe7f3 100644 --- a/Source/Asura.Framework/scripts/filesystem/animation_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/animation_loader.lua @@ -5,6 +5,6 @@ local loader = AsuraEngine.Loader.New("animation") local manager = AsuraEngine.AnimationManager local Animation = AsuraEngine.Animation -function AnimationLoader.Load(asset) +function AnimationLoader.OnLoad(asset) local animation = AsuraEngine.Class() end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/entity_loader.lua b/Source/Asura.Framework/scripts/filesystem/entity_loader.lua index 771f86a..57a890f 100644 --- a/Source/Asura.Framework/scripts/filesystem/entity_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/entity_loader.lua @@ -1,5 +1,5 @@ local loader = AsuraEngine.Loader.New("gameobject") -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/image_loader.lua b/Source/Asura.Framework/scripts/filesystem/image_loader.lua index 174d837..15d1a2d 100644 --- a/Source/Asura.Framework/scripts/filesystem/image_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/image_loader.lua @@ -1,7 +1,7 @@ require "graphics.image" local loader = AsuraEngine.Loader.New("image") -function loader.Load(asset) +function loader.OnLoad(asset) assert(asset ~= nil) local path = asset.extern local image = AusraEngine.Image.New(path) diff --git a/Source/Asura.Framework/scripts/filesystem/material_loader.lua b/Source/Asura.Framework/scripts/filesystem/material_loader.lua index 2c2058e..07fdd84 100644 --- a/Source/Asura.Framework/scripts/filesystem/material_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/material_loader.lua @@ -2,6 +2,6 @@ require "MaterialManager" local loader = AsuraEngine.Loader.New("material") -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/path_loader.lua b/Source/Asura.Framework/scripts/filesystem/path_loader.lua index 8618c03..8cdd1a3 100644 --- a/Source/Asura.Framework/scripts/filesystem/path_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/path_loader.lua @@ -2,7 +2,7 @@ require "Path/PathManager" local loader = AsuraEngine.Loader.New("path") -function loader.Load(asset) +function loader.OnLoad(asset) if asset.type ~= "path" then return nil end diff --git a/Source/Asura.Framework/scripts/filesystem/scene_loader.lua b/Source/Asura.Framework/scripts/filesystem/scene_loader.lua index c0a951f..45731f8 100644 --- a/Source/Asura.Framework/scripts/filesystem/scene_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/scene_loader.lua @@ -2,6 +2,6 @@ local Scene = require "scene" local loader = AsuraEngine.Loader.New("scene") -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/script_loader.lua b/Source/Asura.Framework/scripts/filesystem/script_loader.lua index a85dea6..e93d903 100644 --- a/Source/Asura.Framework/scripts/filesystem/script_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/script_loader.lua @@ -1,5 +1,5 @@ local loader = AsuraEngine.Loader.New("script") -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/shader_loader.lua b/Source/Asura.Framework/scripts/filesystem/shader_loader.lua index d488eb9..7afcee8 100644 --- a/Source/Asura.Framework/scripts/filesystem/shader_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/shader_loader.lua @@ -1,5 +1,5 @@ local loader = AsuraEngine.Loader.New("shader") -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua b/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua index ededcfc..e52e086 100644 --- a/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua +++ b/Source/Asura.Framework/scripts/filesystem/statemap_loader.lua @@ -2,6 +2,6 @@ require "ai/statemap_manager" local loader = AsuraEngine.Loader.New("statemap") --载入statemap -function loader.Load(asset) +function loader.OnLoad(asset) end
\ No newline at end of file diff --git a/Source/Asura.Framework/scripts/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua index 7028f98..37d42e3 100644 --- a/Source/Asura.Framework/scripts/graphics/material.lua +++ b/Source/Asura.Framework/scripts/graphics/material.lua @@ -4,8 +4,8 @@ AsuraEngine.Material = AsuraEngine.Asset.Sub("Material") local Material = AsuraEngine.Material function Material.Ctor(self) - self.mUniforms = {} --uniform变量和值 - self.mIsShared = false + self.uniforms = {} --uniform变量和值 + self.isShared = false end function Material.Clone(self) diff --git a/Source/Asura.Framework/scripts/gui/widget.lua b/Source/Asura.Framework/scripts/gui/widget.lua new file mode 100644 index 0000000..7a049bd --- /dev/null +++ b/Source/Asura.Framework/scripts/gui/widget.lua @@ -0,0 +1,11 @@ +local Widget = AsuraEngine.Component("Widget") + +function Widget.Ctor(self) + +end + +function Widget.OnEvent(self, e) + +end + +return Widget
\ No newline at end of file |