diff options
Diffstat (limited to 'Source/Asura.Engine')
27 files changed, 57 insertions, 95 deletions
diff --git a/Source/Asura.Engine/Asura.h b/Source/Asura.Engine/Asura.h index dfa0fa5..ee9068c 100644 --- a/Source/Asura.Engine/Asura.h +++ b/Source/Asura.Engine/Asura.h @@ -1,5 +1,5 @@ -#ifndef __AE_H__ -#define __AE_H__ +#ifndef __ASURA_ENGINE_H__ +#define __ASURA_ENGINE_H__ diff --git a/Source/Asura.Engine/Containers/Map.h b/Source/Asura.Engine/Containers/Map.h index 2caedef..999971c 100644 --- a/Source/Asura.Engine/Containers/Map.h +++ b/Source/Asura.Engine/Containers/Map.h @@ -1,5 +1,5 @@ -#ifndef __AE_MAP_H__ -#define __AE_MAP_H__ +#ifndef __ASURA_ENGINE_MAP_H__ +#define __ASURA_ENGINE_MAP_H__ #include <map> diff --git a/Source/Asura.Engine/Containers/String.h b/Source/Asura.Engine/Containers/String.h index 3c806fb..4739b44 100644 --- a/Source/Asura.Engine/Containers/String.h +++ b/Source/Asura.Engine/Containers/String.h @@ -1,5 +1,5 @@ -#ifndef __AE_STRING_H__ -#define __AE_STRING_H__ +#ifndef __ASURA_ENGINE_STRING_H__ +#define __ASURA_ENGINE_STRING_H__ #include <string> diff --git a/Source/Asura.Engine/Containers/StringMap.hpp b/Source/Asura.Engine/Containers/StringMap.hpp index 94858a7..208f16b 100644 --- a/Source/Asura.Engine/Containers/StringMap.hpp +++ b/Source/Asura.Engine/Containers/StringMap.hpp @@ -1,5 +1,5 @@ -#ifndef __AE_STRINGMAP_H__ -#define __AE_STRINGMAP_H__ +#ifndef __ASURA_ENGINE_STRINGMAP_H__ +#define __ASURA_ENGINE_STRINGMAP_H__ #include "String.h" diff --git a/Source/Asura.Engine/Containers/Vector.hpp b/Source/Asura.Engine/Containers/Vector.hpp index 9fbd52a..5824b57 100644 --- a/Source/Asura.Engine/Containers/Vector.hpp +++ b/Source/Asura.Engine/Containers/Vector.hpp @@ -1,5 +1,5 @@ -#ifndef __AE_VECTOR_HPP__ -#define __AE_VECTOR_HPP__ +#ifndef __ASURA_ENGINE_VECTOR_HPP__ +#define __ASURA_ENGINE_VECTOR_HPP__ #include <vector> diff --git a/Source/Asura.Engine/Factory.h b/Source/Asura.Engine/Factory.h index 0cccab2..bc536d7 100644 --- a/Source/Asura.Engine/Factory.h +++ b/Source/Asura.Engine/Factory.h @@ -1,5 +1,5 @@ -#ifndef __AE_FACTORY_H__ -#define __AE_FACTORY_H__ +#ifndef __ASURA_ENGINE_FACTORY_H__ +#define __ASURA_ENGINE_FACTORY_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/FileSystem/Asset.cpp b/Source/Asura.Engine/FileSystem/Asset.cpp deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Engine/FileSystem/Asset.cpp +++ /dev/null diff --git a/Source/Asura.Engine/FileSystem/Asset.h b/Source/Asura.Engine/FileSystem/Asset.h deleted file mode 100644 index e96d36b..0000000 --- a/Source/Asura.Engine/FileSystem/Asset.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __AE_ASSET_H__ -#define __AE_ASSET_H__ - -#include "Object.h" - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// AssetΪһassetļжȡ - /// - class Asset : public Object - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/Loader.cpp b/Source/Asura.Engine/FileSystem/Loader.cpp deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Engine/FileSystem/Loader.cpp +++ /dev/null diff --git a/Source/Asura.Engine/FileSystem/Loader.h b/Source/Asura.Engine/FileSystem/Loader.h deleted file mode 100644 index 2846c69..0000000 --- a/Source/Asura.Engine/FileSystem/Loader.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __AE_LOADER_H__ -#define __AE_LOADER_H__ - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// Դloader - /// - class Loader - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h index dbb274a..67d7a63 100644 --- a/Source/Asura.Engine/Graphics/Canvas.h +++ b/Source/Asura.Engine/Graphics/Canvas.h @@ -1,7 +1,6 @@ -#ifndef __AE_CANVAS_H__ -#define __AE_CANVAS_H__ +#ifndef __ASURA_ENGINE_CANVAS_H__ +#define __ASURA_ENGINE_CANVAS_H__ -#include "Component.h" #include "Texture.h" namespace AsuraEngine @@ -9,7 +8,7 @@ namespace AsuraEngine namespace Graphics { - class Canvas : public Texture, public Component + class Canvas : public Texture { public: @@ -17,7 +16,8 @@ namespace AsuraEngine private: - + // AsuraEngine.SimCanvas + LUAX_DECL_FACTORY(SimCanvas); }; diff --git a/Source/Asura.Engine/Graphics/Color.h b/Source/Asura.Engine/Graphics/Color.h index f172156..40b55e4 100644 --- a/Source/Asura.Engine/Graphics/Color.h +++ b/Source/Asura.Engine/Graphics/Color.h @@ -1,5 +1,5 @@ -#ifndef __AE_COLOR_H__ -#define __AE_COLOR_H__ +#ifndef __ASURA_ENGINE_COLOR_H__ +#define __ASURA_ENGINE_COLOR_H__ #include "Type.h" @@ -18,9 +18,11 @@ namespace AsuraEngine Color(byte r, byte g, byte b, byte a); ~Color(); + byte r, g, b, a; + private: - byte mR, mG, mB, mA; + LUAX_DECL_FACTORY(Color); }; diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h index fc013e3..e0715dc 100644 --- a/Source/Asura.Engine/Graphics/Image.h +++ b/Source/Asura.Engine/Graphics/Image.h @@ -1,6 +1,8 @@ -#ifndef __AE_IMAGE_H__ -#define __AE_IMAGE_H__ +#ifndef __ASURA_ENGINE_IMAGE_H__ +#define __ASURA_ENGINE_IMAGE_H__ +#include "Containers/Map.h" +#include "Containers/StringMap.hpp" #include "Containers/String.h" #include "Math/Vector2.h" #include "Manager.hpp" @@ -19,7 +21,7 @@ namespace AsuraEngine /// ImageͼƬڴȡϷĽһImageڴ桢ԴֻᱣһݣҪ /// imageêλãźתǶȣʹspriteһֻࡣ /// - class Image final : public Texture, public Filesystem::Asset + class Image final : public Texture { public: diff --git a/Source/Asura.Engine/Graphics/Mesh2D.h b/Source/Asura.Engine/Graphics/Mesh2D.h index a113f4c..632b04a 100644 --- a/Source/Asura.Engine/Graphics/Mesh2D.h +++ b/Source/Asura.Engine/Graphics/Mesh2D.h @@ -1,5 +1,5 @@ -#ifndef __AE_MESH2D_H__ -#define __AE_MESH2D_H__ +#ifndef __ASURA_ENGINE_MESH2D_H__ +#define __ASURA_ENGINE_MESH2D_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Graphics/OpenGL.h b/Source/Asura.Engine/Graphics/OpenGL.h index f46497b..34d662b 100644 --- a/Source/Asura.Engine/Graphics/OpenGL.h +++ b/Source/Asura.Engine/Graphics/OpenGL.h @@ -1,5 +1,5 @@ -#ifndef __AE_OPENGL_H__ -#define __AE_OPENGL_H__ +#ifndef __ASURA_ENGINE_OPENGL_H__ +#define __ASURA_ENGINE_OPENGL_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h index c3c67ad..aa5bd53 100644 --- a/Source/Asura.Engine/Graphics/Shader.h +++ b/Source/Asura.Engine/Graphics/Shader.h @@ -1,9 +1,8 @@ -#ifndef __AE_SHADER_H__ -#define __AE_SHADER_H__ +#ifndef __ASURA_ENGINE_SHADER_H__ +#define __ASURA_ENGINE_SHADER_H__ #include "luax/luax.h" -#include "FileSystem/Asset.h" #include "Containers/Map.h" #include "Containers/StringMap.hpp" #include "Object.h" @@ -20,7 +19,7 @@ namespace AsuraEngine /// /// һshaderһڲʼ乲ijShaderuniformsͶݣֻuniforms location /// - class Shader final : public Filesystem::Asset + class Shader { public: diff --git a/Source/Asura.Engine/Graphics/Texture.h b/Source/Asura.Engine/Graphics/Texture.h index 8195fc9..b50467a 100644 --- a/Source/Asura.Engine/Graphics/Texture.h +++ b/Source/Asura.Engine/Graphics/Texture.h @@ -1,7 +1,8 @@ -#ifndef __AE_TEXTURE_H__ -#define __AE_TEXTURE_H__ +#ifndef __ASURA_ENGINE_TEXTURE_H__ +#define __ASURA_ENGINE_TEXTURE_H__ #include "Object.h" +#include "Luax/luax.h" namespace AsuraEngine { diff --git a/Source/Asura.Engine/Graphics/Window.h b/Source/Asura.Engine/Graphics/Window.h index ab612fc..0f6ca92 100644 --- a/Source/Asura.Engine/Graphics/Window.h +++ b/Source/Asura.Engine/Graphics/Window.h @@ -1,5 +1,5 @@ -#ifndef __AE_WINDOW_H__ -#define __AE_WINDOW_H__ +#ifndef __ASURA_ENGINE_WINDOW_H__ +#define __ASURA_ENGINE_WINDOW_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Manager.hpp b/Source/Asura.Engine/Manager.hpp index 5a94889..fb32491 100644 --- a/Source/Asura.Engine/Manager.hpp +++ b/Source/Asura.Engine/Manager.hpp @@ -1,5 +1,5 @@ -#ifndef __AE_MANAGER_H__ -#define __AE_MANAGER_H__ +#ifndef __ASURA_ENGINE_MANAGER_H__ +#define __ASURA_ENGINE_MANAGER_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Math/Matrix44.h b/Source/Asura.Engine/Math/Matrix44.h index 5bc44e7..2741430 100644 --- a/Source/Asura.Engine/Math/Matrix44.h +++ b/Source/Asura.Engine/Math/Matrix44.h @@ -1,5 +1,5 @@ -#ifndef __AE_MATRIX44_H__ -#define __AE_MATRIX44_H__ +#ifndef __ASURA_ENGINE_MATRIX44_H__ +#define __ASURA_ENGINE_MATRIX44_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Math/Vector2.h b/Source/Asura.Engine/Math/Vector2.h index d5f8739..99fe71b 100644 --- a/Source/Asura.Engine/Math/Vector2.h +++ b/Source/Asura.Engine/Math/Vector2.h @@ -1,5 +1,5 @@ -#ifndef __AE_VECTOR2_H__ -#define __AE_VECTOR2_H__ +#ifndef __ASURA_ENGINE_VECTOR2_H__ +#define __ASURA_ENGINE_VECTOR2_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Math/Vector3.h b/Source/Asura.Engine/Math/Vector3.h index 14fdd88..f450527 100644 --- a/Source/Asura.Engine/Math/Vector3.h +++ b/Source/Asura.Engine/Math/Vector3.h @@ -1,5 +1,5 @@ -#ifndef __AE_VECTOR3_H__ -#define __AE_VECTOR3_H__ +#ifndef __ASURA_ENGINE_VECTOR3_H__ +#define __ASURA_ENGINE_VECTOR3_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Math/Vector4.h b/Source/Asura.Engine/Math/Vector4.h index a6e8b38..818274e 100644 --- a/Source/Asura.Engine/Math/Vector4.h +++ b/Source/Asura.Engine/Math/Vector4.h @@ -1,5 +1,5 @@ -#ifndef __AE_VECTOR4_H__ -#define __AE_VECTOR4_H__ +#ifndef __ASURA_ENGINE_VECTOR4_H__ +#define __ASURA_ENGINE_VECTOR4_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Object.h b/Source/Asura.Engine/Object.h index 3dace26..7efe74b 100644 --- a/Source/Asura.Engine/Object.h +++ b/Source/Asura.Engine/Object.h @@ -1,5 +1,5 @@ -#ifndef __AE_OBJECT_H__ -#define __AE_OBJECT_H__ +#ifndef __ASURA_ENGINE_OBJECT_H__ +#define __ASURA_ENGINE_OBJECT_H__ #include "Type.h" diff --git a/Source/Asura.Engine/Physics/World.h b/Source/Asura.Engine/Physics/World.h index 7000351..ffdc44b 100644 --- a/Source/Asura.Engine/Physics/World.h +++ b/Source/Asura.Engine/Physics/World.h @@ -1,5 +1,5 @@ -#ifndef __AE_WORLD_H__ -#define __AE_WORLD_H__ +#ifndef __ASURA_ENGINE_WORLD_H__ +#define __ASURA_ENGINE_WORLD_H__ namespace AsuraEngine { diff --git a/Source/Asura.Engine/Scripting/Luax.hpp b/Source/Asura.Engine/Scripting/Luax.hpp index b371166..461d5bc 100644 --- a/Source/Asura.Engine/Scripting/Luax.hpp +++ b/Source/Asura.Engine/Scripting/Luax.hpp @@ -1,5 +1,5 @@ -#ifndef __AE_LUAX_H__ -#define __AE_LUAX_H__ +#ifndef __ASURA_ENGINE_LUAX_H__ +#define __ASURA_ENGINE_LUAX_H__ #include "Lua51/lua.h" #include "Lua51/lauxlib.h" diff --git a/Source/Asura.Engine/Type.h b/Source/Asura.Engine/Type.h index 2a2bc70..36ee9e7 100644 --- a/Source/Asura.Engine/Type.h +++ b/Source/Asura.Engine/Type.h @@ -1,5 +1,5 @@ -#ifndef __AE_TYPE_H__ -#define __AE_TYPE_H__ +#ifndef __ASURA_ENGINE_TYPE_H__ +#define __ASURA_ENGINE_TYPE_H__ #include <stdint.h> |