From e77cb00e893f7ce7d0c90773197ea0651f00a9b3 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Thu, 9 Jan 2020 17:40:39 +0800
Subject: [PATCH] redefine folder tree of material

---
 inc/hgl/graph/material/ComboMaterial.h                |  3 +++
 .../{MaterialComponent.h => material/Component.h}     |  7 +++++--
 inc/hgl/graph/{ => material}/Material.h               |  4 ++--
 inc/hgl/graph/{ => material}/MaterialData.h           |  0
 src/SceneGraph/CMakeLists.txt                         | 11 ++++++-----
 src/SceneGraph/{ => material}/Material.cpp            |  2 +-
 src/SceneGraph/{ => material}/MaterialComponent.cpp   |  4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 inc/hgl/graph/material/ComboMaterial.h
 rename inc/hgl/graph/{MaterialComponent.h => material/Component.h} (90%)
 rename inc/hgl/graph/{ => material}/Material.h (88%)
 rename inc/hgl/graph/{ => material}/MaterialData.h (100%)
 rename src/SceneGraph/{ => material}/Material.cpp (97%)
 rename src/SceneGraph/{ => material}/MaterialComponent.cpp (93%)

diff --git a/inc/hgl/graph/material/ComboMaterial.h b/inc/hgl/graph/material/ComboMaterial.h
new file mode 100644
index 00000000..1c26ab9f
--- /dev/null
+++ b/inc/hgl/graph/material/ComboMaterial.h
@@ -0,0 +1,3 @@
+#ifndef HGL_GRAPH_COMBO_MATERIAL_INCLUDE
+#define HGL_GRAPH_COMBO_MATERIAL_INCLUDE
+#endif//HGL_GRAPH_COMBO_MATERIAL_INCLUDE
diff --git a/inc/hgl/graph/MaterialComponent.h b/inc/hgl/graph/material/Component.h
similarity index 90%
rename from inc/hgl/graph/MaterialComponent.h
rename to inc/hgl/graph/material/Component.h
index 2aeacf3c..bd0cd714 100644
--- a/inc/hgl/graph/MaterialComponent.h
+++ b/inc/hgl/graph/material/Component.h
@@ -3,8 +3,11 @@
 
 #include<hgl/type/DataType.h>
 
-#define BEGIN_MATERIAL_NAMESPACE namespace hgl{namespace graph{namespace material{
-#define END_MATERIAL_NAMESPACE }}}
+#define BEGIN_MATERIAL_NAMESPACE    namespace hgl{namespace graph{namespace material{
+#define END_MATERIAL_NAMESPACE      }}}
+
+#define MATERIAL_NAMESPACE          hgl::graph::material
+#define USING_MATERIAL_NAMESPACE    using namespace MATERIAL_NAMESPACE;
 
 BEGIN_MATERIAL_NAMESPACE
     enum class Component
diff --git a/inc/hgl/graph/Material.h b/inc/hgl/graph/material/Material.h
similarity index 88%
rename from inc/hgl/graph/Material.h
rename to inc/hgl/graph/material/Material.h
index ca4b83db..c4666bf5 100644
--- a/inc/hgl/graph/Material.h
+++ b/inc/hgl/graph/material/Material.h
@@ -1,7 +1,7 @@
 #ifndef HGL_GRAPH_MATERIAL_INCLUDE
 #define HGL_GRAPH_MATERIAL_INCLUDE
 
-#include<hgl/graph/MaterialComponent.h>
+#include<hgl/graph/material/Component.h>
 BEGIN_MATERIAL_NAMESPACE
     enum class BlendMode
     {
@@ -15,7 +15,7 @@ BEGIN_MATERIAL_NAMESPACE
         BEGIN_RANGE =Opaque,
         END_RANGE   =PreMultiAlpha,
         RANGE_SIZE  =END_RANGE-BEGIN_RANGE+1
-    };//
+    };//enum class BlendMode
 
     class Material
     {
diff --git a/inc/hgl/graph/MaterialData.h b/inc/hgl/graph/material/MaterialData.h
similarity index 100%
rename from inc/hgl/graph/MaterialData.h
rename to inc/hgl/graph/material/MaterialData.h
diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt
index 617e65d9..affd9a30 100644
--- a/src/SceneGraph/CMakeLists.txt
+++ b/src/SceneGraph/CMakeLists.txt
@@ -1,10 +1,9 @@
-SET(SG_MATERIAL_SOURCE  ${ROOT_INCLUDE_PATH}/hgl/graph/MaterialComponent.h
-                        ${ROOT_INCLUDE_PATH}/hgl/graph/Material.h
+file(GLOB SG_MATERIAL_HEADER ${ROOT_INCLUDE_PATH}/hgl/graph/material/*.*)
 
-                        MaterialComponent.cpp
-                        Material.cpp)
+file(GLOB SG_MATERIAL_SOURCE material/*.*)
 
-SOURCE_GROUP("Material" FILES   ${SG_MATERIAL_SOURCE})
+SOURCE_GROUP("Material" FILES   ${SG_MATERIAL_HEADER}
+                                ${SG_MATERIAL_SOURCE})
 
 SET(SG_VERTEX_SOURCE    ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBufferCreater.h
                         ${ROOT_INCLUDE_PATH}/hgl/graph/VertexBuffer.h)
@@ -46,5 +45,7 @@ SOURCE_GROUP("Source Files" FILES ${SCENE_GRAPH_SOURCE})
 add_cm_library(ULRE.SceneGraph "ULRE"   ${SCENE_GRAPH_HEADER}
                                         ${SCENE_GRAPH_SOURCE}
 
+                                        ${SG_MATERIAL_HEADER}
                                         ${SG_MATERIAL_SOURCE}
+
                                         ${SG_VERTEX_SOURCE})
diff --git a/src/SceneGraph/Material.cpp b/src/SceneGraph/material/Material.cpp
similarity index 97%
rename from src/SceneGraph/Material.cpp
rename to src/SceneGraph/material/Material.cpp
index ed175174..9f113f88 100644
--- a/src/SceneGraph/Material.cpp
+++ b/src/SceneGraph/material/Material.cpp
@@ -1,4 +1,4 @@
-#include<hgl/graph/Material.h>
+#include<hgl/graph/material/Material.h>
 #include<hgl/io/FileInputStream.h>
 #include<hgl/io/DataInputStream.h>
 #include<hgl/log/LogInfo.h>
diff --git a/src/SceneGraph/MaterialComponent.cpp b/src/SceneGraph/material/MaterialComponent.cpp
similarity index 93%
rename from src/SceneGraph/MaterialComponent.cpp
rename to src/SceneGraph/material/MaterialComponent.cpp
index a11bfcb1..2b845f8e 100644
--- a/src/SceneGraph/MaterialComponent.cpp
+++ b/src/SceneGraph/material/MaterialComponent.cpp
@@ -1,4 +1,4 @@
-#include<hgl/graph/MaterialComponent.h>
+#include<hgl/graph/material/Component.h>
 
 BEGIN_MATERIAL_NAMESPACE
     namespace
@@ -35,7 +35,7 @@ BEGIN_MATERIAL_NAMESPACE
     const ComponentConfig *GetConfig(const enum class Component c)
     {
         if(c<=Component::BEGIN_RANGE
-            ||c>=Component::END_RANGE)return(nullptr);
+         ||c>=Component::END_RANGE)return(nullptr);
 
         return material_component_config_list+(uint)c;
     }