From ce5343ec4e5766f6a7485649f7395d4e072bd706 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 28 Jan 2019 08:57:31 +0800
Subject: *misc

---
 Source/Asura.Engine/Graphics/Canvas.h  | 10 +++++-----
 Source/Asura.Engine/Graphics/Color.h   |  8 +++++---
 Source/Asura.Engine/Graphics/Image.h   |  8 +++++---
 Source/Asura.Engine/Graphics/Mesh2D.h  |  4 ++--
 Source/Asura.Engine/Graphics/OpenGL.h  |  4 ++--
 Source/Asura.Engine/Graphics/Shader.h  |  7 +++----
 Source/Asura.Engine/Graphics/Texture.h |  5 +++--
 Source/Asura.Engine/Graphics/Window.h  |  4 ++--
 8 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'Source/Asura.Engine/Graphics')

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是一个在材质间共享的程序。Shader本身不保存uniforms和顶点数据，只保存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
 {
-- 
cgit v1.1-26-g67d0