From 84bce16954e71416da93fe0a8c9342a5fe27b54c Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 17 Jun 2019 23:51:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=86=85=E7=BD=AE=E5=87=A0?=
 =?UTF-8?q?=E4=BD=95=E4=BD=93=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/hgl/graph/InlineGeometry.h    |  8 ++++----
 src/SceneGraph/CMakeLists.txt     |  1 +
 src/SceneGraph/InlineGeometry.cpp | 12 ++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/inc/hgl/graph/InlineGeometry.h b/inc/hgl/graph/InlineGeometry.h
index 8e2fbf0e..b2706e9f 100644
--- a/inc/hgl/graph/InlineGeometry.h
+++ b/inc/hgl/graph/InlineGeometry.h
@@ -19,7 +19,7 @@ namespace hgl
             RectScope2f scope;
         };//struct RectangleCreateInfo
 
-        vulkan::Renderable *CreateRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci);
+        vulkan::Renderable *CreateRenderableRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci);
 
         /**
          * 圆角矩形创建信息
@@ -30,7 +30,7 @@ namespace hgl
             uint32_t round_per;     ///<圆角精度
         };//struct RoundRectangleCreateInfo:public RectangleCreateInfo
 
-        vulkan::Renderable *CreateRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci);
+        vulkan::Renderable *CreateRenderableRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci);
 
         /**
          * 圆形创建信息
@@ -42,7 +42,7 @@ namespace hgl
             uint field_count;           ///<分段次数
         };//struct CircleCreateInfo
 
-        vulkan::Renderable *CreateCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *rci);
+        vulkan::Renderable *CreateRenderableCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *rci);
 
         /**
          * 平面网格创建信息
@@ -65,7 +65,7 @@ namespace hgl
             Vector2f tile;
         };//struct PlaneCreateInfo
 
-        vulkan::Renderable *CreatePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci);
+        vulkan::Renderable *CreateRenderablePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci);
 
         struct CubeCreateInfo
         {
diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt
index c6296e3f..6693bb41 100644
--- a/src/SceneGraph/CMakeLists.txt
+++ b/src/SceneGraph/CMakeLists.txt
@@ -22,6 +22,7 @@ SET(SCENE_GRAPH_SOURCE  AABox.cpp
                         SceneNode.cpp
                         SceneOrient.cpp
                         InlineGeometry.cpp
+						#InlinePipeline.cpp
                         #Material.cpp
                         #Mesh.cpp
                         #SceneFile.cpp
diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp
index 9fa54d64..15865678 100644
--- a/src/SceneGraph/InlineGeometry.cpp
+++ b/src/SceneGraph/InlineGeometry.cpp
@@ -139,7 +139,7 @@ namespace hgl
             using GeometryCreater2D=GeometryCreater<VB2f>;
         }//namespace
 
-        vulkan::Renderable *CreateRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci)
+        vulkan::Renderable *CreateRenderableRectangle(SceneDB *db,vulkan::Material *mtl,const RectangleCreateInfo *rci)
         {
             GeometryCreater2D gc(db,mtl);
 
@@ -153,7 +153,7 @@ namespace hgl
             return gc.Finish();
         }
 
-        vulkan::Renderable *CreateRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci)
+        vulkan::Renderable *CreateRenderableRoundRectangle(SceneDB *db,vulkan::Material *mtl,const RoundRectangleCreateInfo *rci)
         {
             GeometryCreater2D gc(db,mtl);
 
@@ -229,7 +229,7 @@ namespace hgl
             return gc.Finish();
         }
 
-        vulkan::Renderable *CreateCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *cci)
+        vulkan::Renderable *CreateRenderableCircle(SceneDB *db,vulkan::Material *mtl,const CircleCreateInfo *cci)
         {
             GeometryCreater2D gc(db,mtl);
 
@@ -253,7 +253,7 @@ namespace hgl
             return gc.Finish();
         }
 
-        vulkan::Renderable *CreatePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci)
+        vulkan::Renderable *CreateRenderablePlaneGrid(SceneDB *db,vulkan::Material *mtl,const PlaneGridCreateInfo *pgci)
         {
             GeometryCreater3D gc(db,mtl);
 
@@ -300,7 +300,7 @@ namespace hgl
             return gc.Finish();
         }
 
-        vulkan::Renderable *CreatePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci)
+        vulkan::Renderable *CreateRenderablePlane(SceneDB *db,vulkan::Material *mtl,const PlaneCreateInfo *pci)
         {
             const   float       xy_vertices [] = { -0.5f,-0.5f,0.0f,  +0.5f,-0.5f,0.0f,    -0.5f,+0.5f,0.0f,   +0.5f,+0.5f,0.0f};
                     float       xy_tex_coord[] = {  0.0f, 0.0f,        1.0f,0.0f,           0.0f,1.0f,          1.0f, 1.0f};
@@ -341,7 +341,7 @@ namespace hgl
             return gc.Finish();
         }
 
-        vulkan::Renderable *CreateCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci)
+        vulkan::Renderable *CreateRenderableCube(SceneDB *db,vulkan::Material *mtl,const CubeCreateInfo *cci)
         {                              // Points of a cube.
             /*     4            5 */    const float points[]={  -0.5f, -0.5f, -0.5f,    -0.5f, -0.5f, +0.5f,    +0.5f, -0.5f, +0.5f,    +0.5f, -0.5f, -0.5f,    -0.5f, +0.5f, -0.5f,    -0.5f, +0.5f, +0.5f,
             /*     *------------* */                            +0.5f, +0.5f, +0.5f,    +0.5f, +0.5f, -0.5f,    -0.5f, -0.5f, -0.5f,    -0.5f, +0.5f, -0.5f,    +0.5f, +0.5f, -0.5f,    +0.5f, -0.5f, -0.5f,