Remove support for legacy OpenGL features

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index fb8f51b026d82e40c2ef4dd70da31f2f3c66027f..efbf8ce27cb2f4ef25c74c5b14c49ce1b2c2dd02 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -17,6 +17,16 @@ namespace GL {
 
 class Buffer;
 
+/**
+Stores vertex data.
+
+The array's contents can be modified with the append and modify methods.  To
+obtain the location of an individual component within the vertex, use
+VertexFormat::offset.
+
+A higher-level interface for filling in vertex data is available in the
+VertexArrayBuilder class.
+*/
 class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
@@ -39,7 +49,6 @@ private:
        std::vector<float> data;
        unsigned stride;
        std::vector<Array> arrays;
-       mutable bool dirty;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -47,31 +56,44 @@ public:
        VertexArray(const VertexFormat &);
        ~VertexArray();
 
+       /// Resets the VertexArray to a different format.  All data is cleared.
        void reset(const VertexFormat &);
+
        const VertexFormat &get_format() const { return format; }
 private:
        static unsigned get_array_slot(unsigned char);
 
 public:
-       /// Deprecated alias for use_buffer
-       void use_vertex_buffer(Buffer *b) { use_buffer(b); }
-
+       /// Clears all vertices from the array.
        void clear();
+
+       /// Reserve space for vertices.
        void reserve(unsigned);
+
+       /// Append a new vertex at the end of the array and return its location.
        float *append();
+
+       /// Returns the location of a vertex for modification.
        float *modify(unsigned);
 private:
        virtual unsigned get_data_size() const;
-       virtual void upload_data() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
 public:
        unsigned size() const { return data.size()/stride; }
        const std::vector<float> &get_data() const { return data; }
        const float *operator[](unsigned i) const { return &data[0]+i*stride; }
 
+       /// Equivalent to apply().  For compatibility with the Bindable interface.
+       void bind() const { apply(); }
+
+       /// Applies component arrays to the GL.
        void apply() const;
+
 private:
        static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
+public:
+       static void unbind();
 };
 
 } // namespace GL