From 66c5fdc564dd892ed265132d6c1378dbe3cebcee Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 27 Mar 2019 09:07:54 +0800
Subject: *misc

---
 source/libs/asura-lib-core/graphics/shader.h | 51 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'source/libs/asura-lib-core/graphics/shader.h')

diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/libs/asura-lib-core/graphics/shader.h
index 65f214e..575a37e 100644
--- a/source/libs/asura-lib-core/graphics/shader.h
+++ b/source/libs/asura-lib-core/graphics/shader.h
@@ -4,18 +4,18 @@
 #include <map>
 #include <string>
 
-#include "FileSystem/Reloadable.h"
-#include "Scripting/Luax.hpp"
-#include "Math/Vector2.hpp"
-#include "Math/Vector3.hpp"
-#include "Math/Vector4.h"
-#include "Math/Matrix44.h"
-#include "StringMap.hpp"
-#include "scripting/portable.hpp"
-#include "Color.h"
-#include "Manager.hpp"
-#include "Texture.h"
-#include "GL.h"
+#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-lib-utils/io/reloadable.h>
+#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-lib-utils/math/vector3.hpp>
+#include <asura-lib-utils/math/vector4.h>
+#include <asura-lib-utils/math/matrix44.h>
+#include <asura-lib-utils/stringmap.hpp>
+#include <asura-lib-utils/manager.hpp>
+
+#include "color.h"
+#include "texture.h"
+#include "gl.h"
 
 namespace AsuraEngine
 {
@@ -28,7 +28,7 @@ namespace AsuraEngine
 		///
 		class Shader ASURA_FINAL
 			: public Scripting::Portable<Shader>
-			, public Filesystem::Reloadable
+			, public AEIO::Reloadable
 		{
 		public:
 
@@ -100,18 +100,19 @@ namespace AsuraEngine
 
 			LUAX_DECL_FACTORY(SimShader);
 
-			LUAX_DECL_METHOD(l_Use);
-			LUAX_DECL_METHOD(l_Unuse);
-			LUAX_DECL_METHOD(l_Load);
-			LUAX_DECL_METHOD(l_HasUniform);
-			LUAX_DECL_METHOD(l_GetUniformLocation);
-			LUAX_DECL_METHOD(l_SetBuiltInUniforms);
-			LUAX_DECL_METHOD(l_SetUniformFloat);
-			LUAX_DECL_METHOD(l_SetUniformTexture);
-			LUAX_DECL_METHOD(l_SetUniformVector2);
-			LUAX_DECL_METHOD(l_SetUniformVector3);
-			LUAX_DECL_METHOD(l_SetUniformVector4);
-			LUAX_DECL_METHOD(l_SetUniformColor);
+			LUAX_DECL_METHOD(_New);
+			LUAX_DECL_METHOD(_Use);
+			LUAX_DECL_METHOD(_Unuse);
+			LUAX_DECL_METHOD(_Load);
+			LUAX_DECL_METHOD(_HasUniform);
+			LUAX_DECL_METHOD(_GetUniformLocation);
+			LUAX_DECL_METHOD(_SetBuiltInUniforms);
+			LUAX_DECL_METHOD(_SetUniformFloat);
+			LUAX_DECL_METHOD(_SetUniformTexture);
+			LUAX_DECL_METHOD(_SetUniformVector2);
+			LUAX_DECL_METHOD(_SetUniformVector3);
+			LUAX_DECL_METHOD(_SetUniformVector4);
+			LUAX_DECL_METHOD(_SetUniformColor);
 
 		private:
 
-- 
cgit v1.1-26-g67d0