From 0c65330f29d214cdfd810e83096669c5f2c20bee Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 20 Jan 2019 19:42:03 +0800
Subject: *misc

---
 Source/Asura.Engine/FileSystem/Loader.cpp |  0
 Source/Asura.Engine/FileSystem/Loader.h   | 20 ++++++++++++++++++++
 Source/Asura.Engine/GUI/Button.cpp        |  0
 Source/Asura.Engine/GUI/README.md         |  1 -
 Source/Asura.Engine/Graphics/Canvas.h     |  7 +++++++
 Source/Asura.Engine/Graphics/Material.h   |  4 ++--
 Source/Asura.Engine/Graphics/Shape.cpp    |  0
 Source/Asura.Engine/Graphics/Shape.h      |  0
 8 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 Source/Asura.Engine/FileSystem/Loader.cpp
 create mode 100644 Source/Asura.Engine/FileSystem/Loader.h
 delete mode 100644 Source/Asura.Engine/GUI/Button.cpp
 delete mode 100644 Source/Asura.Engine/GUI/README.md
 create mode 100644 Source/Asura.Engine/Graphics/Shape.cpp
 create mode 100644 Source/Asura.Engine/Graphics/Shape.h

(limited to 'Source/Asura.Engine')

diff --git a/Source/Asura.Engine/FileSystem/Loader.cpp b/Source/Asura.Engine/FileSystem/Loader.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Asura.Engine/FileSystem/Loader.h b/Source/Asura.Engine/FileSystem/Loader.h
new file mode 100644
index 0000000..2846c69
--- /dev/null
+++ b/Source/Asura.Engine/FileSystem/Loader.h
@@ -0,0 +1,20 @@
+#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/GUI/Button.cpp b/Source/Asura.Engine/GUI/Button.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Source/Asura.Engine/GUI/README.md b/Source/Asura.Engine/GUI/README.md
deleted file mode 100644
index 3e367c7..0000000
--- a/Source/Asura.Engine/GUI/README.md
+++ /dev/null
@@ -1 +0,0 @@
-immediate mode game gui
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h
index cd78194..7f70e7c 100644
--- a/Source/Asura.Engine/Graphics/Canvas.h
+++ b/Source/Asura.Engine/Graphics/Canvas.h
@@ -11,6 +11,13 @@ namespace AsuraEngine
 		
 		class Canvas : public Texture, public Component
 		{
+        public:
+
+
+
+        private:
+
+
 			
         };
 		
diff --git a/Source/Asura.Engine/Graphics/Material.h b/Source/Asura.Engine/Graphics/Material.h
index 1cb3c88..68dfa1e 100644
--- a/Source/Asura.Engine/Graphics/Material.h
+++ b/Source/Asura.Engine/Graphics/Material.h
@@ -160,13 +160,13 @@ namespace AsuraEngine
             ///
             /// 所有的image
             ///
-            Containers::Map<uint, Image*> mImages;
+            Containers::Map<uint, Material*> mMaterials;
 
             ///
             /// image，路径和ID的映射。针对从.asr导入的image，通过路径可以拿到image。所以并不是所有的image都在此map中。
             /// 由程序创建的image只能通过ID来获取，所以程序中需要保留ID。
             ///
-            Containers::StringMap<uint> mImageIDs;
+            Containers::StringMap<uint> mMaterialIDs;
 
         };
 
diff --git a/Source/Asura.Engine/Graphics/Shape.cpp b/Source/Asura.Engine/Graphics/Shape.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Asura.Engine/Graphics/Shape.h b/Source/Asura.Engine/Graphics/Shape.h
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.1-26-g67d0