From 233523231e6baa9c39a8fcac90d86a870fbae543 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@gmail.com>
Date: Mon, 22 May 2023 21:26:43 +0800
Subject: [PATCH] Move the ShaderStageBind to the PrimitiveCreate inside, and
 renamed to PrimitiveVertexBuffer

---
 inc/hgl/graph/PrimitiveCreater.h    | 36 +++++++++++++-------------
 src/SceneGraph/PrimitiveCreater.cpp | 40 ++++++++++++++---------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/inc/hgl/graph/PrimitiveCreater.h b/inc/hgl/graph/PrimitiveCreater.h
index 61a7d862..a25fc059 100644
--- a/inc/hgl/graph/PrimitiveCreater.h
+++ b/inc/hgl/graph/PrimitiveCreater.h
@@ -8,28 +8,28 @@ namespace hgl
 {
     namespace graph
     {
-        struct ShaderStageBind
-        {
-            AnsiString      name;
-            uint            binding;
-            VAD *           data    =nullptr;
-            VBO *           vbo     =nullptr;
-
-        public:
-
-            ~ShaderStageBind()
-            {
-                SAFE_CLEAR(data);
-            }
-        };//struct ShaderStageBind
-
-        using ShaderStageBindMap=ObjectMap<AnsiString,ShaderStageBind>;
-
         /**
          * 可绘制图元创建器
          */
         class PrimitiveCreater
         {
+            struct PrimitiveVertexBuffer
+            {
+                AnsiString      name;
+                uint            binding;
+                VAD *           data    =nullptr;
+                VBO *           vbo     =nullptr;
+
+            public:
+
+                ~PrimitiveVertexBuffer()
+                {
+                    SAFE_CLEAR(data);
+                }
+            };//struct PrimitiveVertexBuffer
+
+            using PVBMap=ObjectMap<AnsiString,PrimitiveVertexBuffer>;
+
         protected:
 
             RenderResource *db;
@@ -42,7 +42,7 @@ namespace hgl
             uint32              vertices_number;
 
             IndexBuffer *       ibo;
-            ShaderStageBindMap  ssb_map;
+            PVBMap              vbo_map;
 
         public:
 
diff --git a/src/SceneGraph/PrimitiveCreater.cpp b/src/SceneGraph/PrimitiveCreater.cpp
index 7ef4d95c..1dd4d084 100644
--- a/src/SceneGraph/PrimitiveCreater.cpp
+++ b/src/SceneGraph/PrimitiveCreater.cpp
@@ -33,27 +33,27 @@ namespace hgl
             if(!vif)
                 return(nullptr);
 
-            ShaderStageBind *ssb;
+            PrimitiveVertexBuffer *pvb;
 
-            if(ssb_map.Get(name,ssb))
-                return ssb->data;
+            if(vbo_map.Get(name,pvb))
+                return pvb->data;
 
             VAD *vad=hgl::graph::CreateVertexAttribData(vertices_number,vif);
 
             if(!vad)
                 return(nullptr);
 
-            ssb=new ShaderStageBind;
+            pvb=new PrimitiveVertexBuffer;
 
-            ssb->data   =vad;
-            ssb->name   =name;
-            ssb->binding=vif->binding;
+            pvb->data   =vad;
+            pvb->name   =name;
+            pvb->binding=vif->binding;
             
-            ssb->vbo    =nullptr;
+            pvb->vbo    =nullptr;
 
-            ssb_map.Add(name,ssb);
+            vbo_map.Add(name,pvb);
 
-            return ssb->data;
+            return pvb->data;
         }
 
         bool PrimitiveCreater::WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes)
@@ -63,9 +63,9 @@ namespace hgl
             if(!data)return(false);
             if(!bytes)return(false);
             
-            ShaderStageBind *ssb;
+            PrimitiveVertexBuffer *pvb;
 
-            if(ssb_map.Get(name,ssb))
+            if(vbo_map.Get(name,pvb))
                 return false;
 
             const VertexInputFormat *vif=vil->GetConfig(name);
@@ -76,15 +76,15 @@ namespace hgl
             if(vif->stride*vertices_number!=bytes)
                 return(false);
                
-            ssb=new ShaderStageBind;
+            pvb=new PrimitiveVertexBuffer;
 
-            ssb->data   =nullptr;
-            ssb->name   =name;
-            ssb->binding=vif->binding;
+            pvb->data   =nullptr;
+            pvb->name   =name;
+            pvb->binding=vif->binding;
 
-            ssb->vbo    =db->CreateVBO(vif->format,vertices_number,data);
+            pvb->vbo    =db->CreateVBO(vif->format,vertices_number,data);
 
-            ssb_map.Add(name,ssb);
+            vbo_map.Add(name,pvb);
 
             return true;
         }
@@ -109,12 +109,12 @@ namespace hgl
         {
             const uint si_count=vil->GetCount();
 
-            if(ssb_map.GetCount()!=si_count)
+            if(vbo_map.GetCount()!=si_count)
                 return(nullptr);
 
             Primitive *primitive=db->CreatePrimitive(vertices_number);
 
-            const auto *sp=ssb_map.GetDataList();
+            const auto *sp=vbo_map.GetDataList();
             for(uint i=0;i<si_count;i++)
             {
                 if((*sp)->value->vbo)