新的Renderable，接待原先VertexArray中的GetDrawCount/Draw函数，专门用于管理绘制

inc/hgl/graph/Renderable.h

@@ -1,7 +1,7 @@
 #ifndef HGL_GRAPH_RENDERABLE_INCLUDE
 #define HGL_GRAPH_RENDERABLE_INCLUDE
 
-#include<hgl/graph/Shader.h>
+#include<hgl/graph/VertexArray.h>
 
 namespace hgl
 {
@@ -14,8 +14,25 @@ namespace hgl
         {
         protected:
 
-            VertexArray *va;
+            uint primitive;                                                                         ///<绘制的图元类型
-            Material *mtl;
+            VertexArray *vao;
+
+//            Material *mtl;
+
+        public:
+
+            Renderable(uint prim,VertexArray *va=nullptr)
+            {
+                primitive=prim;
+                vao=va;
+            }
+
+            const uint      GetPrimitive()const { return primitive; }                                ///<取得要绘制的图元类型
+
+        public:
+
+            uint            GetDrawCount();                                                         ///<取得可绘制的数据总数量
+            bool            Draw();                                                                 ///<绘制
         };//class Renderable
     }//namespace graph
 }//namespace hgl

src/RenderDriver/CMakeLists.txt

@@ -5,9 +5,8 @@ SET(GRAPH_SRC_FILES OpenGLDebug.cpp
                     Shader.cpp
                     BufferData.cpp
                     BufferObject.cpp
-#                     VertexArray.cpp
+                    VertexArray.cpp
-#                     VertexBuffer.cpp
+                    Renderable.cpp
-#                     VertexBufferObject.cpp
                     TextureFormat.cpp
                     Texture1D.cpp
                     Texture1DDSA.cpp

src/RenderDriver/Renderable.cpp

@@ -0,0 +1,47 @@
+#include<hgl/graph/Renderable.h>
+
+namespace hgl
+{
+    namespace graph
+    {
+        /**
+        * 取得可绘制数据数量
+        * @return 可绘制的顶点数量
+        */
+        uint Renderable::GetDrawCount()
+        {
+            ElementBufferObject *obj=vao->GetElement();
+
+            if(!obj)
+                obj=vao->GetPosition();
+
+            if(!obj)
+                return 0;
+
+            return obj->GetCount();
+        }
+
+        bool Renderable::Draw()
+        {
+            glBindVertexArray(vao->GetVAO());
+
+            ElementBufferObject *element_buffer=vao->GetElement();
+
+            if(!element_buffer)
+            {
+                VertexBufferObject *position_buffer=vao->GetPosition();
+
+                if(!position_buffer)
+                    return(false);
+
+                glDrawArrays(primitive,0,position_buffer->GetCount());
+            }
+            else
+            {
+                glDrawElements(primitive,element_buffer->GetCount(),element_buffer->GetDataType(),nullptr);
+            }
+
+            return(true);
+        }
+    }//namespace graph
+}//namespace hgl