From 0c391fdbce5a079cf03e483eb6174dd47806163d Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 7 Aug 2019 21:08:47 +0800
Subject: *misc

---
 source/modules/asura-core/graphics/canvas.h    |  8 ++++----
 source/modules/asura-core/graphics/color.h     |  4 ++--
 source/modules/asura-core/graphics/color32.h   |  4 ++--
 source/modules/asura-core/graphics/image.cpp   |  4 ++--
 source/modules/asura-core/graphics/image.h     | 12 ++++++------
 source/modules/asura-core/graphics/mesh2d.h    |  4 ++--
 source/modules/asura-core/graphics/shader.cpp  |  2 +-
 source/modules/asura-core/graphics/shader.h    | 20 ++++++++++----------
 source/modules/asura-core/graphics/texture.cpp |  2 +-
 source/modules/asura-core/graphics/texture.h   |  4 ++--
 10 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'source/modules/asura-core/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/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/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/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/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"
 
-- 
cgit v1.1-26-g67d0