From 7095218ad1cf958d4fc2f20d848190ea6cd9dd8c Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 23 Jan 2019 21:01:30 +0800 Subject: *misc --- Source/Asura.Editor/Source/Window.h | 14 ++++++++++++++ Source/Asura.Engine/Graphics/Window.cpp | 0 Source/Asura.Engine/Graphics/Window.h | 20 ++++++++++++++++++++ Source/Asura.Framework/Component.lua | 2 +- Source/Asura.Framework/Filesystem/Loader.lua | 19 +++---------------- .../Asura.Framework/Filesystem/material_loader.lua | 4 +--- Source/Asura.Framework/Filesystem/path_loader.lua | 7 +++---- Source/Asura.Framework/Graphics/Animator.lua | 8 ++++---- Source/Asura.Framework/compile.bat | 0 Source/Asura.Framework/component.lua | 2 +- Source/Asura.Framework/filesystem/loader.lua | 19 +++---------------- .../Asura.Framework/filesystem/material_loader.lua | 4 +--- Source/Asura.Framework/filesystem/path_loader.lua | 7 +++---- Source/Asura.Framework/graphics/animator.lua | 8 ++++---- 14 files changed, 58 insertions(+), 56 deletions(-) create mode 100644 Source/Asura.Editor/Source/Window.h create mode 100644 Source/Asura.Engine/Graphics/Window.cpp create mode 100644 Source/Asura.Engine/Graphics/Window.h create mode 100644 Source/Asura.Framework/compile.bat (limited to 'Source') diff --git a/Source/Asura.Editor/Source/Window.h b/Source/Asura.Editor/Source/Window.h new file mode 100644 index 0000000..f9f8d43 --- /dev/null +++ b/Source/Asura.Editor/Source/Window.h @@ -0,0 +1,14 @@ +#ifndef __ASURA_EDITOR_WINDOW_H__ +#define __ASURA_EDITOR_WINDOW_H__ + +namespace AsuraEditor +{ + + class Window + { + + }; + +} + +#endif \ No newline at end of file diff --git a/Source/Asura.Engine/Graphics/Window.cpp b/Source/Asura.Engine/Graphics/Window.cpp new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Engine/Graphics/Window.h b/Source/Asura.Engine/Graphics/Window.h new file mode 100644 index 0000000..1707e3d --- /dev/null +++ b/Source/Asura.Engine/Graphics/Window.h @@ -0,0 +1,20 @@ +#ifndef __AE_WINDOW_H__ +#define __AE_WINDOW_H__ + +namespace AsuraEngine +{ + namespace Graphics + { + + /// + /// 游戏窗口 + /// + class Window + { + + }; + + } +} + +#endif \ No newline at end of file diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua index 027c066..dd843eb 100644 --- a/Source/Asura.Framework/Component.lua +++ b/Source/Asura.Framework/Component.lua @@ -3,7 +3,7 @@ local Component = Class() Component.gameobject = AsuraEngine.Type.GameObject function Component:Ctor(go) - self.gameobject = go + self.gameobject = go end function Component:OnEvent(e) diff --git a/Source/Asura.Framework/Filesystem/Loader.lua b/Source/Asura.Framework/Filesystem/Loader.lua index fbbd68a..9ac058b 100644 --- a/Source/Asura.Framework/Filesystem/Loader.lua +++ b/Source/Asura.Framework/Filesystem/Loader.lua @@ -1,22 +1,9 @@ ---[[ -基类，自定义的资源可以通过继承此类导入。自定义的资源的标记方法： - - ./resource.maptile - -在指定了导入impoter之后，自定义的资源允许通过下列方法标记: - - ./resource.maptile - -引擎会使用对应内部资源类型的importer导入资源 +local Loader = Class() -]] - -local importer = Class() - -function importer:InnerResource( data ) +function Loader:InnerResource( data ) end -return importer \ No newline at end of file +return Loader \ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/material_loader.lua b/Source/Asura.Framework/Filesystem/material_loader.lua index 8ecfa51..2ea47f4 100644 --- a/Source/Asura.Framework/Filesystem/material_loader.lua +++ b/Source/Asura.Framework/Filesystem/material_loader.lua @@ -2,9 +2,7 @@ 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 index b9112df..c62be96 100644 --- a/Source/Asura.Framework/Filesystem/path_loader.lua +++ b/Source/Asura.Framework/Filesystem/path_loader.lua @@ -2,10 +2,9 @@ local PathLoader = AsuraEngine.Loader.New("path") local PathManager = require "Path/PathManager" function PathLoader.Load(asset) - if asset.type ~= "path" then - return nil - end - + if asset.type ~= "path" then + return nil + end end return Path \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua index 1dca9f4..2e52104 100644 --- a/Source/Asura.Framework/Graphics/Animator.lua +++ b/Source/Asura.Framework/Graphics/Animator.lua @@ -1,6 +1,6 @@ local Animator = Class(function(go) - self.gameobject = go - self.spriteRenderer = go:GetSpriteRenderer() + self.gameobject = go + self.spriteRenderer = go:GetSpriteRenderer() end) Animator.animation = AsuraEngine.Animation.None @@ -8,11 +8,11 @@ Animator.animation = AsuraEngine.Animation.None local animation = AsuraEngine.Animation.New() function Animator:OnUpdate(dt) - + end function Animator:OnRender() - + end return Animator \ No newline at end of file diff --git a/Source/Asura.Framework/compile.bat b/Source/Asura.Framework/compile.bat new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/component.lua b/Source/Asura.Framework/component.lua index 027c066..dd843eb 100644 --- a/Source/Asura.Framework/component.lua +++ b/Source/Asura.Framework/component.lua @@ -3,7 +3,7 @@ local Component = Class() Component.gameobject = AsuraEngine.Type.GameObject function Component:Ctor(go) - self.gameobject = go + self.gameobject = go end function Component:OnEvent(e) diff --git a/Source/Asura.Framework/filesystem/loader.lua b/Source/Asura.Framework/filesystem/loader.lua index fbbd68a..9ac058b 100644 --- a/Source/Asura.Framework/filesystem/loader.lua +++ b/Source/Asura.Framework/filesystem/loader.lua @@ -1,22 +1,9 @@ ---[[ -基类，自定义的资源可以通过继承此类导入。自定义的资源的标记方法： - - ./resource.maptile - -在指定了导入impoter之后，自定义的资源允许通过下列方法标记: - - ./resource.maptile - -引擎会使用对应内部资源类型的importer导入资源 +local Loader = Class() -]] - -local importer = Class() - -function importer:InnerResource( data ) +function Loader:InnerResource( data ) end -return importer \ No newline at end of file +return Loader \ No newline at end of file diff --git a/Source/Asura.Framework/filesystem/material_loader.lua b/Source/Asura.Framework/filesystem/material_loader.lua index 8ecfa51..2ea47f4 100644 --- a/Source/Asura.Framework/filesystem/material_loader.lua +++ b/Source/Asura.Framework/filesystem/material_loader.lua @@ -2,9 +2,7 @@ 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 index b9112df..c62be96 100644 --- a/Source/Asura.Framework/filesystem/path_loader.lua +++ b/Source/Asura.Framework/filesystem/path_loader.lua @@ -2,10 +2,9 @@ local PathLoader = AsuraEngine.Loader.New("path") local PathManager = require "Path/PathManager" function PathLoader.Load(asset) - if asset.type ~= "path" then - return nil - end - + if asset.type ~= "path" then + return nil + end end return Path \ No newline at end of file diff --git a/Source/Asura.Framework/graphics/animator.lua b/Source/Asura.Framework/graphics/animator.lua index 1dca9f4..2e52104 100644 --- a/Source/Asura.Framework/graphics/animator.lua +++ b/Source/Asura.Framework/graphics/animator.lua @@ -1,6 +1,6 @@ local Animator = Class(function(go) - self.gameobject = go - self.spriteRenderer = go:GetSpriteRenderer() + self.gameobject = go + self.spriteRenderer = go:GetSpriteRenderer() end) Animator.animation = AsuraEngine.Animation.None @@ -8,11 +8,11 @@ Animator.animation = AsuraEngine.Animation.None local animation = AsuraEngine.Animation.New() function Animator:OnUpdate(dt) - + end function Animator:OnRender() - + end return Animator \ No newline at end of file -- cgit v1.1-26-g67d0