Move vertex buffer management from VertexArray to Mesh

[libs/gl.git] / source / mesh.h

diff --git a/source/mesh.h b/source/mesh.h
index 698ae60e53686dacf2210a5ac9d068a301a7a12e..6181d5fb9bc1b9126248d2e786f826a77c7c92bd 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -27,7 +27,7 @@ public:
        public:
                Loader(Mesh &);
        private:
-               void vertices(VertexFormat);
+               void vertices(const std::vector<VertexComponent> &);
                void batch(PrimitiveType);
                void winding(FaceWinding);
        };
@@ -35,8 +35,9 @@ public:
 private:
        VertexArray vertices;
        std::list<Batch> batches;
+       Buffer *vbuf;
        Buffer *ibuf;
-       bool defer_ibuf;
+       bool defer_buffers;
        const WindingTest *winding;
 
 public:
@@ -46,7 +47,10 @@ public:
 
        void clear();
        void use_buffers(bool);
+private:
+       void create_buffers();
 
+public:
        const VertexArray &get_vertices() const { return vertices; }
        unsigned get_n_vertices() const;
        float *modify_vertex(unsigned);