Bump version to 1.1

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

diff --git a/source/mesh.h b/source/mesh.h
index 4af66a39e25555a7432d90439045f3ba3d8abb10..0a4142fea1eebf02f326b9615a4fc5c904ad142b 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -15,8 +15,12 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Buffer;
+
 class Mesh
 {
+       friend class MeshBuilder;
+
 public:
        class Loader: public DataFile::Loader
        {
@@ -29,16 +33,24 @@ public:
                void batch(PrimitiveType);
        };
 
+private:
+       VertexArray vertices;
+       std::list<Batch> batches;
+       Buffer *ibuf;
+
+public:
        Mesh();
-       Mesh(VertexFormat f);
-       RefPtr<VertexArrayBuilder> modify_vertices() { return vertices.modify(); }
-       void add_batch(const Batch &b);
+       Mesh(const VertexFormat &f);
+
+       void use_vertex_buffer(bool);
        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:
-       VertexArray vertices;
-       std::list<Batch> batches;
+       void update_index_buffer();
 };
 
 } // namespace GL