diff options
Diffstat (limited to 'source/modules/asura-core/Graphics')
23 files changed, 55 insertions, 55 deletions
diff --git a/source/modules/asura-core/Graphics/BlendMode.h b/source/modules/asura-core/Graphics/BlendMode.h index 7a31eed..fb17b45 100644 --- a/source/modules/asura-core/Graphics/BlendMode.h +++ b/source/modules/asura-core/Graphics/BlendMode.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_BLEND_MODE_H_ #define _ASURA_ENGINE_BLEND_MODE_H_ -#include <asura-utils/Classes.h> +#include <asura-base/Classes.h> namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Canvas.h b/source/modules/asura-core/Graphics/Canvas.h index 0ec55bc..de02b9d 100644 --- a/source/modules/asura-core/Graphics/Canvas.h +++ b/source/modules/asura-core/Graphics/Canvas.h @@ -1,10 +1,10 @@ #ifndef _ASURA_ENGINE_CANVAS_H_ #define _ASURA_ENGINE_CANVAS_H_ -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/Math/Rect.hpp> -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Exceptions/Exception.h> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/Math/Rect.hpp> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Exception.h> #include "GfxDevice.h" #include "Texture.h" diff --git a/source/modules/asura-core/Graphics/Color.h b/source/modules/asura-core/Graphics/Color.h index a16f17d..c81b601 100644 --- a/source/modules/asura-core/Graphics/Color.h +++ b/source/modules/asura-core/Graphics/Color.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR_H_ #define _ASURA_ENGINE_COLOR_H_ -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/Classes.h> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/Classes.h> #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/Color32.h b/source/modules/asura-core/Graphics/Color32.h index aa445fe..4dbfe2d 100644 --- a/source/modules/asura-core/Graphics/Color32.h +++ b/source/modules/asura-core/Graphics/Color32.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_COLOR32_H__ #define _ASURA_ENGINE_COLOR32_H__ -#include <asura-utils/Classes.h> -#include <asura-utils/Scripting/Portable.hpp> +#include <asura-base/Classes.h> +#include <asura-base/Scripting/Scripting.h> #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/DrawInfo.h b/source/modules/asura-core/Graphics/DrawInfo.h index 9042f2f..0082102 100644 --- a/source/modules/asura-core/Graphics/DrawInfo.h +++ b/source/modules/asura-core/Graphics/DrawInfo.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_DRAWINFO_H_ #define _ASURA_ENGINE_DRAWINFO_H_ -#include <asura-utils/Classes.h> +#include <asura-base/Classes.h> namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/GPUBuffer.h b/source/modules/asura-core/Graphics/GPUBuffer.h index 0aa3c29..565db17 100644 --- a/source/modules/asura-core/Graphics/GPUBuffer.h +++ b/source/modules/asura-core/Graphics/GPUBuffer.h @@ -1,9 +1,9 @@ #ifndef _ASURA_GPU_BUFFER_H_ #define _ASURA_GPU_BUFFER_H_ -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/Exceptions/Exception.h> -#include <asura-utils/type.h> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/Exception.h> +#include <asura-base/type.h> #include "GfxDevice.h" diff --git a/source/modules/asura-core/Graphics/GfxDevice.cpp b/source/modules/asura-core/Graphics/GfxDevice.cpp index ea95f54..529a76c 100644 --- a/source/modules/asura-core/Graphics/GfxDevice.cpp +++ b/source/modules/asura-core/Graphics/GfxDevice.cpp @@ -1,4 +1,4 @@ -#include <asura-utils/type.h> +#include <asura-base/type.h> #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/GfxDevice.h b/source/modules/asura-core/Graphics/GfxDevice.h index 02c7392..2b105df 100644 --- a/source/modules/asura-core/Graphics/GfxDevice.h +++ b/source/modules/asura-core/Graphics/GfxDevice.h @@ -5,10 +5,10 @@ #include <glad/glad.h> -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/Math/Rect.hpp> -#include <asura-utils/Math/matrix44.h> -#include <asura-utils/Math/vector4.h> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/Math/Rect.hpp> +#include <asura-base/Math/matrix44.h> +#include <asura-base/Math/vector4.h> #include "Color.h" #include "MatrixStack.h" diff --git a/source/modules/asura-core/Graphics/GraphicsHelper.h b/source/modules/asura-core/Graphics/GraphicsHelper.h index b93756a..3125292 100644 --- a/source/modules/asura-core/Graphics/GraphicsHelper.h +++ b/source/modules/asura-core/Graphics/GraphicsHelper.h @@ -1,7 +1,7 @@ #ifndef _ASURA_GRAPHICS_HELPER_H_ #define _ASURA_GRAPHICS_HELPER_H_ -#include <asura-utils/Classes.h> +#include <asura-base/Classes.h> namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Image.cpp b/source/modules/asura-core/Graphics/Image.cpp index d2b2ec9..36d2478 100644 --- a/source/modules/asura-core/Graphics/Image.cpp +++ b/source/modules/asura-core/Graphics/Image.cpp @@ -1,4 +1,4 @@ -#include <asura-utils/Exceptions/Exception.h> +#include <asura-base/Exception.h> #include "../CoreConfig.h" @@ -6,7 +6,7 @@ #include "Image.h" #include "GfxDevice.h" -using namespace AEIO; +using namespace AEFileSystem; using namespace AEImage; namespace_begin(AsuraEngine) diff --git a/source/modules/asura-core/Graphics/Image.h b/source/modules/asura-core/Graphics/Image.h index 5cbfe23..a76d06f 100644 --- a/source/modules/asura-core/Graphics/Image.h +++ b/source/modules/asura-core/Graphics/Image.h @@ -2,12 +2,12 @@ #define _ASURA_ENGINE_IMAGE_H_ // asura modules -#include <asura-utils/Math/Rect.hpp> -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/IO/Renewable.h> -#include <asura-utils/Stringmap.hpp> -#include <asura-utils/Manager.hpp> +#include <asura-base/Math/Rect.hpp> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/FileSystem/Renewable.h> +#include <asura-base/Utilities/Stringmap.hpp> +#include <asura-base/Manager.hpp> // module #include "../Image/ImageData.h" diff --git a/source/modules/asura-core/Graphics/IndexBuffer.h b/source/modules/asura-core/Graphics/IndexBuffer.h index 73a6f9b..b7886b7 100644 --- a/source/modules/asura-core/Graphics/IndexBuffer.h +++ b/source/modules/asura-core/Graphics/IndexBuffer.h @@ -1,7 +1,7 @@ #ifndef _ASURA_INDEX_BUFFER_H_ #define _ASURA_INDEX_BUFFER_H_ -#include <asura-utils/Scripting/Portable.hpp> +#include <asura-base/Scripting/Scripting.h> #include "GPUBuffer.h" diff --git a/source/modules/asura-core/Graphics/MatrixStack.h b/source/modules/asura-core/Graphics/MatrixStack.h index 867011e..8dd56bf 100644 --- a/source/modules/asura-core/Graphics/MatrixStack.h +++ b/source/modules/asura-core/Graphics/MatrixStack.h @@ -1,9 +1,9 @@ #ifndef _ASURA_MATRIX_STACK_H_ #define _ASURA_MATRIX_STACK_H_ -#include <asura-utils/Type.h> -#include <asura-utils/Math/Matrix44.h> -#include <asura-utils/Classes.h> +#include <asura-base/Type.h> +#include <asura-base/Math/Matrix44.h> +#include <asura-base/Classes.h> namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/Mesh2D.h b/source/modules/asura-core/Graphics/Mesh2D.h index 1546765..7a0f62e 100644 --- a/source/modules/asura-core/Graphics/Mesh2D.h +++ b/source/modules/asura-core/Graphics/Mesh2D.h @@ -5,8 +5,8 @@ #include <vector> // asura modules -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/Math/Vector2.hpp> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/Math/Vector2.hpp> // module #include "../Mesh/Mesh2dData.h" diff --git a/source/modules/asura-core/Graphics/RenderState.h b/source/modules/asura-core/Graphics/RenderState.h index 5dcf12d..23804d8 100644 --- a/source/modules/asura-core/Graphics/RenderState.h +++ b/source/modules/asura-core/Graphics/RenderState.h @@ -1,8 +1,8 @@ #ifndef _ASURA_ENGINE_RENDER_STATE_H_ #define _ASURA_ENGINE_RENDER_STATE_H_ -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Math/Transform.h> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Math/Transform.h> #include "BlendMode.h" diff --git a/source/modules/asura-core/Graphics/RenderTarget.h b/source/modules/asura-core/Graphics/RenderTarget.h index bcd7276..ab09e35 100644 --- a/source/modules/asura-core/Graphics/RenderTarget.h +++ b/source/modules/asura-core/Graphics/RenderTarget.h @@ -1,9 +1,9 @@ #ifndef _ASURA_ENGINE_RENDERTARGET_H_ #define _ASURA_ENGINE_RENDERTARGET_H_ -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Math/Rect.hpp> -#include <asura-utils/Scripting/Portable.hpp> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Math/Rect.hpp> +#include <asura-base/Scripting/Scripting.h> #include "Texture.h" #include "Color.h" diff --git a/source/modules/asura-core/Graphics/Shader.cpp b/source/modules/asura-core/Graphics/Shader.cpp index 30e0161..329b3f1 100644 --- a/source/modules/asura-core/Graphics/Shader.cpp +++ b/source/modules/asura-core/Graphics/Shader.cpp @@ -1,4 +1,4 @@ -#include <asura-utils/Exceptions/Exception.h> +#include <asura-base/Exception.h> #include "GfxDevice.h" #include "Shader.h" diff --git a/source/modules/asura-core/Graphics/Shader.h b/source/modules/asura-core/Graphics/Shader.h index c96b99f..615b028 100644 --- a/source/modules/asura-core/Graphics/Shader.h +++ b/source/modules/asura-core/Graphics/Shader.h @@ -4,15 +4,15 @@ #include <map> #include <string> -#include <asura-utils/Exceptions/Exception.h> -#include <asura-utils/Scripting/Portable.hpp> -#include <asura-utils/IO/Renewable.h> -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Math/vector3.hpp> -#include <asura-utils/Math/vector4.h> -#include <asura-utils/Math/matrix44.h> -#include <asura-utils/Stringmap.hpp> -#include <asura-utils/Manager.hpp> +#include <asura-base/Exception.h> +#include <asura-base/Scripting/Scripting.h> +#include <asura-base/FileSystem/Renewable.h> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Math/vector3.hpp> +#include <asura-base/Math/vector4.h> +#include <asura-base/Math/matrix44.h> +#include <asura-base/Utilities/Stringmap.hpp> +#include <asura-base/Manager.hpp> #include "GfxDevice.h" #include "Color.h" @@ -30,7 +30,7 @@ namespace_begin(Graphics) /// class Shader ASURA_FINAL : public Scripting::Portable<Shader> - , public AEIO::Renewable + , public AEFileSystem::Renewable { public: diff --git a/source/modules/asura-core/Graphics/SpriteBatch.h b/source/modules/asura-core/Graphics/SpriteBatch.h index a98d1f4..30cb56c 100644 --- a/source/modules/asura-core/Graphics/SpriteBatch.h +++ b/source/modules/asura-core/Graphics/SpriteBatch.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_SPRITE_BATCH_H_ #define _ASURA_ENGINE_SPRITE_BATCH_H_ -#include <asura-utils/Scripting/Portable.hpp> +#include <asura-base/Scripting/Scripting.h> #include "GPUBuffer.h" diff --git a/source/modules/asura-core/Graphics/Texture.cpp b/source/modules/asura-core/Graphics/Texture.cpp index bae0f7c..03f005d 100644 --- a/source/modules/asura-core/Graphics/Texture.cpp +++ b/source/modules/asura-core/Graphics/Texture.cpp @@ -1,4 +1,4 @@ -#include <asura-utils/Exceptions/Exception.h> +#include <asura-base/Exception.h> #include "Texture.h" diff --git a/source/modules/asura-core/Graphics/Texture.h b/source/modules/asura-core/Graphics/Texture.h index 7d37c31..76b9a8f 100644 --- a/source/modules/asura-core/Graphics/Texture.h +++ b/source/modules/asura-core/Graphics/Texture.h @@ -1,8 +1,8 @@ #ifndef _ASURA_TEXTURE_H_ #define _ASURA_TEXTURE_H_ -#include <asura-utils/Math/Vector2.hpp> -#include <asura-utils/Math/Rect.hpp> +#include <asura-base/Math/Vector2.hpp> +#include <asura-base/Math/Rect.hpp> #include "../CoreConfig.h" diff --git a/source/modules/asura-core/Graphics/VBO.h b/source/modules/asura-core/Graphics/VBO.h index 80f405f..f80991e 100644 --- a/source/modules/asura-core/Graphics/VBO.h +++ b/source/modules/asura-core/Graphics/VBO.h @@ -1,7 +1,7 @@ #ifndef _ASURA_ENGINE_VBO_H_ #define _ASURA_ENGINE_VBO_H_ -#include <asura-utils/Classes.h> +#include <asura-base/Classes.h> namespace_begin(AsuraEngine) namespace_begin(Graphics) diff --git a/source/modules/asura-core/Graphics/VertexBuffer.h b/source/modules/asura-core/Graphics/VertexBuffer.h index 83e9b09..0622388 100644 --- a/source/modules/asura-core/Graphics/VertexBuffer.h +++ b/source/modules/asura-core/Graphics/VertexBuffer.h @@ -1,7 +1,7 @@ #ifndef _ASURA_VERTEX_BUFFER_H_ #define _ASURA_VERTEX_BUFFER_H_ -#include <asura-utils/Scripting/Portable.hpp> +#include <asura-base/Scripting/Scripting.h> #include "GPUBuffer.h" |