Add vertex array object support to Mesh

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

diff --git a/source/mesh.h b/source/mesh.h
index 625cebe267e681aefe3d7949dc0b60f889c250ed..2aba273e2b2539cc567a66a25f8525f519c446c9 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -12,7 +12,12 @@ namespace GL {
 class Buffer;
 class Renderer;
 
-class Mesh
+/**
+Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
+Mesh can draw itself, it's usually used as part of Renderables rather than on
+its own.
+*/
+class Mesh: public Bindable<Mesh>
 {
        friend class MeshBuilder;
 
@@ -22,7 +27,7 @@ public:
        public:
                Loader(Mesh &);
        private:
-               void vertices(VertexFormat);
+               void vertices(const std::vector<VertexComponent> &);
                void batch(PrimitiveType);
                void winding(FaceWinding);
        };
@@ -30,8 +35,11 @@ public:
 private:
        VertexArray vertices;
        std::list<Batch> batches;
+       Buffer *vbuf;
        Buffer *ibuf;
-       bool defer_ibuf;
+       unsigned vao_id;
+       bool defer_buffers;
+       mutable unsigned char dirty;
        const WindingTest *winding;
 
 public:
@@ -41,7 +49,11 @@ public:
 
        void clear();
        void use_buffers(bool);
+private:
+       void create_buffers();
+       void refresh() const;
 
+public:
        const VertexArray &get_vertices() const { return vertices; }
        unsigned get_n_vertices() const;
        float *modify_vertex(unsigned);
@@ -53,6 +65,10 @@ public:
 
        void draw() const;
        void draw(Renderer &) const;
+
+       void bind() const;
+
+       static void unbind();
 };
 
 } // namespace GL