diff options
32 files changed, 50 insertions, 119 deletions
diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj index a78bd00..92c22fb 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -23,35 +23,35 @@ <None Include="..\..\Source\Asura.Framework\audio\soundplayer.lua" /> <None Include="..\..\Source\Asura.Framework\class.lua" /> <None Include="..\..\Source\Asura.Framework\component.lua" /> - <None Include="..\..\Source\Asura.Framework\filesystem\animationloader.lua" /> - <None Include="..\..\Source\Asura.Framework\filesystem\gameobjectloader.lua" /> + <None Include="..\..\Source\Asura.Framework\filesystem\animation_loader.lua" /> + <None Include="..\..\Source\Asura.Framework\filesystem\gameobject_loader.lua" /> <None Include="..\..\Source\Asura.Framework\filesystem\loader.lua" /> - <None Include="..\..\Source\Asura.Framework\filesystem\materialloader.lua" /> - <None Include="..\..\Source\Asura.Framework\filesystem\pathloader.lua" /> - <None Include="..\..\Source\Asura.Framework\filesystem\sceneloader.lua" /> + <None Include="..\..\Source\Asura.Framework\filesystem\material_loader.lua" /> + <None Include="..\..\Source\Asura.Framework\filesystem\path_loader.lua" /> + <None Include="..\..\Source\Asura.Framework\filesystem\scene_loader.lua" /> <None Include="..\..\Source\Asura.Framework\framework.lua" /> <None Include="..\..\Source\Asura.Framework\game.lua" /> <None Include="..\..\Source\Asura.Framework\gameobject.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\animation.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\animator.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\camera.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\canvasrenderer.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\defaultshaders.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\canvas_renderer.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\default_shaders.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\material.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\materialmanager.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\mesh2drenderer.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\particlesystem.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\material_manager.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\mesh2d_renderer.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\particle_system.lua" /> <None Include="..\..\Source\Asura.Framework\graphics\renderer.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\shaperenderer.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\spritebatchrenderer.lua" /> - <None Include="..\..\Source\Asura.Framework\graphics\spriterenderer.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\shape_renderer.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\sprite_batch_renderer.lua" /> + <None Include="..\..\Source\Asura.Framework\graphics\sprite_renderer.lua" /> <None Include="..\..\Source\Asura.Framework\gui\button.lua" /> <None Include="..\..\Source\Asura.Framework\gui\text.lua" /> <None Include="..\..\Source\Asura.Framework\math\curve.lua" /> <None Include="..\..\Source\Asura.Framework\object.lua" /> <None Include="..\..\Source\Asura.Framework\path\path.lua" /> - <None Include="..\..\Source\Asura.Framework\path\pathcalculator.lua" /> - <None Include="..\..\Source\Asura.Framework\path\pathmanager.lua" /> + <None Include="..\..\Source\Asura.Framework\path\path_calculator.lua" /> + <None Include="..\..\Source\Asura.Framework\path\path_manager.lua" /> <None Include="..\..\Source\Asura.Framework\scene.lua" /> <None Include="..\..\Source\Asura.Framework\transform.lua" /> </ItemGroup> diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index 77ce56c..14878fd 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -41,24 +41,9 @@ <None Include="..\..\Source\Asura.Framework\audio\soundplayer.lua"> <Filter>audio</Filter> </None> - <None Include="..\..\Source\Asura.Framework\filesystem\animationloader.lua"> - <Filter>filesystem</Filter> - </None> - <None Include="..\..\Source\Asura.Framework\filesystem\gameobjectloader.lua"> - <Filter>filesystem</Filter> - </None> <None Include="..\..\Source\Asura.Framework\filesystem\loader.lua"> <Filter>filesystem</Filter> </None> - <None Include="..\..\Source\Asura.Framework\filesystem\materialloader.lua"> - <Filter>filesystem</Filter> - </None> - <None Include="..\..\Source\Asura.Framework\filesystem\pathloader.lua"> - <Filter>filesystem</Filter> - </None> - <None Include="..\..\Source\Asura.Framework\filesystem\sceneloader.lua"> - <Filter>filesystem</Filter> - </None> <None Include="..\..\Source\Asura.Framework\graphics\animation.lua"> <Filter>graphics</Filter> </None> @@ -68,52 +53,67 @@ <None Include="..\..\Source\Asura.Framework\graphics\camera.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\canvasrenderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\material.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\defaultshaders.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\material.lua"> + <None Include="..\..\Source\Asura.Framework\gui\button.lua"> + <Filter>gui</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\gui\text.lua"> + <Filter>gui</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\math\curve.lua"> + <Filter>math</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\path\path.lua"> + <Filter>path</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\graphics\sprite_renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\materialmanager.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\sprite_batch_renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\mesh2drenderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\shape_renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\particlesystem.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\particle_system.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\renderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\mesh2d_renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\shaperenderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\material_manager.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\spritebatchrenderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\default_shaders.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\graphics\spriterenderer.lua"> + <None Include="..\..\Source\Asura.Framework\graphics\canvas_renderer.lua"> <Filter>graphics</Filter> </None> - <None Include="..\..\Source\Asura.Framework\gui\button.lua"> - <Filter>gui</Filter> + <None Include="..\..\Source\Asura.Framework\filesystem\animation_loader.lua"> + <Filter>filesystem</Filter> </None> - <None Include="..\..\Source\Asura.Framework\gui\text.lua"> - <Filter>gui</Filter> + <None Include="..\..\Source\Asura.Framework\filesystem\gameobject_loader.lua"> + <Filter>filesystem</Filter> </None> - <None Include="..\..\Source\Asura.Framework\math\curve.lua"> - <Filter>math</Filter> + <None Include="..\..\Source\Asura.Framework\filesystem\material_loader.lua"> + <Filter>filesystem</Filter> </None> - <None Include="..\..\Source\Asura.Framework\path\path.lua"> - <Filter>path</Filter> + <None Include="..\..\Source\Asura.Framework\filesystem\path_loader.lua"> + <Filter>filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\filesystem\scene_loader.lua"> + <Filter>filesystem</Filter> </None> - <None Include="..\..\Source\Asura.Framework\path\pathcalculator.lua"> + <None Include="..\..\Source\Asura.Framework\path\path_calculator.lua"> <Filter>path</Filter> </None> - <None Include="..\..\Source\Asura.Framework\path\pathmanager.lua"> + <None Include="..\..\Source\Asura.Framework\path\path_manager.lua"> <Filter>path</Filter> </None> </ItemGroup> diff --git a/Source/Asura.Framework/Filesystem/AnimationLoader.lua b/Source/Asura.Framework/Filesystem/animation_loader.lua index f1dee29..f1dee29 100644 --- a/Source/Asura.Framework/Filesystem/AnimationLoader.lua +++ b/Source/Asura.Framework/Filesystem/animation_loader.lua diff --git a/Source/Asura.Framework/Filesystem/GameObjectLoader.lua b/Source/Asura.Framework/Filesystem/gameobject_loader.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Filesystem/GameObjectLoader.lua +++ b/Source/Asura.Framework/Filesystem/gameobject_loader.lua diff --git a/Source/Asura.Framework/Filesystem/MaterialLoader.lua b/Source/Asura.Framework/Filesystem/material_loader.lua index 8ecfa51..8ecfa51 100644 --- a/Source/Asura.Framework/Filesystem/MaterialLoader.lua +++ b/Source/Asura.Framework/Filesystem/material_loader.lua diff --git a/Source/Asura.Framework/Filesystem/PathLoader.lua b/Source/Asura.Framework/Filesystem/path_loader.lua index b9112df..b9112df 100644 --- a/Source/Asura.Framework/Filesystem/PathLoader.lua +++ b/Source/Asura.Framework/Filesystem/path_loader.lua diff --git a/Source/Asura.Framework/Filesystem/SceneLoader.lua b/Source/Asura.Framework/Filesystem/scene_loader.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Filesystem/SceneLoader.lua +++ b/Source/Asura.Framework/Filesystem/scene_loader.lua diff --git a/Source/Asura.Framework/Graphics/CanvasRenderer.lua b/Source/Asura.Framework/Graphics/canvas_renderer.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Graphics/CanvasRenderer.lua +++ b/Source/Asura.Framework/Graphics/canvas_renderer.lua diff --git a/Source/Asura.Framework/Graphics/DefaultShaders.lua b/Source/Asura.Framework/Graphics/default_shaders.lua index bd54cb9..bd54cb9 100644 --- a/Source/Asura.Framework/Graphics/DefaultShaders.lua +++ b/Source/Asura.Framework/Graphics/default_shaders.lua diff --git a/Source/Asura.Framework/Graphics/MaterialManager.lua b/Source/Asura.Framework/Graphics/material_manager.lua index 46cc13d..46cc13d 100644 --- a/Source/Asura.Framework/Graphics/MaterialManager.lua +++ b/Source/Asura.Framework/Graphics/material_manager.lua diff --git a/Source/Asura.Framework/Graphics/Mesh2DRenderer.lua b/Source/Asura.Framework/Graphics/mesh2d_renderer.lua index 01f0d90..01f0d90 100644 --- a/Source/Asura.Framework/Graphics/Mesh2DRenderer.lua +++ b/Source/Asura.Framework/Graphics/mesh2d_renderer.lua diff --git a/Source/Asura.Framework/Graphics/ParticleSystem.lua b/Source/Asura.Framework/Graphics/particle_system.lua index 21c35b8..21c35b8 100644 --- a/Source/Asura.Framework/Graphics/ParticleSystem.lua +++ b/Source/Asura.Framework/Graphics/particle_system.lua diff --git a/Source/Asura.Framework/Graphics/ShapeRenderer.lua b/Source/Asura.Framework/Graphics/shape_renderer.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Graphics/ShapeRenderer.lua +++ b/Source/Asura.Framework/Graphics/shape_renderer.lua diff --git a/Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua b/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua +++ b/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua diff --git a/Source/Asura.Framework/Graphics/SpriteRenderer.lua b/Source/Asura.Framework/Graphics/sprite_renderer.lua index 79177ba..79177ba 100644 --- a/Source/Asura.Framework/Graphics/SpriteRenderer.lua +++ b/Source/Asura.Framework/Graphics/sprite_renderer.lua diff --git a/Source/Asura.Framework/Path/PathCalculator.lua b/Source/Asura.Framework/Path/path_calculator.lua index 1a564b8..1a564b8 100644 --- a/Source/Asura.Framework/Path/PathCalculator.lua +++ b/Source/Asura.Framework/Path/path_calculator.lua diff --git a/Source/Asura.Framework/Path/PathManager.lua b/Source/Asura.Framework/Path/path_manager.lua index e69de29..e69de29 100644 --- a/Source/Asura.Framework/Path/PathManager.lua +++ b/Source/Asura.Framework/Path/path_manager.lua diff --git a/Source/Asura.Framework/filesystem/animationloader.lua b/Source/Asura.Framework/filesystem/animationloader.lua deleted file mode 100644 index f1dee29..0000000 --- a/Source/Asura.Framework/filesystem/animationloader.lua +++ /dev/null @@ -1,11 +0,0 @@ -local AnimationLoader = AsuraEngine.Loader.New("animation") -local AnimationManager = require "AnimationManager" -local Animation = require "Animation" - -function AnimationLoader.Load(asset) - - local animation = AsuraEngine.Class() - -end - -return AnimationLoader
\ No newline at end of file diff --git a/Source/Asura.Framework/filesystem/gameobjectloader.lua b/Source/Asura.Framework/filesystem/gameobjectloader.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/filesystem/gameobjectloader.lua +++ /dev/null diff --git a/Source/Asura.Framework/filesystem/materialloader.lua b/Source/Asura.Framework/filesystem/materialloader.lua deleted file mode 100644 index 8ecfa51..0000000 --- a/Source/Asura.Framework/filesystem/materialloader.lua +++ /dev/null @@ -1,10 +0,0 @@ -local MaterialLoader = AsuraEngine.Loader.New("material") -local MaterialManager = require "MaterialManager" - -function MaterialLoader.Load(mat) - - - -end - -return MaterialLoader
\ No newline at end of file diff --git a/Source/Asura.Framework/filesystem/pathloader.lua b/Source/Asura.Framework/filesystem/pathloader.lua deleted file mode 100644 index b9112df..0000000 --- a/Source/Asura.Framework/filesystem/pathloader.lua +++ /dev/null @@ -1,11 +0,0 @@ -local PathLoader = AsuraEngine.Loader.New("path") -local PathManager = require "Path/PathManager" - -function PathLoader.Load(asset) - if asset.type ~= "path" then - return nil - end - -end - -return Path
\ No newline at end of file diff --git a/Source/Asura.Framework/filesystem/sceneloader.lua b/Source/Asura.Framework/filesystem/sceneloader.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/filesystem/sceneloader.lua +++ /dev/null diff --git a/Source/Asura.Framework/graphics/canvasrenderer.lua b/Source/Asura.Framework/graphics/canvasrenderer.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/graphics/canvasrenderer.lua +++ /dev/null diff --git a/Source/Asura.Framework/graphics/defaultshaders.lua b/Source/Asura.Framework/graphics/defaultshaders.lua deleted file mode 100644 index bd54cb9..0000000 --- a/Source/Asura.Framework/graphics/defaultshaders.lua +++ /dev/null @@ -1,5 +0,0 @@ ---[[ -õshaders. -]] - - diff --git a/Source/Asura.Framework/graphics/materialmanager.lua b/Source/Asura.Framework/graphics/materialmanager.lua deleted file mode 100644 index 46cc13d..0000000 --- a/Source/Asura.Framework/graphics/materialmanager.lua +++ /dev/null @@ -1,5 +0,0 @@ -local MaterialManager = AsuraEngine.Manager.New() - - - -return MaterialManager
\ No newline at end of file diff --git a/Source/Asura.Framework/graphics/mesh2drenderer.lua b/Source/Asura.Framework/graphics/mesh2drenderer.lua deleted file mode 100644 index 01f0d90..0000000 --- a/Source/Asura.Framework/graphics/mesh2drenderer.lua +++ /dev/null @@ -1,5 +0,0 @@ -local Mesh2DRenderer = Class() - - - -return Mesh2DRenderer
\ No newline at end of file diff --git a/Source/Asura.Framework/graphics/particlesystem.lua b/Source/Asura.Framework/graphics/particlesystem.lua deleted file mode 100644 index 21c35b8..0000000 --- a/Source/Asura.Framework/graphics/particlesystem.lua +++ /dev/null @@ -1,3 +0,0 @@ ---ϵͳһ - -local ParticleSystem diff --git a/Source/Asura.Framework/graphics/shaperenderer.lua b/Source/Asura.Framework/graphics/shaperenderer.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/graphics/shaperenderer.lua +++ /dev/null diff --git a/Source/Asura.Framework/graphics/spritebatchrenderer.lua b/Source/Asura.Framework/graphics/spritebatchrenderer.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/graphics/spritebatchrenderer.lua +++ /dev/null diff --git a/Source/Asura.Framework/graphics/spriterenderer.lua b/Source/Asura.Framework/graphics/spriterenderer.lua deleted file mode 100644 index 79177ba..0000000 --- a/Source/Asura.Framework/graphics/spriterenderer.lua +++ /dev/null @@ -1,7 +0,0 @@ -local SpriteRenderer = Class() - -function SpriteRenderer:OnRender() - -end - -return SpriteRenderer
\ No newline at end of file diff --git a/Source/Asura.Framework/path/pathcalculator.lua b/Source/Asura.Framework/path/pathcalculator.lua deleted file mode 100644 index 1a564b8..0000000 --- a/Source/Asura.Framework/path/pathcalculator.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/pathmanager.lua b/Source/Asura.Framework/path/pathmanager.lua deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Framework/path/pathmanager.lua +++ /dev/null |