Generalize VertexBuffer into Buffer with support for other types as well

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

diff --git a/source/mesh.h b/source/mesh.h
index 8e1f906cf2dcbbd89ecb9c556a721991b7899b1a..0a4142fea1eebf02f326b9615a4fc5c904ad142b 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -10,12 +10,13 @@ Distributed under the LGPL
 
 #include <msp/datafile/loader.h>
 #include "batch.h"
-#include "meshbuilder.h"
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
+
 class Mesh
 {
        friend class MeshBuilder;
@@ -35,17 +36,21 @@ public:
 private:
        VertexArray vertices;
        std::list<Batch> batches;
+       Buffer *ibuf;
 
 public:
        Mesh();
-       Mesh(VertexFormat f);
+       Mesh(const VertexFormat &f);
 
        void use_vertex_buffer(bool);
-       RefPtr<MeshBuilder> modify();
        const VertexArray &get_vertices() const { return vertices; }
+       float *get_vertex(unsigned);
        void add_batch(const Batch &b);
        const std::list<Batch> &get_batches() { return batches; }
+       void clear();
        void draw() const;
+private:
+       void update_index_buffer();
 };
 
 } // namespace GL