From 79d9be059b8c64740f2c4dd288afd3d5a807c156 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 23 Jan 2019 08:36:07 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/Asura.Framework/Filesystem/AnimationLoader.lua | 11 ----------- Source/Asura.Framework/Filesystem/GameObjectLoader.lua | 0 Source/Asura.Framework/Filesystem/MaterialLoader.lua | 10 ---------- Source/Asura.Framework/Filesystem/PathLoader.lua | 11 ----------- Source/Asura.Framework/Filesystem/SceneLoader.lua | 0 Source/Asura.Framework/Filesystem/animation_loader.lua | 11 +++++++++++ Source/Asura.Framework/Filesystem/gameobject_loader.lua | 0 Source/Asura.Framework/Filesystem/material_loader.lua | 10 ++++++++++ Source/Asura.Framework/Filesystem/path_loader.lua | 11 +++++++++++ Source/Asura.Framework/Filesystem/scene_loader.lua | 0 Source/Asura.Framework/Graphics/CanvasRenderer.lua | 0 Source/Asura.Framework/Graphics/DefaultShaders.lua | 5 ----- Source/Asura.Framework/Graphics/MaterialManager.lua | 5 ----- Source/Asura.Framework/Graphics/Mesh2DRenderer.lua | 5 ----- Source/Asura.Framework/Graphics/ParticleSystem.lua | 3 --- Source/Asura.Framework/Graphics/ShapeRenderer.lua | 0 Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua | 0 Source/Asura.Framework/Graphics/SpriteRenderer.lua | 7 ------- Source/Asura.Framework/Graphics/canvas_renderer.lua | 0 Source/Asura.Framework/Graphics/default_shaders.lua | 5 +++++ Source/Asura.Framework/Graphics/material_manager.lua | 5 +++++ Source/Asura.Framework/Graphics/mesh2d_renderer.lua | 5 +++++ Source/Asura.Framework/Graphics/particle_system.lua | 3 +++ Source/Asura.Framework/Graphics/shape_renderer.lua | 0 Source/Asura.Framework/Graphics/sprite_batch_renderer.lua | 0 Source/Asura.Framework/Graphics/sprite_renderer.lua | 7 +++++++ Source/Asura.Framework/Path/PathCalculator.lua | 12 ------------ Source/Asura.Framework/Path/PathManager.lua | 0 Source/Asura.Framework/Path/path_calculator.lua | 12 ++++++++++++ Source/Asura.Framework/Path/path_manager.lua | 0 Source/Asura.Framework/filesystem/animationloader.lua | 11 ----------- Source/Asura.Framework/filesystem/gameobjectloader.lua | 0 Source/Asura.Framework/filesystem/materialloader.lua | 10 ---------- Source/Asura.Framework/filesystem/pathloader.lua | 11 ----------- Source/Asura.Framework/filesystem/sceneloader.lua | 0 Source/Asura.Framework/graphics/canvasrenderer.lua | 0 Source/Asura.Framework/graphics/defaultshaders.lua | 5 ----- Source/Asura.Framework/graphics/materialmanager.lua | 5 ----- Source/Asura.Framework/graphics/mesh2drenderer.lua | 5 ----- Source/Asura.Framework/graphics/particlesystem.lua | 3 --- Source/Asura.Framework/graphics/shaperenderer.lua | 0 Source/Asura.Framework/graphics/spritebatchrenderer.lua | 0 Source/Asura.Framework/graphics/spriterenderer.lua | 7 ------- Source/Asura.Framework/path/pathcalculator.lua | 12 ------------ Source/Asura.Framework/path/pathmanager.lua | 0 45 files changed, 69 insertions(+), 138 deletions(-) delete mode 100644 Source/Asura.Framework/Filesystem/AnimationLoader.lua delete mode 100644 Source/Asura.Framework/Filesystem/GameObjectLoader.lua delete mode 100644 Source/Asura.Framework/Filesystem/MaterialLoader.lua delete mode 100644 Source/Asura.Framework/Filesystem/PathLoader.lua delete mode 100644 Source/Asura.Framework/Filesystem/SceneLoader.lua create mode 100644 Source/Asura.Framework/Filesystem/animation_loader.lua create mode 100644 Source/Asura.Framework/Filesystem/gameobject_loader.lua create mode 100644 Source/Asura.Framework/Filesystem/material_loader.lua create mode 100644 Source/Asura.Framework/Filesystem/path_loader.lua create mode 100644 Source/Asura.Framework/Filesystem/scene_loader.lua delete mode 100644 Source/Asura.Framework/Graphics/CanvasRenderer.lua delete mode 100644 Source/Asura.Framework/Graphics/DefaultShaders.lua delete mode 100644 Source/Asura.Framework/Graphics/MaterialManager.lua delete mode 100644 Source/Asura.Framework/Graphics/Mesh2DRenderer.lua delete mode 100644 Source/Asura.Framework/Graphics/ParticleSystem.lua delete mode 100644 Source/Asura.Framework/Graphics/ShapeRenderer.lua delete mode 100644 Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua delete mode 100644 Source/Asura.Framework/Graphics/SpriteRenderer.lua create mode 100644 Source/Asura.Framework/Graphics/canvas_renderer.lua create mode 100644 Source/Asura.Framework/Graphics/default_shaders.lua create mode 100644 Source/Asura.Framework/Graphics/material_manager.lua create mode 100644 Source/Asura.Framework/Graphics/mesh2d_renderer.lua create mode 100644 Source/Asura.Framework/Graphics/particle_system.lua create mode 100644 Source/Asura.Framework/Graphics/shape_renderer.lua create mode 100644 Source/Asura.Framework/Graphics/sprite_batch_renderer.lua create mode 100644 Source/Asura.Framework/Graphics/sprite_renderer.lua delete mode 100644 Source/Asura.Framework/Path/PathCalculator.lua delete mode 100644 Source/Asura.Framework/Path/PathManager.lua create mode 100644 Source/Asura.Framework/Path/path_calculator.lua create mode 100644 Source/Asura.Framework/Path/path_manager.lua delete mode 100644 Source/Asura.Framework/filesystem/animationloader.lua delete mode 100644 Source/Asura.Framework/filesystem/gameobjectloader.lua delete mode 100644 Source/Asura.Framework/filesystem/materialloader.lua delete mode 100644 Source/Asura.Framework/filesystem/pathloader.lua delete mode 100644 Source/Asura.Framework/filesystem/sceneloader.lua delete mode 100644 Source/Asura.Framework/graphics/canvasrenderer.lua delete mode 100644 Source/Asura.Framework/graphics/defaultshaders.lua delete mode 100644 Source/Asura.Framework/graphics/materialmanager.lua delete mode 100644 Source/Asura.Framework/graphics/mesh2drenderer.lua delete mode 100644 Source/Asura.Framework/graphics/particlesystem.lua delete mode 100644 Source/Asura.Framework/graphics/shaperenderer.lua delete mode 100644 Source/Asura.Framework/graphics/spritebatchrenderer.lua delete mode 100644 Source/Asura.Framework/graphics/spriterenderer.lua delete mode 100644 Source/Asura.Framework/path/pathcalculator.lua delete mode 100644 Source/Asura.Framework/path/pathmanager.lua (limited to 'Source/Asura.Framework') 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 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 diff --git a/Source/Asura.Framework/Filesystem/animation_loader.lua b/Source/Asura.Framework/Filesystem/animation_loader.lua new file mode 100644 index 0000000..f1dee29 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/animation_loader.lua @@ -0,0 +1,11 @@ +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/gameobject_loader.lua b/Source/Asura.Framework/Filesystem/gameobject_loader.lua new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Filesystem/material_loader.lua b/Source/Asura.Framework/Filesystem/material_loader.lua new file mode 100644 index 0000000..8ecfa51 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/material_loader.lua @@ -0,0 +1,10 @@ +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/path_loader.lua b/Source/Asura.Framework/Filesystem/path_loader.lua new file mode 100644 index 0000000..b9112df --- /dev/null +++ b/Source/Asura.Framework/Filesystem/path_loader.lua @@ -0,0 +1,11 @@ +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/scene_loader.lua b/Source/Asura.Framework/Filesystem/scene_loader.lua new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Graphics/CanvasRenderer.lua b/Source/Asura.Framework/Graphics/CanvasRenderer.lua deleted file mode 100644 index e69de29..0000000 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 diff --git a/Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua b/Source/Asura.Framework/Graphics/SpriteBatchRenderer.lua deleted file mode 100644 index e69de29..0000000 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/Graphics/canvas_renderer.lua b/Source/Asura.Framework/Graphics/canvas_renderer.lua new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Graphics/default_shaders.lua b/Source/Asura.Framework/Graphics/default_shaders.lua new file mode 100644 index 0000000..bd54cb9 --- /dev/null +++ b/Source/Asura.Framework/Graphics/default_shaders.lua @@ -0,0 +1,5 @@ +--[[ +内置的shaders. +]] + + diff --git a/Source/Asura.Framework/Graphics/material_manager.lua b/Source/Asura.Framework/Graphics/material_manager.lua new file mode 100644 index 0000000..46cc13d --- /dev/null +++ b/Source/Asura.Framework/Graphics/material_manager.lua @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000..01f0d90 --- /dev/null +++ b/Source/Asura.Framework/Graphics/mesh2d_renderer.lua @@ -0,0 +1,5 @@ +local Mesh2DRenderer = Class() + + + +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 new file mode 100644 index 0000000..21c35b8 --- /dev/null +++ b/Source/Asura.Framework/Graphics/particle_system.lua @@ -0,0 +1,3 @@ +--粒子系统，是一个组件 + +local ParticleSystem diff --git a/Source/Asura.Framework/Graphics/shape_renderer.lua b/Source/Asura.Framework/Graphics/shape_renderer.lua new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua b/Source/Asura.Framework/Graphics/sprite_batch_renderer.lua new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Graphics/sprite_renderer.lua b/Source/Asura.Framework/Graphics/sprite_renderer.lua new file mode 100644 index 0000000..79177ba --- /dev/null +++ b/Source/Asura.Framework/Graphics/sprite_renderer.lua @@ -0,0 +1,7 @@ +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 diff --git a/Source/Asura.Framework/Path/path_calculator.lua b/Source/Asura.Framework/Path/path_calculator.lua new file mode 100644 index 0000000..1a564b8 --- /dev/null +++ b/Source/Asura.Framework/Path/path_calculator.lua @@ -0,0 +1,12 @@ +--[[ +组件。组件会出现在编辑器的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 new file mode 100644 index 0000000..e69de29 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 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 diff --git a/Source/Asura.Framework/graphics/canvasrenderer.lua b/Source/Asura.Framework/graphics/canvasrenderer.lua deleted file mode 100644 index e69de29..0000000 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 diff --git a/Source/Asura.Framework/graphics/spritebatchrenderer.lua b/Source/Asura.Framework/graphics/spritebatchrenderer.lua deleted file mode 100644 index e69de29..0000000 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 -- cgit v1.1-26-g67d0